diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index 84ed2894..663bc80d 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include "../coders/imageio.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../content/Content.hpp"
 #include "../content/ContentPack.hpp"
 #include "../data/dynamic.hpp"
diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp
index 09dd4b7f..93e8fe3c 100644
--- a/src/assets/AssetsLoader.hpp
+++ b/src/assets/AssetsLoader.hpp
@@ -9,9 +9,9 @@
 #include <string>
 #include <utility>
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
 #include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "Assets.hpp"
 
 namespace dynamic {
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index a2ed0d9d..702c38e0 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -10,7 +10,7 @@
 #include "../coders/imageio.hpp"
 #include "../coders/json.hpp"
 #include "../coders/obj.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../data/dynamic.hpp"
 #include "../files/engine_paths.hpp"
 #include "../files/files.hpp"
diff --git a/src/audio/AL/ALAudio.hpp b/src/audio/AL/ALAudio.hpp
index dca71558..a0dc4e6b 100644
--- a/src/audio/AL/ALAudio.hpp
+++ b/src/audio/AL/ALAudio.hpp
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../audio.hpp"
 
 #ifdef __APPLE__
diff --git a/src/audio/AL/alutil.hpp b/src/audio/AL/alutil.hpp
index f5b5a07d..26a11289 100644
--- a/src/audio/AL/alutil.hpp
+++ b/src/audio/AL/alutil.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <type_traits>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
diff --git a/src/audio/audio.hpp b/src/audio/audio.hpp
index 9e6b6f6f..ab7313af 100644
--- a/src/audio/audio.hpp
+++ b/src/audio/audio.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp
index 79bfb1cc..30125366 100644
--- a/src/coders/GLSLExtension.cpp
+++ b/src/coders/GLSLExtension.cpp
@@ -7,7 +7,7 @@
 
 #include "../files/engine_paths.hpp"
 #include "../files/files.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/stringutil.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/coders/byte_utils.hpp b/src/coders/byte_utils.hpp
index 3e6e2277..326bcdb1 100644
--- a/src/coders/byte_utils.hpp
+++ b/src/coders/byte_utils.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 /* byteorder: little-endian */
 class ByteBuilder {
diff --git a/src/coders/commons.hpp b/src/coders/commons.hpp
index 4b661880..9fe62dca 100644
--- a/src/coders/commons.hpp
+++ b/src/coders/commons.hpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline int is_box(int c) {
     switch (c) {
diff --git a/src/coders/gzip.hpp b/src/coders/gzip.hpp
index b35c898b..87184acb 100644
--- a/src/coders/gzip.hpp
+++ b/src/coders/gzip.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace gzip {
     const unsigned char MAGIC[] = "\x1F\x8B";
diff --git a/src/coders/json.hpp b/src/coders/json.hpp
index ad4c0735..0a5ff468 100644
--- a/src/coders/json.hpp
+++ b/src/coders/json.hpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "binary_json.hpp"
 
 namespace json {
diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp
index 7f4c9940..f6562f6e 100644
--- a/src/coders/ogg.cpp
+++ b/src/coders/ogg.cpp
@@ -7,7 +7,7 @@
 
 #include "../audio/audio.hpp"
 #include "../debug/Logger.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 static debug::Logger logger("ogg");
 
diff --git a/src/coders/rle.hpp b/src/coders/rle.hpp
index b4b5545f..a2e45a85 100644
--- a/src/coders/rle.hpp
+++ b/src/coders/rle.hpp
@@ -1,7 +1,7 @@
 #ifndef CODERS_RLE_HPP_
 #define CODERS_RLE_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace rle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);
diff --git a/src/constants.hpp b/src/constants.hpp
index 56ff3160..59b00fb0 100644
--- a/src/constants.hpp
+++ b/src/constants.hpp
@@ -1,7 +1,7 @@
 #ifndef CONSTANTS_HPP_
 #define CONSTANTS_HPP_
 
-#include "typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <limits>
 #include <string>
diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp
index 7808b48f..fafb81e1 100644
--- a/src/content/ContentLUT.cpp
+++ b/src/content/ContentLUT.cpp
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include "../coders/json.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../files/files.hpp"
 #include "../items/ItemDef.hpp"
 #include "../voxels/Block.hpp"
diff --git a/src/content/ContentLUT.hpp b/src/content/ContentLUT.hpp
index 6bc2e139..1d85f81b 100644
--- a/src/content/ContentLUT.hpp
+++ b/src/content/ContentLUT.hpp
@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "Content.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 16bccb34..e518340e 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -7,14 +7,14 @@
 #include <string>
 
 #include "../coders/json.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 #include "../files/files.hpp"
 #include "../items/ItemDef.hpp"
 #include "../logic/scripting/scripting.hpp"
 #include "../objects/rigging.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/listutil.hpp"
 #include "../util/stringutil.hpp"
 #include "../voxels/Block.hpp"
diff --git a/src/content/ContentPack.hpp b/src/content/ContentPack.hpp
index da373446..ff8555f2 100644
--- a/src/content/ContentPack.hpp
+++ b/src/content/ContentPack.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class EnginePaths;
 
diff --git a/src/content/content_fwd.hpp b/src/content/content_fwd.hpp
index 92392cc5..377b4d4d 100644
--- a/src/content/content_fwd.hpp
+++ b/src/content/content_fwd.hpp
@@ -1,7 +1,7 @@
 #ifndef CONTENT_CONTENT_FWD_HPP_
 #define CONTENT_CONTENT_FWD_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class ContentPackRuntime;
diff --git a/src/data/dynamic_fwd.hpp b/src/data/dynamic_fwd.hpp
index f655ed1a..154d4d70 100644
--- a/src/data/dynamic_fwd.hpp
+++ b/src/data/dynamic_fwd.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <variant>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace dynamic {
     class Map;
diff --git a/src/data/setting.hpp b/src/data/setting.hpp
index 4191ec6c..73378459 100644
--- a/src/data/setting.hpp
+++ b/src/data/setting.hpp
@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../delegates.hpp"
-#include "../typedefs.hpp"
+#include <delegates.hpp>
+#include <typedefs.hpp>
 
 enum class setting_format { simple, percent };
 
diff --git a/src/engine.cpp b/src/engine.cpp
index de4f7b4d..dbe894ad 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -12,7 +12,7 @@
 #include "content/Content.hpp"
 #include "content/ContentBuilder.hpp"
 #include "content/ContentLoader.hpp"
-#include "core_defs.hpp"
+#include <core_defs.hpp>
 #include "files/files.hpp"
 #include "files/settings_io.hpp"
 #include "frontend/locale.hpp"
@@ -37,7 +37,7 @@
 #include "window/input.hpp"
 #include "window/Window.hpp"
 #include "world/WorldGenerators.hpp"
-#include "settings.hpp"
+#include <settings.hpp>
 
 #include <iostream>
 #include <assert.h>
diff --git a/src/engine.hpp b/src/engine.hpp
index de18b3e3..4ed26867 100644
--- a/src/engine.hpp
+++ b/src/engine.hpp
@@ -1,8 +1,8 @@
 #ifndef ENGINE_HPP_
 #define ENGINE_HPP_
 
-#include "delegates.hpp"
-#include "typedefs.hpp"
+#include <delegates.hpp>
+#include <typedefs.hpp>
 
 #include "assets/Assets.hpp"
 #include "content/content_fwd.hpp"
diff --git a/src/files/WorldConverter.hpp b/src/files/WorldConverter.hpp
index 7e28bcf9..3ccf8642 100644
--- a/src/files/WorldConverter.hpp
+++ b/src/files/WorldConverter.hpp
@@ -5,9 +5,9 @@
 #include <memory>
 #include <queue>
 
-#include "../delegates.hpp"
+#include <delegates.hpp>
 #include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
index a9f81f6c..46ccba7b 100644
--- a/src/files/WorldFiles.cpp
+++ b/src/files/WorldFiles.cpp
@@ -10,9 +10,9 @@
 
 #include "../coders/byte_utils.hpp"
 #include "../coders/json.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
 #include "../items/Inventory.hpp"
@@ -22,8 +22,8 @@
 #include "../objects/EntityDef.hpp"
 #include "../objects/Player.hpp"
 #include "../physics/Hitbox.hpp"
-#include "../settings.hpp"
-#include "../typedefs.hpp"
+#include <settings.hpp>
+#include <typedefs.hpp>
 #include "../util/data_io.hpp"
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp
index 6f0e9bd6..84f77f87 100644
--- a/src/files/WorldFiles.hpp
+++ b/src/files/WorldFiles.hpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "../content/ContentPack.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../voxels/Chunk.hpp"
 #include "WorldRegions.hpp"
 #include "files.hpp"
diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp
index 6f8c101c..971438a6 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -10,7 +10,7 @@
 #include <unordered_map>
 
 #include "../data/dynamic_fwd.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/BufferPool.hpp"
 #include "../voxels/Chunk.hpp"
 #include "files.hpp"
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index 18713331..dbcd41ff 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -6,7 +6,7 @@
 #include <stack>
 #include <utility>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/stringutil.hpp"
 #include "WorldFiles.hpp"
 
diff --git a/src/files/files.hpp b/src/files/files.hpp
index 99bce793..5557b0f2 100644
--- a/src/files/files.hpp
+++ b/src/files/files.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp
index 10589fb1..2799ac81 100644
--- a/src/files/settings_io.cpp
+++ b/src/files/settings_io.cpp
@@ -6,7 +6,7 @@
 #include "../coders/json.hpp"
 #include "../coders/toml.hpp"
 #include "../debug/Logger.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../window/Events.hpp"
 #include "../window/input.hpp"
 
diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp
index 195b4fcd..d434db2b 100644
--- a/src/frontend/ContentGfxCache.cpp
+++ b/src/frontend/ContentGfxCache.cpp
@@ -5,7 +5,7 @@
 #include "../assets/Assets.hpp"
 #include "../content/Content.hpp"
 #include "../content/ContentPack.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.hpp"
diff --git a/src/frontend/ContentGfxCache.hpp b/src/frontend/ContentGfxCache.hpp
index f1f696d4..213e38c1 100644
--- a/src/frontend/ContentGfxCache.hpp
+++ b/src/frontend/ContentGfxCache.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
 #define FRONTEND_BLOCKS_GFX_CACHE_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 
diff --git a/src/frontend/UiDocument.hpp b/src/frontend/UiDocument.hpp
index 504411a9..6a9840b3 100644
--- a/src/frontend/UiDocument.hpp
+++ b/src/frontend/UiDocument.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_UI_DOCUMENT_HPP_
 #define FRONTEND_UI_DOCUMENT_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <string>
 #include <memory>
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 985e14f1..338fa751 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -1,7 +1,7 @@
 #include "../audio/audio.hpp"
-#include "../delegates.hpp"
-#include "../engine.hpp"
-#include "../settings.hpp"
+#include <delegates.hpp>
+#include <engine.hpp>
+#include <settings.hpp>
 #include "../content/Content.hpp"
 #include "../graphics/core/Mesh.hpp"
 #include "../graphics/ui/elements/CheckBox.hpp"
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index e4a83052..7c0ad0f7 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -6,9 +6,9 @@
 
 #include "../assets/Assets.hpp"
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
-#include "../delegates.hpp"
-#include "../engine.hpp"
+#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"
@@ -32,7 +32,7 @@
 #include "../maths/voxmaths.hpp"
 #include "../objects/Player.hpp"
 #include "../physics/Hitbox.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/stringutil.hpp"
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunk.hpp"
diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp
index a2a778ed..0f58d2b6 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_HUD_HPP_
 #define FRONTEND_HUD_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/ObjectsKeeper.hpp"
 
 #include <string>
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index cb4dc7f3..a69a91e7 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -4,8 +4,8 @@
 #include "UiDocument.hpp"
 #include "screens/MenuScreen.hpp"
 
-#include "../delegates.hpp"
-#include "../engine.hpp"
+#include <delegates.hpp>
+#include <engine.hpp>
 #include "../data/dynamic.hpp"
 #include "../interfaces/Task.hpp"
 #include "../files/engine_paths.hpp"
@@ -13,7 +13,7 @@
 #include "../graphics/ui/gui_util.hpp"
 #include "../graphics/ui/GUI.hpp"
 #include "../logic/scripting/scripting.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../coders/commons.hpp"
 #include "../util/stringutil.hpp"
 #include "../window/Window.hpp"
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index bdf6032f..f11ccd46 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -1,12 +1,12 @@
 #include "LevelScreen.hpp"
 
-#include "../../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../hud.hpp"
 #include "../LevelFrontend.hpp"
 #include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"
 #include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../files/files.hpp"
 #include "../../content/Content.hpp"
 #include "../../graphics/core/DrawContext.hpp"
diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp
index 74ad0421..e5d56f6c 100644
--- a/src/frontend/screens/MenuScreen.cpp
+++ b/src/frontend/screens/MenuScreen.cpp
@@ -8,7 +8,7 @@
 #include "../../maths/UVRegion.hpp"
 #include "../../window/Window.hpp"
 #include "../../window/Camera.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 
 MenuScreen::MenuScreen(Engine* engine) : Screen(engine) {
     engine->resetContent();
diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp
index 477baf24..32aa74b0 100644
--- a/src/frontend/screens/Screen.cpp
+++ b/src/frontend/screens/Screen.cpp
@@ -1,7 +1,7 @@
 #include "Screen.hpp"
 
 #include "../../graphics/core/Batch2D.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 
 Screen::Screen(Engine* engine)
   : engine(engine), 
diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp
index 827f6d0a..8de9dc1c 100644
--- a/src/graphics/core/Atlas.hpp
+++ b/src/graphics/core/Atlas.hpp
@@ -8,7 +8,7 @@
 #include <optional>
 #include <unordered_map>
 #include "../../maths/UVRegion.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class ImageData;
 class Texture;
diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp
index c25d6f0b..ae0b4282 100644
--- a/src/graphics/core/Batch3D.cpp
+++ b/src/graphics/core/Batch3D.cpp
@@ -4,7 +4,7 @@
 #include "Texture.hpp"
 
 #include <GL/glew.h>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/UVRegion.hpp"
 
 /// xyz, uv, rgba
diff --git a/src/graphics/core/Batch3D.hpp b/src/graphics/core/Batch3D.hpp
index 79b17697..5d05c460 100644
--- a/src/graphics/core/Batch3D.hpp
+++ b/src/graphics/core/Batch3D.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_BATCH3D_HPP_
 #define GRAPHICS_CORE_BATCH3D_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "commons.hpp"
 
 #include <memory>
diff --git a/src/graphics/core/DrawContext.hpp b/src/graphics/core/DrawContext.hpp
index ea152f20..ac816d13 100644
--- a/src/graphics/core/DrawContext.hpp
+++ b/src/graphics/core/DrawContext.hpp
@@ -3,7 +3,7 @@
 
 #include "commons.hpp"
 #include "Viewport.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Batch2D;
 class Framebuffer;
diff --git a/src/graphics/core/Font.hpp b/src/graphics/core/Font.hpp
index 72a17ca5..d2dd7e69 100644
--- a/src/graphics/core/Font.hpp
+++ b/src/graphics/core/Font.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Texture;
 class Batch2D;
diff --git a/src/graphics/core/Framebuffer.hpp b/src/graphics/core/Framebuffer.hpp
index 2cca9dde..ddb96316 100644
--- a/src/graphics/core/Framebuffer.hpp
+++ b/src/graphics/core/Framebuffer.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
 #define GRAPHICS_CORE_FRAMEBUFFER_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 
diff --git a/src/graphics/core/ImageData.hpp b/src/graphics/core/ImageData.hpp
index 0a0872f9..e4a77b09 100644
--- a/src/graphics/core/ImageData.hpp
+++ b/src/graphics/core/ImageData.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
 #define GRAPHICS_CORE_IMAGE_DATA_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 
diff --git a/src/graphics/core/Mesh.hpp b/src/graphics/core/Mesh.hpp
index abff9d5e..ee5bfbd1 100644
--- a/src/graphics/core/Mesh.hpp
+++ b/src/graphics/core/Mesh.hpp
@@ -2,7 +2,7 @@
 #define GRAPHICS_CORE_MESH_HPP_
 
 #include <stdlib.h>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 struct vattr {
     ubyte size;
diff --git a/src/graphics/core/Shader.hpp b/src/graphics/core/Shader.hpp
index 25d182a5..cd5e8832 100644
--- a/src/graphics/core/Shader.hpp
+++ b/src/graphics/core/Shader.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_SHADER_HPP_
 #define GRAPHICS_CORE_SHADER_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <string>
 #include <memory>
diff --git a/src/graphics/core/Texture.hpp b/src/graphics/core/Texture.hpp
index 62cbae43..16a8e1d2 100644
--- a/src/graphics/core/Texture.hpp
+++ b/src/graphics/core/Texture.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_TEXTURE_HPP_
 #define GRAPHICS_CORE_TEXTURE_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/UVRegion.hpp"
 #include "ImageData.hpp"
 
diff --git a/src/graphics/core/TextureAnimation.hpp b/src/graphics/core/TextureAnimation.hpp
index 839566bd..cc5da102 100644
--- a/src/graphics/core/TextureAnimation.hpp
+++ b/src/graphics/core/TextureAnimation.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
 #define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <glm/glm.hpp>
 #include <vector>
diff --git a/src/graphics/core/Viewport.hpp b/src/graphics/core/Viewport.hpp
index 30e9de1d..447289d3 100644
--- a/src/graphics/core/Viewport.hpp
+++ b/src/graphics/core/Viewport.hpp
@@ -3,7 +3,7 @@
 
 #include <glm/glm.hpp>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Viewport {
     uint width;
diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp
index cba0f90d..e02daf52 100644
--- a/src/graphics/render/BlocksPreview.cpp
+++ b/src/graphics/render/BlocksPreview.cpp
@@ -1,7 +1,7 @@
 #include "BlocksPreview.hpp"
 
 #include "../../assets/Assets.hpp"
-#include "../../constants.hpp"
+#include <constants.hpp>
 #include "../../content/Content.hpp"
 #include "../../frontend/ContentGfxCache.hpp"
 #include "../../voxels/Block.hpp"
diff --git a/src/graphics/render/BlocksPreview.hpp b/src/graphics/render/BlocksPreview.hpp
index 0431f7e7..ba08c0c2 100644
--- a/src/graphics/render/BlocksPreview.hpp
+++ b/src/graphics/render/BlocksPreview.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
 #define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <glm/glm.hpp>
 #include <memory>
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index b5ea8194..a249e324 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -2,7 +2,7 @@
 
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.hpp"
-#include "../../constants.hpp"
+#include <constants.hpp>
 #include "../../content/Content.hpp"
 #include "../../voxels/Block.hpp"
 #include "../../voxels/Chunk.hpp"
@@ -10,7 +10,7 @@
 #include "../../voxels/ChunksStorage.hpp"
 #include "../../lighting/Lightmap.hpp"
 #include "../../frontend/ContentGfxCache.hpp"
-#include "../../settings.hpp"
+#include <settings.hpp>
 
 #include <glm/glm.hpp>
 
diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp
index d6cd6eb1..f3430fce 100644
--- a/src/graphics/render/BlocksRenderer.hpp
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <glm/glm.hpp>
 #include "../../voxels/voxel.hpp"
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class Mesh;
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 0e7fe5cd..eaf802b4 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -4,7 +4,7 @@
 #include "../../graphics/core/Mesh.hpp"
 #include "../../voxels/Chunk.hpp"
 #include "../../world/Level.hpp"
-#include "../../settings.hpp"
+#include <settings.hpp>
 
 #include <iostream>
 #include <glm/glm.hpp>
diff --git a/src/graphics/render/Skybox.hpp b/src/graphics/render/Skybox.hpp
index 57bd9c99..e793b234 100644
--- a/src/graphics/render/Skybox.hpp
+++ b/src/graphics/render/Skybox.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../../maths/fastmaths.hpp"
 
 class Mesh;
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 08defc67..7a64267c 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -10,7 +10,7 @@
 
 #include "../../assets/Assets.hpp"
 #include "../../content/Content.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../frontend/LevelFrontend.hpp"
 #include "../../items/Inventory.hpp"
 #include "../../items/ItemDef.hpp"
@@ -21,7 +21,7 @@
 #include "../../maths/voxmaths.hpp"
 #include "../../objects/Entities.hpp"
 #include "../../objects/Player.hpp"
-#include "../../settings.hpp"
+#include <settings.hpp>
 #include "../../voxels/Block.hpp"
 #include "../../voxels/Chunk.hpp"
 #include "../../voxels/Chunks.hpp"
diff --git a/src/graphics/ui/GUI.hpp b/src/graphics/ui/GUI.hpp
index 9e8a387c..d54fd868 100644
--- a/src/graphics/ui/GUI.hpp
+++ b/src/graphics/ui/GUI.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_GUI_GUI_HPP_
 #define FRONTEND_GUI_GUI_HPP_
 
-#include "../../delegates.hpp"
+#include <delegates.hpp>
 
 #include <queue>
 #include <memory>
diff --git a/src/graphics/ui/elements/InventoryView.hpp b/src/graphics/ui/elements/InventoryView.hpp
index 476b4d99..7dd1b356 100644
--- a/src/graphics/ui/elements/InventoryView.hpp
+++ b/src/graphics/ui/elements/InventoryView.hpp
@@ -3,8 +3,8 @@
 
 #include "UINode.hpp"
 #include "Container.hpp"
-#include "../../../typedefs.hpp"
-#include "../../../constants.hpp"
+#include <typedefs.hpp>
+#include <constants.hpp>
 
 #include <vector>
 #include <functional>
diff --git a/src/graphics/ui/elements/Plotter.hpp b/src/graphics/ui/elements/Plotter.hpp
index b651abae..17d7d922 100644
--- a/src/graphics/ui/elements/Plotter.hpp
+++ b/src/graphics/ui/elements/Plotter.hpp
@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 
 #include "UINode.hpp"
-#include "../../../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <memory>
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp
index 056b933f..7281f0dd 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
 #define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
 
-#include "../../../delegates.hpp"
+#include <delegates.hpp>
 #include "../../../window/input.hpp"
 
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 15e31d8a..70e441cb 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -8,7 +8,7 @@
 #include "../../logic/scripting/scripting.hpp"
 #include "../../frontend/locale.hpp"
 #include "../../util/stringutil.hpp"
-#include "../../delegates.hpp"
+#include <delegates.hpp>
 
 #include <glm/glm.hpp>
 
diff --git a/src/graphics/ui/gui_util.hpp b/src/graphics/ui/gui_util.hpp
index 1f0950e3..31572f02 100644
--- a/src/graphics/ui/gui_util.hpp
+++ b/src/graphics/ui/gui_util.hpp
@@ -2,8 +2,8 @@
 #define FRONTEND_GUI_GUI_UTIL_HPP_
 
 #include "GUI.hpp"
-#include "../../typedefs.hpp"
-#include "../../delegates.hpp"
+#include <typedefs.hpp>
+#include <delegates.hpp>
 
 #include <memory>
 #include <string>
diff --git a/src/interfaces/Task.hpp b/src/interfaces/Task.hpp
index 7974baf5..ebcdc7fa 100644
--- a/src/interfaces/Task.hpp
+++ b/src/interfaces/Task.hpp
@@ -1,7 +1,7 @@
 #ifndef INTERFACES_TASK_HPP_
 #define INTERFACES_TASK_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 /// @brief Task is a finite process interface.
 /// 'work' is a metric of task progress/remaining work (jobs/bytes/something other)
diff --git a/src/items/Inventory.hpp b/src/items/Inventory.hpp
index c2c73d41..e6ca4f32 100644
--- a/src/items/Inventory.hpp
+++ b/src/items/Inventory.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "../interfaces/Serializable.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "ItemStack.hpp"
 
 namespace dynamic {
diff --git a/src/items/ItemDef.hpp b/src/items/ItemDef.hpp
index def1abb3..8ac8e47f 100644
--- a/src/items/ItemDef.hpp
+++ b/src/items/ItemDef.hpp
@@ -4,7 +4,7 @@
 #include <glm/glm.hpp>
 #include <string>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 struct item_funcs_set {
     bool init : 1;
diff --git a/src/items/ItemStack.hpp b/src/items/ItemStack.hpp
index 8cfbd2ed..f880f5f6 100644
--- a/src/items/ItemStack.hpp
+++ b/src/items/ItemStack.hpp
@@ -1,8 +1,8 @@
 #ifndef ITEMS_ITEM_STACK_HPP_
 #define ITEMS_ITEM_STACK_HPP_
 
-#include "../constants.hpp"
-#include "../typedefs.hpp"
+#include <constants.hpp>
+#include <typedefs.hpp>
 
 class ContentIndices;
 
diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp
index 6c00af35..59876ac4 100644
--- a/src/lighting/Lighting.cpp
+++ b/src/lighting/Lighting.cpp
@@ -6,7 +6,7 @@
 #include "../voxels/Chunk.hpp"
 #include "../voxels/voxel.hpp"
 #include "../voxels/Block.hpp"
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../util/timeutil.hpp"
 
 #include <memory>
diff --git a/src/lighting/Lighting.hpp b/src/lighting/Lighting.hpp
index ad867819..ecc588ba 100644
--- a/src/lighting/Lighting.hpp
+++ b/src/lighting/Lighting.hpp
@@ -1,7 +1,7 @@
 #ifndef LIGHTING_LIGHTING_HPP_
 #define LIGHTING_LIGHTING_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Content;
 class ContentIndices;
diff --git a/src/lighting/Lightmap.hpp b/src/lighting/Lightmap.hpp
index 43b6b4b0..36a7515f 100644
--- a/src/lighting/Lightmap.hpp
+++ b/src/lighting/Lightmap.hpp
@@ -1,8 +1,8 @@
 #ifndef LIGHTING_LIGHTMAP_HPP_
 #define LIGHTING_LIGHTMAP_HPP_
 
-#include "../constants.hpp"
-#include "../typedefs.hpp"
+#include <constants.hpp>
+#include <typedefs.hpp>
 
 #include <memory>
 
diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp
index f2a74738..6243f081 100644
--- a/src/logic/BlocksController.hpp
+++ b/src/logic/BlocksController.hpp
@@ -5,7 +5,7 @@
 #include <glm/glm.hpp>
 
 #include "../maths/fastmaths.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/Clock.hpp"
 #include "../voxels/voxel.hpp"
 
diff --git a/src/logic/ChunksController.hpp b/src/logic/ChunksController.hpp
index b777c405..d65eb9cb 100644
--- a/src/logic/ChunksController.hpp
+++ b/src/logic/ChunksController.hpp
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Level;
 class Chunk;
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index e7128e27..2a6c36ef 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -7,7 +7,7 @@
 #include "../coders/commons.hpp"
 #include "../content/ContentLUT.hpp"
 #include "../debug/Logger.hpp"
-#include "../engine.hpp"
+#include <engine.hpp>
 #include "../files/WorldConverter.hpp"
 #include "../files/WorldFiles.hpp"
 #include "../frontend/locale.hpp"
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index c86d6c75..f4adb481 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -7,7 +7,7 @@
 #include "../interfaces/Object.hpp"
 #include "../objects/Entities.hpp"
 #include "../physics/Hitbox.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "scripting/scripting.hpp"
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index c86e01dd..9c8381fd 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../items/Inventory.hpp"
 #include "../items/ItemDef.hpp"
 #include "../items/ItemStack.hpp"
@@ -14,7 +14,7 @@
 #include "../objects/Player.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../voxels/Block.hpp"
 #include "../voxels/Chunks.hpp"
 #include "../voxels/voxel.hpp"
diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp
index 1bf3704b..21573a73 100644
--- a/src/logic/scripting/lua/libaudio.cpp
+++ b/src/logic/scripting/lua/libaudio.cpp
@@ -1,5 +1,5 @@
 #include "../../../audio/audio.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "api_lua.hpp"
 
 inline const char* DEFAULT_CHANNEL = "regular";
diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp
index 4a106f95..0ec904a2 100644
--- a/src/logic/scripting/lua/libconsole.cpp
+++ b/src/logic/scripting/lua/libconsole.cpp
@@ -1,5 +1,5 @@
 #include "../../../coders/commons.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../CommandsInterpreter.hpp"
 #include "api_lua.hpp"
 
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index 0b28ddbd..1e29856d 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -1,8 +1,8 @@
 #include <memory>
 #include <vector>
 
-#include "../../../constants.hpp"
-#include "../../../engine.hpp"
+#include <constants.hpp>
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../files/settings_io.hpp"
 #include "../../../frontend/menu.hpp"
diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp
index 9e87cc11..33e61a6a 100644
--- a/src/logic/scripting/lua/libentity.cpp
+++ b/src/logic/scripting/lua/libentity.cpp
@@ -1,7 +1,7 @@
 #include "libentity.hpp"
 
 #include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../objects/Entities.hpp"
 #include "../../../objects/EntityDef.hpp"
 #include "../../../objects/Player.hpp"
diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp
index 785235a7..b140bbc4 100644
--- a/src/logic/scripting/lua/libfile.cpp
+++ b/src/logic/scripting/lua/libfile.cpp
@@ -2,7 +2,7 @@
 #include <string>
 
 #include "../../../coders/gzip.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../files/files.hpp"
 #include "../../../util/stringutil.hpp"
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 7b9872a8..ce572113 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -1,5 +1,5 @@
 #include "../../../assets/Assets.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/locale.hpp"
 #include "../../../graphics/ui/elements/Button.hpp"
diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp
index a421aa2e..8ad6b6e6 100644
--- a/src/logic/scripting/lua/libhud.cpp
+++ b/src/logic/scripting/lua/libhud.cpp
@@ -3,7 +3,7 @@
 
 #include "../../../assets/Assets.hpp"
 #include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/hud.hpp"
 #include "../../../graphics/ui/elements/InventoryView.hpp"
diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp
index 92fb4299..1f689229 100644
--- a/src/logic/scripting/lua/libinput.cpp
+++ b/src/logic/scripting/lua/libinput.cpp
@@ -1,4 +1,4 @@
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../frontend/hud.hpp"
 #include "../../../frontend/screens/Screen.hpp"
 #include "../../../graphics/ui/GUI.hpp"
diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp
index b7a20ca5..901cce9f 100644
--- a/src/logic/scripting/lua/libpack.cpp
+++ b/src/logic/scripting/lua/libpack.cpp
@@ -5,7 +5,7 @@
 
 #include "../../../assets/AssetsLoader.hpp"
 #include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/WorldFiles.hpp"
 #include "../../../files/engine_paths.hpp"
 #include "../../../world/Level.hpp"
diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp
index 29c501d3..5993a133 100644
--- a/src/logic/scripting/lua/libtime.cpp
+++ b/src/logic/scripting/lua/libtime.cpp
@@ -1,4 +1,4 @@
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../window/Window.hpp"
 #include "api_lua.hpp"
 
diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp
index 38ad347f..a1736f57 100644
--- a/src/logic/scripting/lua/libworld.cpp
+++ b/src/logic/scripting/lua/libworld.cpp
@@ -3,7 +3,7 @@
 
 #include "../../../assets/Assets.hpp"
 #include "../../../assets/AssetsLoader.hpp"
-#include "../../../engine.hpp"
+#include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../world/Level.hpp"
 #include "../../../world/World.hpp"
diff --git a/src/logic/scripting/lua/lua_commons.hpp b/src/logic/scripting/lua/lua_commons.hpp
index 8e82899c..35ca9b2f 100644
--- a/src/logic/scripting/lua/lua_commons.hpp
+++ b/src/logic/scripting/lua/lua_commons.hpp
@@ -1,7 +1,7 @@
 #ifndef LOGIC_SCRIPTING_LUA_HPP_
 #define LOGIC_SCRIPTING_LUA_HPP_
 
-#include "../../../delegates.hpp"
+#include <delegates.hpp>
 #include "../scripting.hpp"
 
 #ifdef __linux__
diff --git a/src/logic/scripting/lua/lua_engine.hpp b/src/logic/scripting/lua/lua_engine.hpp
index a21d4292..d57c62c4 100644
--- a/src/logic/scripting/lua/lua_engine.hpp
+++ b/src/logic/scripting/lua/lua_engine.hpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "../../../data/dynamic.hpp"
-#include "../../../delegates.hpp"
+#include <delegates.hpp>
 #include "../scripting_functional.hpp"
 #include "lua_util.hpp"
 
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index d928ad93..7b0e8411 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -6,7 +6,7 @@
 #include "../../content/Content.hpp"
 #include "../../content/ContentPack.hpp"
 #include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../files/engine_paths.hpp"
 #include "../../files/files.hpp"
 #include "../../frontend/UiDocument.hpp"
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index 85959b82..f955a527 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
-#include "../../typedefs.hpp"
+#include <delegates.hpp>
+#include <typedefs.hpp>
 #include "scripting_functional.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp
index b0bec218..40ccb596 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -5,8 +5,8 @@
 #include <string>
 
 #include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
-#include "../../typedefs.hpp"
+#include <delegates.hpp>
+#include <typedefs.hpp>
 
 namespace scripting {
     using common_func =
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index 97154337..c8019dc1 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -1,7 +1,7 @@
 #include "scripting_hud.hpp"
 
 #include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
+#include <engine.hpp>
 #include "../../files/files.hpp"
 #include "../../frontend/hud.hpp"
 #include "../../objects/Player.hpp"
diff --git a/src/logic/scripting/scripting_hud.hpp b/src/logic/scripting/scripting_hud.hpp
index 0ca10c04..1b8e9ae2 100644
--- a/src/logic/scripting/scripting_hud.hpp
+++ b/src/logic/scripting/scripting_hud.hpp
@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <string>
 
-#include "../../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/maths/fastmaths.hpp b/src/maths/fastmaths.hpp
index bade0390..4c03fd61 100644
--- a/src/maths/fastmaths.hpp
+++ b/src/maths/fastmaths.hpp
@@ -1,7 +1,7 @@
 #ifndef MATHS_FASTMATHS_HPP_
 #define MATHS_FASTMATHS_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class FastRandom {
     uint seed;
diff --git a/src/maths/voxmaths.hpp b/src/maths/voxmaths.hpp
index daae514c..bd11e79b 100644
--- a/src/maths/voxmaths.hpp
+++ b/src/maths/voxmaths.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXNATHS_HPP_
 #define VOXNATHS_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline int floordiv(int a, int b) {
     if (a < 0 && a % b) {
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index de5dc116..83a09ca2 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -7,7 +7,7 @@
 #include "../content/Content.hpp"
 #include "../data/dynamic_util.hpp"
 #include "../debug/Logger.hpp"
-#include "../engine.hpp"
+#include <engine.hpp>
 #include "../graphics/core/DrawContext.hpp"
 #include "../graphics/core/LineBatch.hpp"
 #include "../graphics/core/Model.hpp"
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index eb4d963f..e8fa1bc2 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -8,7 +8,7 @@
 
 #include "../data/dynamic.hpp"
 #include "../physics/Hitbox.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/Clock.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
 #include <entt/entity/registry.hpp>
diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp
index 6ddee669..9002f1ae 100644
--- a/src/objects/EntityDef.hpp
+++ b/src/objects/EntityDef.hpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../maths/aabb.hpp"
 #include "../physics/Hitbox.hpp"
 
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 8e97bde1..a0bc88bf 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -8,7 +8,7 @@
 #include "../data/dynamic.hpp"
 #include "../interfaces/Object.hpp"
 #include "../interfaces/Serializable.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../voxels/voxel.hpp"
 
 class Camera;
diff --git a/src/objects/rigging.hpp b/src/objects/rigging.hpp
index 2b1b54a1..0abf1fb1 100644
--- a/src/objects/rigging.hpp
+++ b/src/objects/rigging.hpp
@@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class Assets;
 class ModelBatch;
diff --git a/src/physics/Hitbox.hpp b/src/physics/Hitbox.hpp
index 6d96f3f0..932bc4d4 100644
--- a/src/physics/Hitbox.hpp
+++ b/src/physics/Hitbox.hpp
@@ -2,7 +2,7 @@
 #define PHYSICS_HITBOX_HPP_
 
 #include "../maths/aabb.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #include <set>
 #include <string>
diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp
index fbc9812b..f4239f9d 100644
--- a/src/physics/PhysicsSolver.hpp
+++ b/src/physics/PhysicsSolver.hpp
@@ -3,7 +3,7 @@
 
 #include "Hitbox.hpp"
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../voxels/voxel.hpp"
 
 #include <vector>
diff --git a/src/settings.hpp b/src/settings.hpp
index ccc3f906..bd556766 100644
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -5,8 +5,8 @@
 #include <unordered_map>
 
 #include "data/setting.hpp"
-#include "constants.hpp"
-#include "typedefs.hpp"
+#include <constants.hpp>
+#include <typedefs.hpp>
 
 struct AudioSettings {
     /// @brief try to initialize AL backend
diff --git a/src/util/BufferPool.hpp b/src/util/BufferPool.hpp
index 4b72acf6..cf7b0412 100644
--- a/src/util/BufferPool.hpp
+++ b/src/util/BufferPool.hpp
@@ -6,7 +6,7 @@
 #include <queue>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace util {
     /// @brief Thread-safe pool of same-sized buffers
diff --git a/src/util/RunnablesList.hpp b/src/util/RunnablesList.hpp
index 8955c9a4..7ae8af4f 100644
--- a/src/util/RunnablesList.hpp
+++ b/src/util/RunnablesList.hpp
@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <utility>
 
-#include "../delegates.hpp"
-#include "../typedefs.hpp"
+#include <delegates.hpp>
+#include <typedefs.hpp>
 
 namespace util {
     class RunnablesList {
diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp
index 93c61aec..8b76830e 100644
--- a/src/util/ThreadPool.hpp
+++ b/src/util/ThreadPool.hpp
@@ -11,7 +11,7 @@
 #include <utility>
 
 #include "../debug/Logger.hpp"
-#include "../delegates.hpp"
+#include <delegates.hpp>
 #include "../interfaces/Task.hpp"
 
 namespace util {
diff --git a/src/util/data_io.hpp b/src/util/data_io.hpp
index dbfae0c6..9aa1248c 100644
--- a/src/util/data_io.hpp
+++ b/src/util/data_io.hpp
@@ -1,7 +1,7 @@
 #ifndef UTIL_DATA_IO_HPP_
 #define UTIL_DATA_IO_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace dataio {
     /* Read big-endian 16 bit signed integer from bytes */
diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index c7b71bbf..00e64b12 100644
--- a/src/util/platform.cpp
+++ b/src/util/platform.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #ifdef _WIN32
 #include <Windows.h>
diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp
index c25bd182..04de47a8 100644
--- a/src/util/stringutil.hpp
+++ b/src/util/stringutil.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace util {
     /// @brief Function used for string serialization in text formats
diff --git a/src/util/timeutil.hpp b/src/util/timeutil.hpp
index 4e032d9d..b92d84d4 100644
--- a/src/util/timeutil.hpp
+++ b/src/util/timeutil.hpp
@@ -3,7 +3,7 @@
 
 #include <chrono>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 namespace timeutil {
     class Timer {
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index c6a2ec7e..2106e353 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -1,5 +1,5 @@
-#include "engine.hpp"
-#include "settings.hpp"
+#include <engine.hpp>
+#include <settings.hpp>
 #include "files/settings_io.hpp"
 #include "files/engine_paths.hpp"
 #include "util/platform.hpp"
diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp
index 4abdd339..d9ab6461 100644
--- a/src/voxels/Block.cpp
+++ b/src/voxels/Block.cpp
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../util/stringutil.hpp"
 
 std::string to_string(BlockModel model) {
diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp
index 9a01bb44..251fbb83 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -8,7 +8,7 @@
 
 #include "../maths/UVRegion.hpp"
 #include "../maths/aabb.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline std::string BLOCK_ITEM_SUFFIX = ".item";
 
diff --git a/src/voxels/Chunk.hpp b/src/voxels/Chunk.hpp
index 0d8b0d8a..5023266f 100644
--- a/src/voxels/Chunk.hpp
+++ b/src/voxels/Chunk.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include "../constants.hpp"
+#include <constants.hpp>
 #include "../lighting/Lightmap.hpp"
 #include "voxel.hpp"
 
diff --git a/src/voxels/Chunks.hpp b/src/voxels/Chunks.hpp
index fbc1b9d1..73fea7ab 100644
--- a/src/voxels/Chunks.hpp
+++ b/src/voxels/Chunks.hpp
@@ -7,7 +7,7 @@
 #include <memory>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "voxel.hpp"
 
 class VoxelRenderer;
diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp
index 389ac3b8..c518005d 100644
--- a/src/voxels/ChunksStorage.cpp
+++ b/src/voxels/ChunksStorage.cpp
@@ -7,7 +7,7 @@
 #include "../lighting/Lightmap.hpp"
 #include "../maths/voxmaths.hpp"
 #include "../objects/Entities.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "Block.hpp"
diff --git a/src/voxels/ChunksStorage.hpp b/src/voxels/ChunksStorage.hpp
index 7560b8a4..8b425350 100644
--- a/src/voxels/ChunksStorage.hpp
+++ b/src/voxels/ChunksStorage.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "voxel.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL
diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp
index 99a5a0f2..98a2bbe7 100644
--- a/src/voxels/DefaultWorldGenerator.cpp
+++ b/src/voxels/DefaultWorldGenerator.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "../maths/FastNoiseLite.h"
 #include "../maths/util.hpp"
 #include "../maths/voxmaths.hpp"
diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp
index 63fbb6d6..28721eb7 100644
--- a/src/voxels/DefaultWorldGenerator.hpp
+++ b/src/voxels/DefaultWorldGenerator.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
 #define VOXELS_DEFAULTWORLDGENERATOR_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../voxels/WorldGenerator.hpp"
 
 struct voxel;
diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp
index 2121f888..b56c12a4 100644
--- a/src/voxels/FlatWorldGenerator.cpp
+++ b/src/voxels/FlatWorldGenerator.cpp
@@ -1,7 +1,7 @@
 #include "FlatWorldGenerator.hpp"
 
 #include "../content/Content.hpp"
-#include "../core_defs.hpp"
+#include <core_defs.hpp>
 #include "Chunk.hpp"
 #include "voxel.hpp"
 
diff --git a/src/voxels/FlatWorldGenerator.hpp b/src/voxels/FlatWorldGenerator.hpp
index bc507b30..7e0d9220 100644
--- a/src/voxels/FlatWorldGenerator.hpp
+++ b/src/voxels/FlatWorldGenerator.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXELS_FLATWORLDGENERATOR_HPP_
 #define VOXELS_FLATWORLDGENERATOR_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../voxels/WorldGenerator.hpp"
 
 struct voxel;
diff --git a/src/voxels/VoxelsVolume.hpp b/src/voxels/VoxelsVolume.hpp
index 59afbbaf..8bf0016f 100644
--- a/src/voxels/VoxelsVolume.hpp
+++ b/src/voxels/VoxelsVolume.hpp
@@ -1,8 +1,8 @@
 #ifndef VOXELS_VOXELSVOLUME_HPP_
 #define VOXELS_VOXELSVOLUME_HPP_
 
-#include "../constants.hpp"
-#include "../typedefs.hpp"
+#include <constants.hpp>
+#include <typedefs.hpp>
 #include "voxel.hpp"
 
 class VoxelsVolume {
diff --git a/src/voxels/WorldGenerator.hpp b/src/voxels/WorldGenerator.hpp
index 1c57c0ff..b404dd58 100644
--- a/src/voxels/WorldGenerator.hpp
+++ b/src/voxels/WorldGenerator.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 struct voxel;
 class Content;
diff --git a/src/voxels/voxel.hpp b/src/voxels/voxel.hpp
index 637375f5..9243dc89 100644
--- a/src/voxels/voxel.hpp
+++ b/src/voxels/voxel.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXELS_VOXEL_HPP_
 #define VOXELS_VOXEL_HPP_
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 inline constexpr int BLOCK_DIR_NORTH = 0x0;
 inline constexpr int BLOCK_DIR_WEST = 0x1;
diff --git a/src/window/Events.hpp b/src/window/Events.hpp
index 5977d8ae..aa5b64e5 100644
--- a/src/window/Events.hpp
+++ b/src/window/Events.hpp
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "input.hpp"
 
 inline constexpr short KEYS_BUFFER_SIZE = 1036;
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index 798e862e..9ce1a063 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -10,7 +10,7 @@
 #include "../debug/Logger.hpp"
 #include "../graphics/core/ImageData.hpp"
 #include "../graphics/core/Texture.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../util/ObjectsKeeper.hpp"
 #include "Events.hpp"
 
diff --git a/src/window/Window.hpp b/src/window/Window.hpp
index a19ed5bc..e5214725 100644
--- a/src/window/Window.hpp
+++ b/src/window/Window.hpp
@@ -6,7 +6,7 @@
 #include <stack>
 #include <vector>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 class ImageData;
 struct DisplaySettings;
diff --git a/src/world/Level.cpp b/src/world/Level.cpp
index f27ae8d8..0ea50190 100644
--- a/src/world/Level.cpp
+++ b/src/world/Level.cpp
@@ -9,7 +9,7 @@
 #include "../objects/Player.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"
 #include "../voxels/ChunksStorage.hpp"
diff --git a/src/world/World.cpp b/src/world/World.cpp
index e6cff781..f5546f4f 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -11,7 +11,7 @@
 #include "../items/Inventories.hpp"
 #include "../objects/Entities.hpp"
 #include "../objects/Player.hpp"
-#include "../settings.hpp"
+#include <settings.hpp>
 #include "../voxels/Chunk.hpp"
 #include "../voxels/Chunks.hpp"
 #include "../voxels/ChunksStorage.hpp"
diff --git a/src/world/World.hpp b/src/world/World.hpp
index 2c4eac32..667be01f 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -9,7 +9,7 @@
 #include "../content/ContentPack.hpp"
 #include "../data/dynamic.hpp"
 #include "../interfaces/Serializable.hpp"
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 #include "../util/timeutil.hpp"
 
 class Content;