Moved header to Include

Andres6936 · Dec 7, 2020 · 03010a0 · 03010a0
1 parent da1c62b
commit 03010a0
Show file tree

Hide file tree

Showing 68 changed files with 134 additions and 136 deletions.
diff --git a/Terminal/CMakeLists.txt b/Terminal/CMakeLists.txt
@@ -108,7 +108,7 @@ SET_TARGET_PROPERTIES(BearLibTerminal PROPERTIES CXX_STANDARD 17)
 # by GNUInstallDirs.
 TARGET_INCLUDE_DIRECTORIES(BearLibTerminal
         PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Source/>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include/>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
         )
 

diff --git a/Terminal/Source/Atlas.hpp → Terminal/Include/BearLibTerminal/Atlas.hpp b/Terminal/Source/Atlas.hpp → Terminal/Include/BearLibTerminal/Atlas.hpp
diff --git a/Terminal/Source/BOM.hpp → Terminal/Include/BearLibTerminal/BOM.hpp b/Terminal/Source/BOM.hpp → Terminal/Include/BearLibTerminal/BOM.hpp
diff --git a/Terminal/Source/Base64.hpp → Terminal/Include/BearLibTerminal/Base64.hpp b/Terminal/Source/Base64.hpp → Terminal/Include/BearLibTerminal/Base64.hpp
diff --git a/Terminal/Source/Bitmap.hpp → Terminal/Include/BearLibTerminal/Bitmap.hpp b/Terminal/Source/Bitmap.hpp → Terminal/Include/BearLibTerminal/Bitmap.hpp
diff --git a/Terminal/Source/BitmapTileset.hpp → ...Include/BearLibTerminal/BitmapTileset.hpp b/Terminal/Source/BitmapTileset.hpp → ...Include/BearLibTerminal/BitmapTileset.hpp
diff --git a/Terminal/Source/Builtin.Codepages.hpp → ...ude/BearLibTerminal/Builtin.Codepages.hpp b/Terminal/Source/Builtin.Codepages.hpp → ...ude/BearLibTerminal/Builtin.Codepages.hpp
diff --git a/Terminal/Source/Builtin.DefaultFont.hpp → ...e/BearLibTerminal/Builtin.DefaultFont.hpp b/Terminal/Source/Builtin.DefaultFont.hpp → ...e/BearLibTerminal/Builtin.DefaultFont.hpp
diff --git a/Terminal/Source/CocoaWindow.h → ...nal/Include/BearLibTerminal/CocoaWindow.h b/Terminal/Source/CocoaWindow.h → ...nal/Include/BearLibTerminal/CocoaWindow.h
diff --git a/Terminal/Source/Color.hpp → Terminal/Include/BearLibTerminal/Color.hpp b/Terminal/Source/Color.hpp → Terminal/Include/BearLibTerminal/Color.hpp
diff --git a/Terminal/Source/Config.hpp → Terminal/Include/BearLibTerminal/Config.hpp b/Terminal/Source/Config.hpp → Terminal/Include/BearLibTerminal/Config.hpp
diff --git a/Terminal/Source/DynamicTileset.hpp → ...nclude/BearLibTerminal/DynamicTileset.hpp b/Terminal/Source/DynamicTileset.hpp → ...nclude/BearLibTerminal/DynamicTileset.hpp
diff --git a/Terminal/Source/Encoding.hpp → ...inal/Include/BearLibTerminal/Encoding.hpp b/Terminal/Source/Encoding.hpp → ...inal/Include/BearLibTerminal/Encoding.hpp
diff --git a/Terminal/Source/Geometry.hpp → ...inal/Include/BearLibTerminal/Geometry.hpp b/Terminal/Source/Geometry.hpp → ...inal/Include/BearLibTerminal/Geometry.hpp
diff --git a/Terminal/Source/Keystroke.hpp → ...nal/Include/BearLibTerminal/Keystroke.hpp b/Terminal/Source/Keystroke.hpp → ...nal/Include/BearLibTerminal/Keystroke.hpp
diff --git a/Terminal/Source/LoadBitmap.hpp → ...al/Include/BearLibTerminal/LoadBitmap.hpp b/Terminal/Source/LoadBitmap.hpp → ...al/Include/BearLibTerminal/LoadBitmap.hpp
diff --git a/Terminal/Source/Log.hpp → Terminal/Include/BearLibTerminal/Log.hpp b/Terminal/Source/Log.hpp → Terminal/Include/BearLibTerminal/Log.hpp
diff --git a/Terminal/Source/OpenGL.hpp → Terminal/Include/BearLibTerminal/OpenGL.hpp b/Terminal/Source/OpenGL.hpp → Terminal/Include/BearLibTerminal/OpenGL.hpp
diff --git a/Terminal/Source/OptionGroup.hpp → ...l/Include/BearLibTerminal/OptionGroup.hpp b/Terminal/Source/OptionGroup.hpp → ...l/Include/BearLibTerminal/OptionGroup.hpp
diff --git a/Terminal/Source/Options.hpp → Terminal/Include/BearLibTerminal/Options.hpp b/Terminal/Source/Options.hpp → Terminal/Include/BearLibTerminal/Options.hpp
diff --git a/Terminal/Source/Palette.hpp → Terminal/Include/BearLibTerminal/Palette.hpp b/Terminal/Source/Palette.hpp → Terminal/Include/BearLibTerminal/Palette.hpp
diff --git a/Terminal/Source/Platform.hpp → ...inal/Include/BearLibTerminal/Platform.hpp b/Terminal/Source/Platform.hpp → ...inal/Include/BearLibTerminal/Platform.hpp
diff --git a/Terminal/Source/Point.hpp → Terminal/Include/BearLibTerminal/Point.hpp b/Terminal/Source/Point.hpp → Terminal/Include/BearLibTerminal/Point.hpp
diff --git a/Terminal/Source/Rectangle.hpp → ...nal/Include/BearLibTerminal/Rectangle.hpp b/Terminal/Source/Rectangle.hpp → ...nal/Include/BearLibTerminal/Rectangle.hpp
diff --git a/Terminal/Source/Resource.hpp → ...inal/Include/BearLibTerminal/Resource.hpp b/Terminal/Source/Resource.hpp → ...inal/Include/BearLibTerminal/Resource.hpp
diff --git a/Terminal/Source/Size.hpp → Terminal/Include/BearLibTerminal/Size.hpp b/Terminal/Source/Size.hpp → Terminal/Include/BearLibTerminal/Size.hpp
diff --git a/Terminal/Source/Stage.hpp → Terminal/Include/BearLibTerminal/Stage.hpp b/Terminal/Source/Stage.hpp → Terminal/Include/BearLibTerminal/Stage.hpp
diff --git a/Terminal/Source/Terminal.hpp → ...inal/Include/BearLibTerminal/Terminal.hpp b/Terminal/Source/Terminal.hpp → ...inal/Include/BearLibTerminal/Terminal.hpp
diff --git a/Terminal/Source/Texture.hpp → Terminal/Include/BearLibTerminal/Texture.hpp b/Terminal/Source/Texture.hpp → Terminal/Include/BearLibTerminal/Texture.hpp
diff --git a/Terminal/Source/Tileset.hpp → Terminal/Include/BearLibTerminal/Tileset.hpp b/Terminal/Source/Tileset.hpp → Terminal/Include/BearLibTerminal/Tileset.hpp
diff --git a/Terminal/Source/TrueTypeTileset.hpp → ...clude/BearLibTerminal/TrueTypeTileset.hpp b/Terminal/Source/TrueTypeTileset.hpp → ...clude/BearLibTerminal/TrueTypeTileset.hpp
diff --git a/Terminal/Source/Utility.hpp → Terminal/Include/BearLibTerminal/Utility.hpp b/Terminal/Source/Utility.hpp → Terminal/Include/BearLibTerminal/Utility.hpp
diff --git a/Terminal/Source/WinApiWindow.hpp → .../Include/BearLibTerminal/WinApiWindow.hpp b/Terminal/Source/WinApiWindow.hpp → .../Include/BearLibTerminal/WinApiWindow.hpp
diff --git a/Terminal/Source/Window.hpp → Terminal/Include/BearLibTerminal/Window.hpp b/Terminal/Source/Window.hpp → Terminal/Include/BearLibTerminal/Window.hpp
diff --git a/Terminal/Source/X11Window.hpp → ...nal/Include/BearLibTerminal/X11Window.hpp b/Terminal/Source/X11Window.hpp → ...nal/Include/BearLibTerminal/X11Window.hpp
diff --git a/Terminal/Source/Atlas.cpp b/Terminal/Source/Atlas.cpp
@@ -20,12 +20,12 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Atlas.hpp"
-#include "Stage.hpp"
-#include "Log.hpp"
-#include "OpenGL.hpp"
-#include "Geometry.hpp"
-#include "Utility.hpp"
+#include "BearLibTerminal/Atlas.hpp"
+#include "BearLibTerminal/Stage.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/OpenGL.hpp"
+#include "BearLibTerminal/Geometry.hpp"
+#include "BearLibTerminal/Utility.hpp"
 #include <algorithm>
 #include <fstream>
 

diff --git a/Terminal/Source/BOM.cpp b/Terminal/Source/BOM.cpp
@@ -20,7 +20,7 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "BOM.hpp"
+#include "BearLibTerminal/BOM.hpp"
 #include <stdint.h>
 #include <string.h>
 

diff --git a/Terminal/Source/Base64.cpp b/Terminal/Source/Base64.cpp
@@ -21,7 +21,7 @@
 */
 
 #include <stdexcept>
-#include "Base64.hpp"
+#include "BearLibTerminal/Base64.hpp"
 
 namespace BearLibTerminal
 {

diff --git a/Terminal/Source/BearLibTerminal.cpp b/Terminal/Source/BearLibTerminal.cpp
@@ -23,11 +23,11 @@
 #define BEARLIBTERMINAL_BUILDING_LIBRARY
 
 #include "BearLibTerminal/BearLibTerminal.hpp"
-#include "Config.hpp"
-#include "Terminal.hpp"
-#include "Palette.hpp"
-#include "Config.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Config.hpp"
+#include "BearLibTerminal/Terminal.hpp"
+#include "BearLibTerminal/Palette.hpp"
+#include "BearLibTerminal/Config.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <map>
 #include <memory>
 #include <string>

diff --git a/Terminal/Source/Bitmap.cpp b/Terminal/Source/Bitmap.cpp
@@ -20,8 +20,8 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Bitmap.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <stdexcept>
 #include <cstring>
 #include <cmath>

diff --git a/Terminal/Source/BitmapTileset.cpp b/Terminal/Source/BitmapTileset.cpp
@@ -20,14 +20,14 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "BitmapTileset.hpp"
-#include "LoadBitmap.hpp"
-#include "Geometry.hpp"
-#include "Resource.hpp"
-#include "Utility.hpp"
-#include "Palette.hpp"
-#include "Encoding.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/BitmapTileset.hpp"
+#include "BearLibTerminal/LoadBitmap.hpp"
+#include "BearLibTerminal/Geometry.hpp"
+#include "BearLibTerminal/Resource.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Palette.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <stdexcept>
 #include <fstream>
 #include <cmath>

diff --git a/Terminal/Source/CocoaWindow.mm b/Terminal/Source/CocoaWindow.mm
@@ -22,12 +22,12 @@
 
 #if defined(__APPLE__)
 
-#include "CocoaWindow.h"
 #include <map>
 #include <iostream>
 #import <Cocoa/Cocoa.h>
-#include "Encoding.hpp"
-#include "OpenGL.hpp"
+#include "BearLibTerminal/CocoaWindow.h"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/OpenGL.hpp"
 
 #define TERMINAL_BUILDING_LIBRARY
 #include "BearLibTerminal.h"

diff --git a/Terminal/Source/Config.cpp b/Terminal/Source/Config.cpp
@@ -20,13 +20,13 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Platform.hpp"
-#include "Utility.hpp"
-#include "Encoding.hpp"
-#include "OptionGroup.hpp"
-#include "Config.hpp"
-#include "Log.hpp"
-#include "BOM.hpp"
+#include "BearLibTerminal/Platform.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/OptionGroup.hpp"
+#include "BearLibTerminal/Config.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/BOM.hpp"
 #include <fstream>
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/DynamicTileset.cpp b/Terminal/Source/DynamicTileset.cpp
@@ -20,12 +20,12 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "DynamicTileset.hpp"
-#include "Log.hpp"
-#include "Bitmap.hpp"
-#include "Utility.hpp"
-#include "Geometry.hpp"
-#include "Encoding.hpp"
+#include "BearLibTerminal/DynamicTileset.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Geometry.hpp"
+#include "BearLibTerminal/Encoding.hpp"
 #include <cmath>
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/Encoding.cpp b/Terminal/Source/Encoding.cpp
@@ -20,12 +20,12 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Encoding.hpp"
-#include "Resource.hpp"
-#include "Utility.hpp"
-#include "Log.hpp"
-#include "BOM.hpp"
-#include "OptionGroup.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Resource.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/BOM.hpp"
+#include "BearLibTerminal/OptionGroup.hpp"
 #include <unordered_map>
 #include <stdint.h>
 #include <istream>

diff --git a/Terminal/Source/Keystroke.cpp b/Terminal/Source/Keystroke.cpp
@@ -23,7 +23,7 @@
 #define BEARLIBTERMINAL_BUILDING_LIBRARY
 
 #include "BearLibTerminal/BearLibTerminal.hpp"
-#include "Keystroke.hpp"
+#include "BearLibTerminal/Keystroke.hpp"
 #include <stdexcept>
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/LoadBMP.cpp b/Terminal/Source/LoadBMP.cpp
@@ -20,7 +20,7 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Bitmap.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
 #include <istream>
 #include <cstdint>
 #include <functional>

diff --git a/Terminal/Source/LoadBitmap.cpp b/Terminal/Source/LoadBitmap.cpp
@@ -22,8 +22,8 @@
 
 #include <stdexcept>
 #include <cstring>
-#include "LoadBitmap.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/LoadBitmap.hpp"
+#include "BearLibTerminal/Log.hpp"
 
 // Forward declarations. See LoadXXX.cpp files for definitions.
 namespace BearLibTerminal

diff --git a/Terminal/Source/LoadJPEG.cpp b/Terminal/Source/LoadJPEG.cpp
@@ -27,10 +27,10 @@
 #include <istream>
 #include <vector>
 #include <memory>
-#include "Geometry.hpp"
-#include "Utility.hpp"
-#include "Bitmap.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Geometry.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
+#include "BearLibTerminal/Log.hpp"
 
 namespace BearLibTerminal
 {

diff --git a/Terminal/Source/LoadPNG.cpp b/Terminal/Source/LoadPNG.cpp
@@ -32,9 +32,9 @@
 #include <functional>
 #include <memory>
 #include <stdexcept>
-#include "Bitmap.hpp"
-#include "Utility.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Log.hpp"
 
 namespace BearLibTerminal
 {

diff --git a/Terminal/Source/Log.cpp b/Terminal/Source/Log.cpp
@@ -20,11 +20,11 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Log.hpp"
-#include "Encoding.hpp"
-#include "Utility.hpp"
-#include "Platform.hpp"
-#include "Config.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Platform.hpp"
+#include "BearLibTerminal/Config.hpp"
 #include <fstream>
 #include <time.h>
 #include <chrono>

diff --git a/Terminal/Source/Luaopen.cpp b/Terminal/Source/Luaopen.cpp
@@ -23,8 +23,8 @@
 #define BEARLIBTERMINAL_BUILDING_LIBRARY
 
 #include "BearLibTerminal/BearLibTerminal.hpp"
-#include "Platform.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Platform.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <vector>
 #include <type_traits>
 #include <stddef.h>

diff --git a/Terminal/Source/OpenGL.cpp b/Terminal/Source/OpenGL.cpp
@@ -20,8 +20,8 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "OpenGL.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/OpenGL.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <string>
 #include <algorithm>
 

diff --git a/Terminal/Source/OptionGroup.cpp b/Terminal/Source/OptionGroup.cpp
@@ -20,10 +20,9 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "OptionGroup.hpp"
-
-#include "Encoding.hpp"
-#include "Utility.hpp"
+#include "BearLibTerminal/OptionGroup.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Utility.hpp"
 #include <iostream>
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/Options.cpp b/Terminal/Source/Options.cpp
@@ -20,9 +20,9 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Options.hpp"
-#include "Keystroke.hpp"
-#include "OpenGL.hpp"
+#include "BearLibTerminal/Options.hpp"
+#include "BearLibTerminal/Keystroke.hpp"
+#include "BearLibTerminal/OpenGL.hpp"
 
 namespace BearLibTerminal
 {

diff --git a/Terminal/Source/Palette.cpp b/Terminal/Source/Palette.cpp
@@ -20,8 +20,8 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Palette.hpp"
-#include "Utility.hpp"
+#include "BearLibTerminal/Palette.hpp"
+#include "BearLibTerminal/Utility.hpp"
 #include <cctype>
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/Platform.cpp b/Terminal/Source/Platform.cpp
@@ -20,11 +20,11 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Platform.hpp"
-#include "Encoding.hpp"
-#include "Utility.hpp"
-#include "Log.hpp"
-#include "Terminal.hpp"
+#include "BearLibTerminal/Platform.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/Terminal.hpp"
 #include <vector>
 #include <fstream>
 #include <iostream>

diff --git a/Terminal/Source/Resource.cpp b/Terminal/Source/Resource.cpp
@@ -20,12 +20,12 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Resource.hpp"
-#include "Encoding.hpp"
-#include "Platform.hpp"
-#include "Utility.hpp"
-#include "Base64.hpp"
-#include "Log.hpp"
+#include "BearLibTerminal/Resource.hpp"
+#include "BearLibTerminal/Encoding.hpp"
+#include "BearLibTerminal/Platform.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Base64.hpp"
+#include "BearLibTerminal/Log.hpp"
 #include <sstream>
 #include <fstream>
 #include <map>
@@ -34,8 +34,8 @@
 namespace BearLibTerminal
 {
 
-#include "Builtin.Codepages.hpp"
-	#include "Builtin.DefaultFont.hpp"
+#include "BearLibTerminal/Builtin.Codepages.hpp"
+#include "BearLibTerminal/Builtin.DefaultFont.hpp"
 
     struct BuiltinResource
     {

diff --git a/Terminal/Source/SaveBMP.cpp b/Terminal/Source/SaveBMP.cpp
@@ -20,7 +20,7 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Bitmap.hpp"
+#include "BearLibTerminal/Bitmap.hpp"
 #include <ostream>
 #include <cstdint>
 #include <functional>

diff --git a/Terminal/Source/Stage.cpp b/Terminal/Source/Stage.cpp
@@ -20,7 +20,7 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Stage.hpp"
+#include "BearLibTerminal/Stage.hpp"
 #include "BearLibTerminal/BearLibTerminal.hpp"
 
 namespace BearLibTerminal

diff --git a/Terminal/Source/Terminal.cpp b/Terminal/Source/Terminal.cpp
@@ -20,20 +20,19 @@
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include "Terminal.hpp"
-#include "OpenGL.hpp"
-#include "Utility.hpp"
-#include "Geometry.hpp"
-#include "Log.hpp"
-#include "Palette.hpp"
+#include "BearLibTerminal/Terminal.hpp"
+#include "BearLibTerminal/OpenGL.hpp"
+#include "BearLibTerminal/Utility.hpp"
+#include "BearLibTerminal/Geometry.hpp"
+#include "BearLibTerminal/Log.hpp"
+#include "BearLibTerminal/Palette.hpp"
+#include "BearLibTerminal/Config.hpp"
 #include "BearLibTerminal/BearLibTerminal.hpp"
 #include <cmath>
 #include <future>
 #include <vector>
 #include <locale.h>
-
 #include <iostream>
-#include "Config.hpp"
 
 // Internal usage
 #define TK_CLIENT_WIDTH  0xF0