diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp
index 9a678462..a3b689e7 100644
--- a/src/assets/Assets.hpp
+++ b/src/assets/Assets.hpp
@@ -11,7 +11,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../graphics/core/TextureAnimation.hpp"
+#include <graphics/core/TextureAnimation.hpp>
 
 class Assets;
 
diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index c5849656..07de4395 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -12,7 +12,7 @@
 #include <debug/Logger.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
-#include "../graphics/core/Texture.hpp"
+#include <graphics/core/Texture.hpp>
 #include "../logic/scripting/scripting.hpp"
 #include "../objects/rigging.hpp"
 #include "../util/ThreadPool.hpp"
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 2b0eb924..e1c36e6b 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -15,13 +15,13 @@
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 #include "../frontend/UiDocument.hpp"
-#include "../graphics/core/Atlas.hpp"
-#include "../graphics/core/Font.hpp"
-#include "../graphics/core/ImageData.hpp"
-#include "../graphics/core/Model.hpp"
-#include "../graphics/core/Shader.hpp"
-#include "../graphics/core/Texture.hpp"
-#include "../graphics/core/TextureAnimation.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Font.hpp>
+#include <graphics/core/ImageData.hpp>
+#include <graphics/core/Model.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/core/TextureAnimation.hpp>
 #include "../objects/rigging.hpp"
 #include "Assets.hpp"
 #include "AssetsLoader.hpp"
diff --git a/src/coders/imageio.cpp b/src/coders/imageio.cpp
index 59917593..90d34bee 100644
--- a/src/coders/imageio.cpp
+++ b/src/coders/imageio.cpp
@@ -4,7 +4,7 @@
 #include <functional>
 #include <unordered_map>
 
-#include "../graphics/core/ImageData.hpp"
+#include <graphics/core/ImageData.hpp>
 #include "png.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/coders/obj.cpp b/src/coders/obj.cpp
index c3df555a..0e0b29dc 100644
--- a/src/coders/obj.cpp
+++ b/src/coders/obj.cpp
@@ -1,6 +1,6 @@
 #include "obj.hpp"
 
-#include "../graphics/core/Model.hpp"
+#include <graphics/core/Model.hpp>
 #include "commons.hpp"
 
 using namespace model;
diff --git a/src/coders/png.cpp b/src/coders/png.cpp
index c17fa19f..14f5c801 100644
--- a/src/coders/png.cpp
+++ b/src/coders/png.cpp
@@ -6,8 +6,8 @@
 
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
-#include "../graphics/core/GLTexture.hpp"
-#include "../graphics/core/ImageData.hpp"
+#include <graphics/core/GLTexture.hpp>
+#include <graphics/core/ImageData.hpp>
 
 static debug::Logger logger("png-coder");
 
diff --git a/src/engine.cpp b/src/engine.cpp
index 4d588488..bbd15e6a 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -19,11 +19,11 @@
 #include "frontend/menu.hpp"
 #include "frontend/screens/Screen.hpp"
 #include "frontend/screens/MenuScreen.hpp"
-#include "graphics/core/Batch2D.hpp"
-#include "graphics/core/DrawContext.hpp"
-#include "graphics/core/ImageData.hpp"
-#include "graphics/core/Shader.hpp"
-#include "graphics/ui/GUI.hpp"
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/ImageData.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/ui/GUI.hpp>
 #include "objects/rigging.hpp"
 #include "logic/EngineController.hpp"
 #include "logic/CommandsInterpreter.hpp"
diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp
index df5591f0..8c0eb8ed 100644
--- a/src/frontend/ContentGfxCache.cpp
+++ b/src/frontend/ContentGfxCache.cpp
@@ -6,7 +6,7 @@
 #include <content/Content.hpp>
 #include <content/ContentPack.hpp>
 #include <core_defs.hpp>
-#include "../graphics/core/Atlas.hpp"
+#include <graphics/core/Atlas.hpp>
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.hpp"
 
diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp
index c5f7adab..6a0521ea 100644
--- a/src/frontend/LevelFrontend.cpp
+++ b/src/frontend/LevelFrontend.cpp
@@ -5,8 +5,8 @@
 #include <assets/Assets.hpp>
 #include "../audio/audio.hpp"
 #include <content/Content.hpp>
-#include "../graphics/core/Atlas.hpp"
-#include "../graphics/render/BlocksPreview.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/render/BlocksPreview.hpp>
 #include "../logic/LevelController.hpp"
 #include "../logic/PlayerController.hpp"
 #include "../objects/Player.hpp"
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index 86dae7eb..b51cf23f 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -3,9 +3,9 @@
 #include <utility>
 
 #include <files/files.hpp>
-#include "../graphics/ui/elements/UINode.hpp"
-#include "../graphics/ui/elements/InventoryView.hpp"
-#include "../graphics/ui/gui_xml.hpp"
+#include <graphics/ui/elements/UINode.hpp>
+#include <graphics/ui/elements/InventoryView.hpp>
+#include <graphics/ui/gui_xml.hpp>
 #include "../logic/scripting/scripting.hpp"
 
 UiDocument::UiDocument(
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 60da236e..49f7a9b5 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -3,12 +3,12 @@
 #include <engine.hpp>
 #include <settings.hpp>
 #include <content/Content.hpp>
-#include "../graphics/core/Mesh.hpp"
-#include "../graphics/ui/elements/CheckBox.hpp"
-#include "../graphics/ui/elements/TextBox.hpp"
-#include "../graphics/ui/elements/TrackBar.hpp"
-#include "../graphics/ui/elements/InputBindBox.hpp"
-#include "../graphics/render/WorldRenderer.hpp"
+#include <graphics/core/Mesh.hpp>
+#include <graphics/ui/elements/CheckBox.hpp>
+#include <graphics/ui/elements/TextBox.hpp>
+#include <graphics/ui/elements/TrackBar.hpp>
+#include <graphics/ui/elements/InputBindBox.hpp>
+#include <graphics/render/WorldRenderer.hpp>
 #include "../logic/scripting/scripting.hpp"
 #include "../objects/Player.hpp"
 #include "../objects/Entities.hpp"
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index a8f53717..e8fbbb95 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -9,22 +9,22 @@
 #include <core_defs.hpp>
 #include <delegates.hpp>
 #include <engine.hpp>
-#include "../graphics/core/Atlas.hpp"
-#include "../graphics/core/Batch2D.hpp"
-#include "../graphics/core/Batch3D.hpp"
-#include "../graphics/core/DrawContext.hpp"
-#include "../graphics/core/Font.hpp"
-#include "../graphics/core/Mesh.hpp"
-#include "../graphics/core/Shader.hpp"
-#include "../graphics/core/Texture.hpp"
-#include "../graphics/render/WorldRenderer.hpp"
-#include "../graphics/ui/elements/InventoryView.hpp"
-#include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/elements/Panel.hpp"
-#include "../graphics/ui/elements/Plotter.hpp"
-#include "../graphics/ui/elements/UINode.hpp"
-#include "../graphics/ui/gui_util.hpp"
-#include "../graphics/ui/GUI.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Batch3D.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Font.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/render/WorldRenderer.hpp>
+#include <graphics/ui/elements/InventoryView.hpp>
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/ui/elements/Panel.hpp>
+#include <graphics/ui/elements/Plotter.hpp>
+#include <graphics/ui/elements/UINode.hpp>
+#include <graphics/ui/gui_util.hpp>
+#include <graphics/ui/GUI.hpp>
 #include "../items/Inventories.hpp"
 #include "../items/Inventory.hpp"
 #include "../items/ItemDef.hpp"
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index cca8b020..858969d8 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -9,9 +9,9 @@
 #include "../data/dynamic.hpp"
 #include "../interfaces/Task.hpp"
 #include <files/engine_paths.hpp>
-#include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/gui_util.hpp"
-#include "../graphics/ui/GUI.hpp"
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/ui/gui_util.hpp>
+#include <graphics/ui/GUI.hpp>
 #include "../logic/scripting/scripting.hpp"
 #include <settings.hpp>
 #include <coders/commons.hpp>
diff --git a/src/frontend/menu.hpp b/src/frontend/menu.hpp
index 4bc5e4ea..b54cd822 100644
--- a/src/frontend/menu.hpp
+++ b/src/frontend/menu.hpp
@@ -2,7 +2,7 @@
 #define FRONTEND_MENU_MENU_HPP_
 
 #include "../data/dynamic.hpp"
-#include "../graphics/ui/elements/Menu.hpp"
+#include <graphics/ui/elements/Menu.hpp>
 
 #include <string>
 #include <vector>
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index d83fbf69..779ef4f3 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -9,13 +9,13 @@
 #include <engine.hpp>
 #include <files/files.hpp>
 #include <content/Content.hpp>
-#include "../../graphics/core/DrawContext.hpp"
-#include "../../graphics/core/ImageData.hpp"
-#include "../../graphics/core/PostProcessing.hpp"
-#include "../../graphics/core/Viewport.hpp"
-#include "../../graphics/render/WorldRenderer.hpp"
-#include "../../graphics/ui/elements/Menu.hpp"
-#include "../../graphics/ui/GUI.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/ImageData.hpp>
+#include <graphics/core/PostProcessing.hpp>
+#include <graphics/core/Viewport.hpp>
+#include <graphics/render/WorldRenderer.hpp>
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/ui/GUI.hpp>
 #include "../../logic/LevelController.hpp"
 #include "../../logic/scripting/scripting_hud.hpp"
 #include "../../util/stringutil.hpp"
diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp
index e5d56f6c..98d464f4 100644
--- a/src/frontend/screens/MenuScreen.cpp
+++ b/src/frontend/screens/MenuScreen.cpp
@@ -1,10 +1,10 @@
 #include "MenuScreen.hpp"
 
-#include "../../graphics/ui/GUI.hpp"
-#include "../../graphics/ui/elements/Menu.hpp"
-#include "../../graphics/core/Batch2D.hpp"
-#include "../../graphics/core/Shader.hpp"
-#include "../../graphics/core/Texture.hpp"
+#include <graphics/ui/GUI.hpp>
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
 #include "../../maths/UVRegion.hpp"
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp
index 32aa74b0..a167b98a 100644
--- a/src/frontend/screens/Screen.cpp
+++ b/src/frontend/screens/Screen.cpp
@@ -1,6 +1,6 @@
 #include "Screen.hpp"
 
-#include "../../graphics/core/Batch2D.hpp"
+#include <graphics/core/Batch2D.hpp>
 #include <engine.hpp>
 
 Screen::Screen(Engine* engine)
diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp
index 8e72f59c..515d99c3 100644
--- a/src/graphics/render/BlocksPreview.cpp
+++ b/src/graphics/render/BlocksPreview.cpp
@@ -7,13 +7,13 @@
 #include "../../voxels/Block.hpp"
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
-#include "../core/Atlas.hpp"
-#include "../core/Batch3D.hpp"
-#include "../core/Framebuffer.hpp"
-#include "../core/DrawContext.hpp"
-#include "../core/Shader.hpp"
-#include "../core/Texture.hpp"
-#include "../core/Viewport.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Batch3D.hpp>
+#include <graphics/core/Framebuffer.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/core/Viewport.hpp>
 
 #include <glm/ext.hpp>
 
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 9ff5c57b..ae079515 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,6 +1,6 @@
 #include "BlocksRenderer.hpp"
 
-#include "../core/Mesh.hpp"
+#include <graphics/core/Mesh.hpp>
 #include "../../maths/UVRegion.hpp"
 #include <constants.hpp>
 #include <content/Content.hpp>
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index ebd63927..f69aa793 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -1,7 +1,7 @@
 #include "ChunksRenderer.hpp"
 #include "BlocksRenderer.hpp"
 #include <debug/Logger.hpp>
-#include "../../graphics/core/Mesh.hpp"
+#include <graphics/core/Mesh.hpp>
 #include "../../voxels/Chunk.hpp"
 #include "../../world/Level.hpp"
 #include <settings.hpp>
diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp
index c3723dba..e523a295 100644
--- a/src/graphics/render/ModelBatch.cpp
+++ b/src/graphics/render/ModelBatch.cpp
@@ -1,9 +1,9 @@
 #include "ModelBatch.hpp"
 
-#include "../core/Mesh.hpp"
-#include "../core/Model.hpp"
-#include "../core/Atlas.hpp"
-#include "../core/Texture.hpp"
+#include <graphics/core/Mesh.hpp>
+#include <graphics/core/Model.hpp>
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Texture.hpp>
 #include <assets/Assets.hpp>
 #include "../../window/Window.hpp"
 #include "../../voxels/Chunks.hpp"
diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp
index b2a6843a..7f9d9fee 100644
--- a/src/graphics/render/Skybox.cpp
+++ b/src/graphics/render/Skybox.cpp
@@ -1,12 +1,12 @@
 #include "Skybox.hpp"
 #include <assets/Assets.hpp>
-#include "../../graphics/core/Shader.hpp"
-#include "../../graphics/core/Mesh.hpp"
-#include "../../graphics/core/Batch3D.hpp"
-#include "../../graphics/core/Texture.hpp"
-#include "../../graphics/core/Cubemap.hpp"
-#include "../../graphics/core/Framebuffer.hpp"
-#include "../../graphics/core/DrawContext.hpp"
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <graphics/core/Batch3D.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/core/Cubemap.hpp>
+#include <graphics/core/Framebuffer.hpp>
+#include <graphics/core/DrawContext.hpp>
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
 #include "../../maths/UVRegion.hpp"
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index bf59d466..3665ba67 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -30,15 +30,15 @@
 #include "../../world/Level.hpp"
 #include "../../world/LevelEvents.hpp"
 #include "../../world/World.hpp"
-#include "../core/Atlas.hpp"
-#include "../core/Batch3D.hpp"
-#include "../core/DrawContext.hpp"
-#include "../core/LineBatch.hpp"
-#include "../core/Mesh.hpp"
-#include "../core/Model.hpp"
-#include "../core/PostProcessing.hpp"
-#include "../core/Shader.hpp"
-#include "../core/Texture.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Batch3D.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/LineBatch.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <graphics/core/Model.hpp>
+#include <graphics/core/PostProcessing.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
 #include "ChunksRenderer.hpp"
 #include "ModelBatch.hpp"
 #include "Skybox.hpp"
diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp
index 946301a0..457d2110 100644
--- a/src/graphics/ui/GUI.cpp
+++ b/src/graphics/ui/GUI.cpp
@@ -9,9 +9,9 @@
 #include <assets/Assets.hpp>
 #include "../../frontend/UiDocument.hpp"
 #include "../../frontend/locale.hpp"
-#include "../../graphics/core/Batch2D.hpp"
-#include "../../graphics/core/Shader.hpp"
-#include "../../graphics/core/DrawContext.hpp"
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/DrawContext.hpp>
 #include "../../window/Events.hpp"
 #include "../../window/Window.hpp"
 #include "../../window/input.hpp"
diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp
index dcd892a4..91b96a3b 100644
--- a/src/graphics/ui/elements/Button.cpp
+++ b/src/graphics/ui/elements/Button.cpp
@@ -3,8 +3,8 @@
 #include <utility>
 
 #include "Label.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp
index 0ccb0713..26f3c3d9 100644
--- a/src/graphics/ui/elements/CheckBox.cpp
+++ b/src/graphics/ui/elements/CheckBox.cpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
 #include "Label.hpp"
 
 using namespace gui;
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp
index 6ca2b853..77a01413 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/Container.cpp
@@ -1,7 +1,7 @@
 #include "Container.hpp"
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
 
 #include <algorithm>
 #include <utility>
diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp
index b2d448b9..8927f625 100644
--- a/src/graphics/ui/elements/Image.cpp
+++ b/src/graphics/ui/elements/Image.cpp
@@ -2,10 +2,10 @@
 
 #include <utility>
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Texture.hpp"
-#include "../../core/Atlas.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/core/Atlas.hpp>
 #include <assets/Assets.hpp>
 #include "../../../maths/UVRegion.hpp"
 
diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp
index fef06652..5d9b62e0 100644
--- a/src/graphics/ui/elements/InputBindBox.cpp
+++ b/src/graphics/ui/elements/InputBindBox.cpp
@@ -1,8 +1,8 @@
 #include "InputBindBox.hpp"
 
 #include "Label.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
 #include "../../../util/stringutil.hpp"
 
 using namespace gui;
diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp
index 640550cb..5946c95f 100644
--- a/src/graphics/ui/elements/InventoryView.cpp
+++ b/src/graphics/ui/elements/InventoryView.cpp
@@ -16,13 +16,13 @@
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
 #include "../../../world/Level.hpp"
-#include "../../core/Atlas.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Shader.hpp"
-#include "../../core/Texture.hpp"
-#include "../../render/BlocksPreview.hpp"
+#include <graphics/core/Atlas.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Shader.hpp>
+#include <graphics/core/Texture.hpp>
+#include <graphics/render/BlocksPreview.hpp>
 #include "../GUI.hpp"
 
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp
index 131b3ad9..313db662 100644
--- a/src/graphics/ui/elements/Label.cpp
+++ b/src/graphics/ui/elements/Label.cpp
@@ -1,9 +1,9 @@
 #include "Label.hpp"
 
 #include <utility>
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
 #include <assets/Assets.hpp>
 #include "../../../util/stringutil.hpp"
 
diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp
index d574f360..3dcbc9be 100644
--- a/src/graphics/ui/elements/Plotter.cpp
+++ b/src/graphics/ui/elements/Plotter.cpp
@@ -1,8 +1,8 @@
 #include "Plotter.hpp"
 
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
-#include "../../core/DrawContext.hpp"
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
+#include <graphics/core/DrawContext.hpp>
 #include <assets/Assets.hpp>
 #include "../../../util/stringutil.hpp"
 
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index f9b5545e..86ed2123 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -4,9 +4,9 @@
 #include <algorithm>
 
 #include "Label.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
 #include <assets/Assets.hpp>
 #include "../../../util/stringutil.hpp"
 #include "../../../window/Events.hpp"
diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp
index c06566da..8cf09c47 100644
--- a/src/graphics/ui/elements/TrackBar.cpp
+++ b/src/graphics/ui/elements/TrackBar.cpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
 #include <assets/Assets.hpp>
 
 using namespace gui;
diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp
index b2c96721..5fe69741 100644
--- a/src/graphics/ui/elements/UINode.cpp
+++ b/src/graphics/ui/elements/UINode.cpp
@@ -3,7 +3,7 @@
 #include <utility>
 
 #include "Container.hpp"
-#include "../../core/Batch2D.hpp"
+#include <graphics/core/Batch2D.hpp>
 
 using gui::UINode;
 using gui::Align;
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 5d7826b9..a1e3b71f 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -7,7 +7,7 @@
 
 #include <content/Content.hpp>
 #include <files/WorldFiles.hpp>
-#include "../graphics/core/Mesh.hpp"
+#include <graphics/core/Mesh.hpp>
 #include "../lighting/Lighting.hpp"
 #include "../maths/voxmaths.hpp"
 #include "../util/timeutil.hpp"
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index d38e68fc..a2b49cd6 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -14,8 +14,8 @@
 #include "../frontend/menu.hpp"
 #include "../frontend/screens/LevelScreen.hpp"
 #include "../frontend/screens/MenuScreen.hpp"
-#include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/gui_util.hpp"
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/ui/gui_util.hpp>
 #include "../interfaces/Task.hpp"
 #include "../util/stringutil.hpp"
 #include "../world/Level.hpp"
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 55af846d..e79d6030 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -2,16 +2,16 @@
 #include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/locale.hpp"
-#include "../../../graphics/ui/elements/Button.hpp"
-#include "../../../graphics/ui/elements/CheckBox.hpp"
-#include "../../../graphics/ui/elements/Image.hpp"
-#include "../../../graphics/ui/elements/InventoryView.hpp"
-#include "../../../graphics/ui/elements/Menu.hpp"
-#include "../../../graphics/ui/elements/Panel.hpp"
-#include "../../../graphics/ui/elements/TextBox.hpp"
-#include "../../../graphics/ui/elements/TrackBar.hpp"
-#include "../../../graphics/ui/elements/UINode.hpp"
-#include "../../../graphics/ui/gui_util.hpp"
+#include <graphics/ui/elements/Button.hpp>
+#include <graphics/ui/elements/CheckBox.hpp>
+#include <graphics/ui/elements/Image.hpp>
+#include <graphics/ui/elements/InventoryView.hpp>
+#include <graphics/ui/elements/Menu.hpp>
+#include <graphics/ui/elements/Panel.hpp>
+#include <graphics/ui/elements/TextBox.hpp>
+#include <graphics/ui/elements/TrackBar.hpp>
+#include <graphics/ui/elements/UINode.hpp>
+#include <graphics/ui/gui_util.hpp>
 #include "../../../items/Inventories.hpp"
 #include "../../../util/stringutil.hpp"
 #include "../../../world/Level.hpp"
diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp
index eb55c8bb..9aec8325 100644
--- a/src/logic/scripting/lua/libhud.cpp
+++ b/src/logic/scripting/lua/libhud.cpp
@@ -6,7 +6,7 @@
 #include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/hud.hpp"
-#include "../../../graphics/ui/elements/InventoryView.hpp"
+#include <graphics/ui/elements/InventoryView.hpp>
 #include "../../../items/Inventories.hpp"
 #include "../../../logic/BlocksController.hpp"
 #include "../../../objects/Player.hpp"
diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp
index 1f689229..3a7980d0 100644
--- a/src/logic/scripting/lua/libinput.cpp
+++ b/src/logic/scripting/lua/libinput.cpp
@@ -1,7 +1,7 @@
 #include <engine.hpp>
 #include "../../../frontend/hud.hpp"
 #include "../../../frontend/screens/Screen.hpp"
-#include "../../../graphics/ui/GUI.hpp"
+#include <graphics/ui/GUI.hpp>
 #include "../../../util/stringutil.hpp"
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 1635729a..e9b83fb5 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -8,10 +8,10 @@
 #include "../data/dynamic_util.hpp"
 #include <debug/Logger.hpp>
 #include <engine.hpp>
-#include "../graphics/core/DrawContext.hpp"
-#include "../graphics/core/LineBatch.hpp"
-#include "../graphics/core/Model.hpp"
-#include "../graphics/render/ModelBatch.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/LineBatch.hpp>
+#include <graphics/core/Model.hpp>
+#include <graphics/render/ModelBatch.hpp>
 #include "../logic/scripting/scripting.hpp"
 #include "../maths/FrustumCulling.hpp"
 #include "../maths/rays.hpp"
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index 82880372..cc3e5975 100644
--- a/src/objects/rigging.cpp
+++ b/src/objects/rigging.cpp
@@ -3,8 +3,8 @@
 #include <assets/Assets.hpp>
 #include <coders/json.hpp>
 #include "../data/dynamic_util.hpp"
-#include "../graphics/core/Model.hpp"
-#include "../graphics/render/ModelBatch.hpp"
+#include <graphics/core/Model.hpp>
+#include <graphics/render/ModelBatch.hpp>
 
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/ext/matrix_transform.hpp>
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 4ff3ea7f..6a3a79e5 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -10,7 +10,7 @@
 #include <coders/json.hpp>
 #include <content/Content.hpp>
 #include <files/WorldFiles.hpp>
-#include "../graphics/core/Mesh.hpp"
+#include <graphics/core/Mesh.hpp>
 #include "../lighting/Lightmap.hpp"
 #include "../maths/aabb.hpp"
 #include "../maths/rays.hpp"
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index cfc43008..028706cf 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -8,8 +8,8 @@
 #include <thread>
 
 #include <debug/Logger.hpp>
-#include "../graphics/core/ImageData.hpp"
-#include "../graphics/core/Texture.hpp"
+#include <graphics/core/ImageData.hpp>
+#include <graphics/core/Texture.hpp>
 #include <settings.hpp>
 #include "../util/ObjectsKeeper.hpp"
 #include "Events.hpp"