diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fac4730..8a726e64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 
 add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 if(VOXELENGINE_BUILD_APPDIR)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/bin)
diff --git a/flake.lock b/flake.lock
index df79ce91..55f50fc4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717399147,
-        "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=",
+        "lastModified": 1722802969,
+        "narHash": "sha256-bPhyAXNnVerBZusxOuPMhMm0X7hSFLFKcH+7ynfgLjs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5",
+        "rev": "785feb91183a50959823ff9ba9ef673105259cd5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 602e7b82..a1c9d20b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
         devShells.default = with nixpkgs.legacyPackages.${system}; mkShell {
           nativeBuildInputs = [ cmake pkg-config ];
           buildInputs = [ glm glfw glew zlib libpng libvorbis openal luajit  ]; # libglvnd
-          packages = [ mesa freeglut entt ];
+          packages = [ glfw mesa freeglut entt ];
           LD_LIBRARY_PATH = "${wayland}/lib:$LD_LIBRARY_PATH";
         };
     });
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 84ed2894..d4b6d5ed 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -4,19 +4,19 @@
 #include <memory>
 #include <utility>
 
-#include "../coders/imageio.hpp"
-#include "../constants.hpp"
-#include "../content/Content.hpp"
-#include "../content/ContentPack.hpp"
-#include "../data/dynamic.hpp"
-#include "../debug/Logger.hpp"
-#include "../files/engine_paths.hpp"
-#include "../files/files.hpp"
-#include "../graphics/core/Texture.hpp"
-#include "../logic/scripting/scripting.hpp"
-#include "../objects/rigging.hpp"
-#include "../util/ThreadPool.hpp"
-#include "../voxels/Block.hpp"
+#include <coders/imageio.hpp>
+#include <constants.hpp>
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
+#include <data/dynamic.hpp>
+#include <debug/Logger.hpp>
+#include <files/engine_paths.hpp>
+#include <files/files.hpp>
+#include <graphics/core/Texture.hpp>
+#include <logic/scripting/scripting.hpp>
+#include <objects/rigging.hpp>
+#include <util/ThreadPool.hpp>
+#include <voxels/Block.hpp>
 #include "Assets.hpp"
 #include "assetload_funcs.hpp"
 
diff --git a/src/assets/AssetsLoader.hpp b/src/assets/AssetsLoader.hpp
index 09dd4b7f..38db983b 100644
--- a/src/assets/AssetsLoader.hpp
+++ b/src/assets/AssetsLoader.hpp
@@ -9,9 +9,9 @@
 #include <string>
 #include <utility>
 
-#include "../delegates.hpp"
-#include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <delegates.hpp>
+#include <interfaces/Task.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..e64687e5 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -4,25 +4,25 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "../audio/audio.hpp"
-#include "../coders/GLSLExtension.hpp"
-#include "../coders/commons.hpp"
-#include "../coders/imageio.hpp"
-#include "../coders/json.hpp"
-#include "../coders/obj.hpp"
-#include "../constants.hpp"
-#include "../data/dynamic.hpp"
-#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 "../objects/rigging.hpp"
+#include <audio/audio.hpp>
+#include <coders/GLSLExtension.hpp>
+#include <coders/commons.hpp>
+#include <coders/imageio.hpp>
+#include <coders/json.hpp>
+#include <coders/obj.hpp>
+#include <constants.hpp>
+#include <data/dynamic.hpp>
+#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 <objects/rigging.hpp>
 #include "Assets.hpp"
 #include "AssetsLoader.hpp"
 
diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp
index fe0891e3..a2f72c41 100644
--- a/src/audio/AL/ALAudio.cpp
+++ b/src/audio/AL/ALAudio.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <utility>
 
-#include "../../debug/Logger.hpp"
+#include <debug/Logger.hpp>
 #include "alutil.hpp"
 
 static debug::Logger logger("al-audio");
diff --git a/src/audio/AL/ALAudio.hpp b/src/audio/AL/ALAudio.hpp
index dca71558..4a3f0e55 100644
--- a/src/audio/AL/ALAudio.hpp
+++ b/src/audio/AL/ALAudio.hpp
@@ -7,8 +7,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../../typedefs.hpp"
-#include "../audio.hpp"
+#include <typedefs.hpp>
+#include <audio/audio.hpp>
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
diff --git a/src/audio/AL/alutil.cpp b/src/audio/AL/alutil.cpp
index 5fca2244..7d59e7ea 100644
--- a/src/audio/AL/alutil.cpp
+++ b/src/audio/AL/alutil.cpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <type_traits>
 
-#include "../../debug/Logger.hpp"
+#include <debug/Logger.hpp>
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
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.cpp b/src/audio/audio.cpp
index ca743b54..0b8f979a 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../coders/ogg.hpp"
-#include "../coders/wav.hpp"
+#include <coders/ogg.hpp>
+#include <coders/wav.hpp>
 #include "AL/ALAudio.hpp"
 #include "NoAudio.hpp"
 
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..fafd13f9 100644
--- a/src/coders/GLSLExtension.cpp
+++ b/src/coders/GLSLExtension.cpp
@@ -5,10 +5,10 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../files/engine_paths.hpp"
-#include "../files/files.hpp"
-#include "../typedefs.hpp"
-#include "../util/stringutil.hpp"
+#include <files/engine_paths.hpp>
+#include <files/files.hpp>
+#include <typedefs.hpp>
+#include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/coders/binary_json.cpp b/src/coders/binary_json.cpp
index b71ac933..0603328a 100644
--- a/src/coders/binary_json.cpp
+++ b/src/coders/binary_json.cpp
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "byte_utils.hpp"
 #include "gzip.hpp"
 
diff --git a/src/coders/binary_json.hpp b/src/coders/binary_json.hpp
index f0d34efa..9bcdf04e 100644
--- a/src/coders/binary_json.hpp
+++ b/src/coders/binary_json.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace dynamic {
     class Map;
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.cpp b/src/coders/commons.cpp
index 36e10db5..5da5659e 100644
--- a/src/coders/commons.cpp
+++ b/src/coders/commons.cpp
@@ -5,7 +5,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 inline double power(double base, int64_t power) {
     double result = 1.0;
diff --git a/src/coders/commons.hpp b/src/coders/commons.hpp
index 4b661880..6a16b7d4 100644
--- a/src/coders/commons.hpp
+++ b/src/coders/commons.hpp
@@ -4,8 +4,8 @@
 #include <stdexcept>
 #include <string>
 
-#include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <data/dynamic.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/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/json.cpp b/src/coders/json.cpp
index 102840ec..77cce710 100644
--- a/src/coders/json.cpp
+++ b/src/coders/json.cpp
@@ -6,8 +6,8 @@
 #include <memory>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
-#include "../util/stringutil.hpp"
+#include <data/dynamic.hpp>
+#include <util/stringutil.hpp>
 #include "commons.hpp"
 
 using namespace json;
diff --git a/src/coders/json.hpp b/src/coders/json.hpp
index ad4c0735..8254eeb5 100644
--- a/src/coders/json.hpp
+++ b/src/coders/json.hpp
@@ -3,8 +3,8 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <data/dynamic.hpp>
+#include <typedefs.hpp>
 #include "binary_json.hpp"
 
 namespace json {
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/ogg.cpp b/src/coders/ogg.cpp
index 7f4c9940..123b6979 100644
--- a/src/coders/ogg.cpp
+++ b/src/coders/ogg.cpp
@@ -5,9 +5,9 @@
 
 #include <string>
 
-#include "../audio/audio.hpp"
-#include "../debug/Logger.hpp"
-#include "../typedefs.hpp"
+#include <audio/audio.hpp>
+#include <debug/Logger.hpp>
+#include <typedefs.hpp>
 
 static debug::Logger logger("ogg");
 
diff --git a/src/coders/png.cpp b/src/coders/png.cpp
index c7c9b179..14f5c801 100644
--- a/src/coders/png.cpp
+++ b/src/coders/png.cpp
@@ -4,10 +4,10 @@
 
 #include <iostream>
 
-#include "../debug/Logger.hpp"
-#include "../files/files.hpp"
-#include "../graphics/core/GLTexture.hpp"
-#include "../graphics/core/ImageData.hpp"
+#include <debug/Logger.hpp>
+#include <files/files.hpp>
+#include <graphics/core/GLTexture.hpp>
+#include <graphics/core/ImageData.hpp>
 
 static debug::Logger logger("png-coder");
 
@@ -28,7 +28,6 @@ int _png_write(
     FILE* fp = fopen(filename, "wb");
     if (fp == nullptr) {
         logger.error() << "could not open file " << filename << " for writing";
-        fclose(fp);
         return 1;
     }
 
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/coders/toml.cpp b/src/coders/toml.cpp
index 9250b431..dc5624cd 100644
--- a/src/coders/toml.cpp
+++ b/src/coders/toml.cpp
@@ -6,10 +6,10 @@
 #include <iomanip>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
-#include "../data/setting.hpp"
-#include "../files/settings_io.hpp"
-#include "../util/stringutil.hpp"
+#include <data/dynamic.hpp>
+#include <data/setting.hpp>
+#include <files/settings_io.hpp>
+#include <util/stringutil.hpp>
 #include "commons.hpp"
 
 using namespace toml;
diff --git a/src/coders/toml.hpp b/src/coders/toml.hpp
index 28319969..032e1cf6 100644
--- a/src/coders/toml.hpp
+++ b/src/coders/toml.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class SettingsHandler;
 
diff --git a/src/coders/wav.cpp b/src/coders/wav.cpp
index c007308d..28a94bda 100644
--- a/src/coders/wav.cpp
+++ b/src/coders/wav.cpp
@@ -6,8 +6,8 @@
 #include <string>
 #include <vector>
 
-#include "../audio/audio.hpp"
-#include "../debug/Logger.hpp"
+#include <audio/audio.hpp>
+#include <debug/Logger.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index 15d1f9b4..647ad4b6 100644
--- a/src/coders/xml.cpp
+++ b/src/coders/xml.cpp
@@ -5,7 +5,7 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace xml;
 
diff --git a/src/constants.hpp b/src/constants.hpp
index e98d5914..5189a359 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/Content.cpp b/src/content/Content.cpp
index 0171f27a..3f3cf32e 100644
--- a/src/content/Content.cpp
+++ b/src/content/Content.cpp
@@ -5,11 +5,11 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../items/ItemDef.hpp"
-#include "../logic/scripting/scripting.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../objects/rigging.hpp"
-#include "../voxels/Block.hpp"
+#include <items/ItemDef.hpp>
+#include <logic/scripting/scripting.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/rigging.hpp>
+#include <voxels/Block.hpp>
 #include "ContentPack.hpp"
 
 ContentIndices::ContentIndices(
diff --git a/src/content/Content.hpp b/src/content/Content.hpp
index 5d0611b1..e8e8a2d7 100644
--- a/src/content/Content.hpp
+++ b/src/content/Content.hpp
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 #include "content_fwd.hpp"
 
 using DrawGroups = std::set<ubyte>;
diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp
index 0d94b61e..f68af5d3 100644
--- a/src/content/ContentBuilder.cpp
+++ b/src/content/ContentBuilder.cpp
@@ -1,6 +1,6 @@
 #include "ContentBuilder.hpp"
 
-#include "../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 
 ContentBuilder::~ContentBuilder() = default;
 
diff --git a/src/content/ContentBuilder.hpp b/src/content/ContentBuilder.hpp
index 10cdd480..f27bd8f8 100644
--- a/src/content/ContentBuilder.hpp
+++ b/src/content/ContentBuilder.hpp
@@ -5,11 +5,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../content/Content.hpp"
-#include "../content/ContentPack.hpp"
-#include "../items/ItemDef.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../voxels/Block.hpp"
+#include "Content.hpp"
+#include "ContentPack.hpp"
+#include <items/ItemDef.hpp>
+#include <objects/EntityDef.hpp>
+#include <voxels/Block.hpp>
 
 template <class T>
 class ContentUnitBuilder {
diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp
index 7808b48f..c1c4c960 100644
--- a/src/content/ContentLUT.cpp
+++ b/src/content/ContentLUT.cpp
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include "../coders/json.hpp"
-#include "../constants.hpp"
-#include "../files/files.hpp"
-#include "../items/ItemDef.hpp"
-#include "../voxels/Block.hpp"
+#include <coders/json.hpp>
+#include <constants.hpp>
+#include <files/files.hpp>
+#include <items/ItemDef.hpp>
+#include <voxels/Block.hpp>
 #include "Content.hpp"
 
 ContentLUT::ContentLUT(
diff --git a/src/content/ContentLUT.hpp b/src/content/ContentLUT.hpp
index 6bc2e139..12723073 100644
--- a/src/content/ContentLUT.hpp
+++ b/src/content/ContentLUT.hpp
@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 
-#include "../constants.hpp"
-#include "../data/dynamic.hpp"
-#include "../typedefs.hpp"
+#include <constants.hpp>
+#include <data/dynamic.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..67f1965e 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -6,18 +6,18 @@
 #include <memory>
 #include <string>
 
-#include "../coders/json.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 "../util/listutil.hpp"
-#include "../util/stringutil.hpp"
-#include "../voxels/Block.hpp"
+#include <coders/json.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 <util/listutil.hpp>
+#include <util/stringutil.hpp>
+#include <voxels/Block.hpp>
 #include "Content.hpp"
 #include "ContentBuilder.hpp"
 #include "ContentPack.hpp"
diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index 6fdd83e3..f4890e8f 100644
--- a/src/content/ContentPack.cpp
+++ b/src/content/ContentPack.cpp
@@ -4,10 +4,10 @@
 #include <iostream>
 #include <utility>
 
-#include "../coders/json.hpp"
-#include "../data/dynamic.hpp"
-#include "../files/engine_paths.hpp"
-#include "../files/files.hpp"
+#include <coders/json.hpp>
+#include <data/dynamic.hpp>
+#include <files/engine_paths.hpp>
+#include <files/files.hpp>
 
 namespace fs = std::filesystem;
 
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/PacksManager.cpp b/src/content/PacksManager.cpp
index 76a98e3b..5934feb3 100644
--- a/src/content/PacksManager.cpp
+++ b/src/content/PacksManager.cpp
@@ -3,7 +3,7 @@
 #include <queue>
 #include <sstream>
 
-#include "../util/listutil.hpp"
+#include <util/listutil.hpp>
 
 PacksManager::PacksManager() = default;
 
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/core_defs.cpp b/src/core_defs.cpp
index 549988d0..0fd648b9 100644
--- a/src/core_defs.cpp
+++ b/src/core_defs.cpp
@@ -1,14 +1,14 @@
 #include "core_defs.hpp"
 
-#include "items/ItemDef.hpp"
-#include "content/Content.hpp"
-#include "content/ContentBuilder.hpp"
-#include "files/files.hpp"
-#include "files/engine_paths.hpp"
-#include "window/Window.hpp"
-#include "window/Events.hpp"
-#include "window/input.hpp"
-#include "voxels/Block.hpp"
+#include <items/ItemDef.hpp>
+#include <content/Content.hpp>
+#include <content/ContentBuilder.hpp>
+#include <files/files.hpp>
+#include <files/engine_paths.hpp>
+#include <window/Window.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
+#include <voxels/Block.hpp>
 
 // All in-game definitions (blocks, items, etc..)
 void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) {
diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp
index dc4171cc..792f1932 100644
--- a/src/data/dynamic.cpp
+++ b/src/data/dynamic.cpp
@@ -1,6 +1,6 @@
 #include "dynamic.hpp"
 
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 
 using namespace dynamic;
 
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.cpp b/src/data/setting.cpp
index b6a9bbf7..397caf24 100644
--- a/src/data/setting.cpp
+++ b/src/data/setting.cpp
@@ -1,6 +1,6 @@
 #include "setting.hpp"
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 std::string NumberSetting::toString() const {
     switch (getFormat()) {
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..7bbff33b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -2,42 +2,42 @@
 
 #define GLEW_STATIC
 
-#include "debug/Logger.hpp"
-#include "assets/AssetsLoader.hpp"
-#include "audio/audio.hpp"
-#include "coders/GLSLExtension.hpp"
-#include "coders/imageio.hpp"
-#include "coders/json.hpp"
-#include "coders/toml.hpp"
-#include "content/Content.hpp"
-#include "content/ContentBuilder.hpp"
-#include "content/ContentLoader.hpp"
-#include "core_defs.hpp"
-#include "files/files.hpp"
-#include "files/settings_io.hpp"
-#include "frontend/locale.hpp"
-#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 "objects/rigging.hpp"
-#include "logic/EngineController.hpp"
-#include "logic/CommandsInterpreter.hpp"
-#include "logic/scripting/scripting.hpp"
-#include "util/listutil.hpp"
-#include "util/platform.hpp"
-#include "voxels/DefaultWorldGenerator.hpp"
-#include "voxels/FlatWorldGenerator.hpp"
-#include "window/Camera.hpp"
-#include "window/Events.hpp"
-#include "window/input.hpp"
-#include "window/Window.hpp"
-#include "world/WorldGenerators.hpp"
-#include "settings.hpp"
+#include <debug/Logger.hpp>
+#include <assets/AssetsLoader.hpp>
+#include <audio/audio.hpp>
+#include <coders/GLSLExtension.hpp>
+#include <coders/imageio.hpp>
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
+#include <content/Content.hpp>
+#include <content/ContentBuilder.hpp>
+#include <content/ContentLoader.hpp>
+#include <core_defs.hpp>
+#include <files/files.hpp>
+#include <files/settings_io.hpp>
+#include <frontend/locale.hpp>
+#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 <objects/rigging.hpp>
+#include <logic/EngineController.hpp>
+#include <logic/CommandsInterpreter.hpp>
+#include <logic/scripting/scripting.hpp>
+#include <util/listutil.hpp>
+#include <util/platform.hpp>
+#include <voxels/DefaultWorldGenerator.hpp>
+#include <voxels/FlatWorldGenerator.hpp>
+#include <window/Camera.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
+#include <window/Window.hpp>
+#include <world/WorldGenerators.hpp>
+#include <settings.hpp>
 
 #include <iostream>
 #include <assert.h>
diff --git a/src/engine.hpp b/src/engine.hpp
index de18b3e3..b9007699 100644
--- a/src/engine.hpp
+++ b/src/engine.hpp
@@ -1,15 +1,15 @@
 #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"
-#include "content/ContentPack.hpp"
-#include "content/PacksManager.hpp"
-#include "files/engine_paths.hpp"
-#include "util/ObjectsKeeper.hpp"
+#include <assets/Assets.hpp>
+#include <content/content_fwd.hpp>
+#include <content/ContentPack.hpp>
+#include <content/PacksManager.hpp>
+#include <files/engine_paths.hpp>
+#include <util/ObjectsKeeper.hpp>
 
 #include <filesystem>
 #include <memory>
diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp
index 317c8240..da0f625e 100644
--- a/src/files/WorldConverter.cpp
+++ b/src/files/WorldConverter.cpp
@@ -5,13 +5,13 @@
 #include <stdexcept>
 #include <utility>
 
-#include "../content/ContentLUT.hpp"
-#include "../data/dynamic.hpp"
-#include "../debug/Logger.hpp"
-#include "../files/files.hpp"
-#include "../objects/Player.hpp"
-#include "../util/ThreadPool.hpp"
-#include "../voxels/Chunk.hpp"
+#include <content/ContentLUT.hpp>
+#include <data/dynamic.hpp>
+#include <debug/Logger.hpp>
+#include <files/files.hpp>
+#include <objects/Player.hpp>
+#include <util/ThreadPool.hpp>
+#include <voxels/Chunk.hpp>
 #include "WorldFiles.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/files/WorldConverter.hpp b/src/files/WorldConverter.hpp
index 7e28bcf9..5b9f13fa 100644
--- a/src/files/WorldConverter.hpp
+++ b/src/files/WorldConverter.hpp
@@ -5,9 +5,9 @@
 #include <memory>
 #include <queue>
 
-#include "../delegates.hpp"
-#include "../interfaces/Task.hpp"
-#include "../typedefs.hpp"
+#include <delegates.hpp>
+#include <interfaces/Task.hpp>
+#include <typedefs.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
index a9f81f6c..68f3b56f 100644
--- a/src/files/WorldFiles.cpp
+++ b/src/files/WorldFiles.cpp
@@ -8,28 +8,28 @@
 #include <sstream>
 #include <utility>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/json.hpp"
-#include "../constants.hpp"
-#include "../content/Content.hpp"
-#include "../core_defs.hpp"
-#include "../data/dynamic.hpp"
-#include "../debug/Logger.hpp"
-#include "../items/Inventory.hpp"
-#include "../items/ItemDef.hpp"
-#include "../lighting/Lightmap.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../objects/Player.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../settings.hpp"
-#include "../typedefs.hpp"
-#include "../util/data_io.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/voxel.hpp"
-#include "../window/Camera.hpp"
-#include "../world/World.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/json.hpp>
+#include <constants.hpp>
+#include <content/Content.hpp>
+#include <core_defs.hpp>
+#include <data/dynamic.hpp>
+#include <debug/Logger.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <lighting/Lightmap.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
+#include <physics/Hitbox.hpp>
+#include <settings.hpp>
+#include <typedefs.hpp>
+#include <util/data_io.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/voxel.hpp>
+#include <window/Camera.hpp>
+#include <world/World.hpp>
 
 #define WORLD_FORMAT_MAGIC ".VOXWLD"
 
diff --git a/src/files/WorldFiles.hpp b/src/files/WorldFiles.hpp
index 6f0e9bd6..2ba543b8 100644
--- a/src/files/WorldFiles.hpp
+++ b/src/files/WorldFiles.hpp
@@ -7,9 +7,9 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
-#include "../typedefs.hpp"
-#include "../voxels/Chunk.hpp"
+#include <content/ContentPack.hpp>
+#include <typedefs.hpp>
+#include <voxels/Chunk.hpp>
 #include "WorldRegions.hpp"
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index 5660ab75..c7d54edc 100644
--- a/src/files/WorldRegions.cpp
+++ b/src/files/WorldRegions.cpp
@@ -4,12 +4,12 @@
 #include <utility>
 #include <vector>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/rle.hpp"
-#include "../data/dynamic.hpp"
-#include "../items/Inventory.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../util/data_io.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/rle.hpp>
+#include <data/dynamic.hpp>
+#include <items/Inventory.hpp>
+#include <maths/voxmaths.hpp>
+#include <util/data_io.hpp>
 
 #define REGION_FORMAT_MAGIC ".VOXREG"
 
diff --git a/src/files/WorldRegions.hpp b/src/files/WorldRegions.hpp
index 6f8c101c..11e32980 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -9,10 +9,10 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "../data/dynamic_fwd.hpp"
-#include "../typedefs.hpp"
-#include "../util/BufferPool.hpp"
-#include "../voxels/Chunk.hpp"
+#include <data/dynamic_fwd.hpp>
+#include <typedefs.hpp>
+#include <util/BufferPool.hpp>
+#include <voxels/Chunk.hpp>
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
 #include "glm/gtx/hash.hpp"
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index 18713331..e4917e82 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -6,8 +6,8 @@
 #include <stack>
 #include <utility>
 
-#include "../typedefs.hpp"
-#include "../util/stringutil.hpp"
+#include <typedefs.hpp>
+#include <util/stringutil.hpp>
 #include "WorldFiles.hpp"
 
 const fs::path SCREENSHOTS_FOLDER {"screenshots"};
diff --git a/src/files/engine_paths.hpp b/src/files/engine_paths.hpp
index 6465905f..56956d53 100644
--- a/src/files/engine_paths.hpp
+++ b/src/files/engine_paths.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
+#include <content/ContentPack.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/files.cpp b/src/files/files.cpp
index e471a627..cf36a635 100644
--- a/src/files/files.cpp
+++ b/src/files/files.cpp
@@ -7,12 +7,12 @@
 #include <memory>
 #include <stdexcept>
 
-#include "../coders/commons.hpp"
-#include "../coders/gzip.hpp"
-#include "../coders/json.hpp"
-#include "../coders/toml.hpp"
-#include "../data/dynamic.hpp"
-#include "../util/stringutil.hpp"
+#include <coders/commons.hpp>
+#include <coders/gzip.hpp>
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
+#include <data/dynamic.hpp>
+#include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;
 
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..c9a7668b 100644
--- a/src/files/settings_io.cpp
+++ b/src/files/settings_io.cpp
@@ -3,12 +3,12 @@
 #include <memory>
 #include <utility>
 
-#include "../coders/json.hpp"
-#include "../coders/toml.hpp"
-#include "../debug/Logger.hpp"
-#include "../settings.hpp"
-#include "../window/Events.hpp"
-#include "../window/input.hpp"
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
+#include <debug/Logger.hpp>
+#include <settings.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
 
 static debug::Logger logger("settings_io");
 
diff --git a/src/files/settings_io.hpp b/src/files/settings_io.hpp
index 3daee10d..1bb84d32 100644
--- a/src/files/settings_io.hpp
+++ b/src/files/settings_io.hpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class Setting;
 struct EngineSettings;
diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp
index 195b4fcd..c8bff298 100644
--- a/src/frontend/ContentGfxCache.cpp
+++ b/src/frontend/ContentGfxCache.cpp
@@ -2,13 +2,13 @@
 
 #include "UiDocument.hpp"
 
-#include "../assets/Assets.hpp"
-#include "../content/Content.hpp"
-#include "../content/ContentPack.hpp"
-#include "../core_defs.hpp"
-#include "../graphics/core/Atlas.hpp"
-#include "../maths/UVRegion.hpp"
-#include "../voxels/Block.hpp"
+#include <assets/Assets.hpp>
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
+#include <core_defs.hpp>
+#include <graphics/core/Atlas.hpp>
+#include <maths/UVRegion.hpp>
+#include <voxels/Block.hpp>
 
 #include <string>
 
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/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp
index d67c9261..281798d1 100644
--- a/src/frontend/LevelFrontend.cpp
+++ b/src/frontend/LevelFrontend.cpp
@@ -2,16 +2,16 @@
 
 #include "ContentGfxCache.hpp"
 
-#include "../assets/Assets.hpp"
-#include "../audio/audio.hpp"
-#include "../content/Content.hpp"
-#include "../graphics/core/Atlas.hpp"
-#include "../graphics/render/BlocksPreview.hpp"
-#include "../logic/LevelController.hpp"
-#include "../logic/PlayerController.hpp"
-#include "../objects/Player.hpp"
-#include "../voxels/Block.hpp"
-#include "../world/Level.hpp"
+#include <assets/Assets.hpp>
+#include <audio/audio.hpp>
+#include <content/Content.hpp>
+#include <graphics/core/Atlas.hpp>
+#include <graphics/render/BlocksPreview.hpp>
+#include <logic/LevelController.hpp>
+#include <logic/PlayerController.hpp>
+#include <objects/Player.hpp>
+#include <voxels/Block.hpp>
+#include <world/Level.hpp>
 
 LevelFrontend::LevelFrontend(
     Player* currentPlayer, LevelController* controller, Assets* assets
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index 3951e4e9..06e6029c 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -2,11 +2,11 @@
 
 #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 "../logic/scripting/scripting.hpp"
+#include <files/files.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(
     std::string id, 
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..2e481832 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -1,25 +1,25 @@
-#include "../audio/audio.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"
-#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"
-#include "../objects/EntityDef.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../util/stringutil.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <audio/audio.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>
+#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>
+#include <objects/EntityDef.hpp>
+#include <physics/Hitbox.hpp>
+#include <util/stringutil.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 #include <string>
 #include <memory>
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index e4a83052..fccebf00 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -4,45 +4,45 @@
 #include "LevelFrontend.hpp"
 #include "UiDocument.hpp"
 
-#include "../assets/Assets.hpp"
-#include "../content/Content.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"
-#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"
-#include "../logic/scripting/scripting.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../objects/Player.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../typedefs.hpp"
-#include "../util/stringutil.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../window/Camera.hpp"
-#include "../window/Events.hpp"
-#include "../window/input.hpp"
-#include "../window/Window.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <assets/Assets.hpp>
+#include <content/Content.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>
+#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>
+#include <logic/scripting/scripting.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/Player.hpp>
+#include <physics/Hitbox.hpp>
+#include <typedefs.hpp>
+#include <util/stringutil.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <window/Camera.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
+#include <window/Window.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 #include <assert.h>
 #include <memory>
diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp
index a2a778ed..a47303d1 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -1,8 +1,8 @@
 #ifndef FRONTEND_HUD_HPP_
 #define FRONTEND_HUD_HPP_
 
-#include "../typedefs.hpp"
-#include "../util/ObjectsKeeper.hpp"
+#include <typedefs.hpp>
+#include <util/ObjectsKeeper.hpp>
 
 #include <string>
 #include <memory>
diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp
index f4f08a26..fd562ffe 100644
--- a/src/frontend/locale.cpp
+++ b/src/frontend/locale.cpp
@@ -2,13 +2,13 @@
 
 #include <utility>
 
-#include "../coders/json.hpp"
-#include "../coders/commons.hpp"
-#include "../content/ContentPack.hpp"
-#include "../files/files.hpp"
-#include "../util/stringutil.hpp"
-#include "../data/dynamic.hpp"
-#include "../debug/Logger.hpp"
+#include <coders/json.hpp>
+#include <coders/commons.hpp>
+#include <content/ContentPack.hpp>
+#include <files/files.hpp>
+#include <util/stringutil.hpp>
+#include <data/dynamic.hpp>
+#include <debug/Logger.hpp>
 
 static debug::Logger logger("locale");
 
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index cb4dc7f3..88bc2c0d 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -4,19 +4,19 @@
 #include "UiDocument.hpp"
 #include "screens/MenuScreen.hpp"
 
-#include "../delegates.hpp"
-#include "../engine.hpp"
-#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 "../logic/scripting/scripting.hpp"
-#include "../settings.hpp"
-#include "../coders/commons.hpp"
-#include "../util/stringutil.hpp"
-#include "../window/Window.hpp"
+#include <delegates.hpp>
+#include <engine.hpp>
+#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 <logic/scripting/scripting.hpp>
+#include <settings.hpp>
+#include <coders/commons.hpp>
+#include <util/stringutil.hpp>
+#include <window/Window.hpp>
 
 #include <filesystem>
 #include <glm/glm.hpp>
diff --git a/src/frontend/menu.hpp b/src/frontend/menu.hpp
index 4bc5e4ea..8c9afafe 100644
--- a/src/frontend/menu.hpp
+++ b/src/frontend/menu.hpp
@@ -1,8 +1,8 @@
 #ifndef FRONTEND_MENU_MENU_HPP_
 #define FRONTEND_MENU_MENU_HPP_
 
-#include "../data/dynamic.hpp"
-#include "../graphics/ui/elements/Menu.hpp"
+#include <data/dynamic.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 bdf6032f..c6a20036 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -1,31 +1,31 @@
 #include "LevelScreen.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 "../../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 "../../logic/LevelController.hpp"
-#include "../../logic/scripting/scripting_hud.hpp"
-#include "../../util/stringutil.hpp"
-#include "../../physics/Hitbox.hpp"
-#include "../../voxels/Chunks.hpp"
-#include "../../window/Camera.hpp"
-#include "../../window/Events.hpp"
-#include "../../window/Window.hpp"
-#include "../../world/Level.hpp"
-#include "../../world/World.hpp"
+#include <core_defs.hpp>
+#include <frontend/hud.hpp>
+#include <frontend/LevelFrontend.hpp>
+#include <audio/audio.hpp>
+#include <coders/imageio.hpp>
+#include <debug/Logger.hpp>
+#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 <logic/LevelController.hpp>
+#include <logic/scripting/scripting_hud.hpp>
+#include <util/stringutil.hpp>
+#include <physics/Hitbox.hpp>
+#include <voxels/Chunks.hpp>
+#include <window/Camera.hpp>
+#include <window/Events.hpp>
+#include <window/Window.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 static debug::Logger logger("level-screen");
 
diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp
index 74ad0421..5e96500f 100644
--- a/src/frontend/screens/MenuScreen.cpp
+++ b/src/frontend/screens/MenuScreen.cpp
@@ -1,14 +1,14 @@
 #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 "../../maths/UVRegion.hpp"
-#include "../../window/Window.hpp"
-#include "../../window/Camera.hpp"
-#include "../../engine.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>
+#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..a167b98a 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 <graphics/core/Batch2D.hpp>
+#include <engine.hpp>
 
 Screen::Screen(Engine* engine)
   : engine(engine), 
diff --git a/src/frontend/screens/Screen.hpp b/src/frontend/screens/Screen.hpp
index 6b283165..4e6f3120 100644
--- a/src/frontend/screens/Screen.hpp
+++ b/src/frontend/screens/Screen.hpp
@@ -1,7 +1,7 @@
 #ifndef FRONTEND_SCREENS_SCREEN_HPP_
 #define FRONTEND_SCREENS_SCREEN_HPP_
 
-#include "../../util/ObjectsKeeper.hpp"
+#include <util/ObjectsKeeper.hpp>
 
 class Engine;
 class Batch2D;
diff --git a/src/graphics/core/Atlas.cpp b/src/graphics/core/Atlas.cpp
index 6823757d..00f1f589 100644
--- a/src/graphics/core/Atlas.cpp
+++ b/src/graphics/core/Atlas.cpp
@@ -2,7 +2,7 @@
 
 #include "Texture.hpp"
 #include "ImageData.hpp"
-#include "../../maths/LMPacker.hpp"
+#include <maths/LMPacker.hpp>
 
 #include <stdexcept>
 
diff --git a/src/graphics/core/Atlas.hpp b/src/graphics/core/Atlas.hpp
index 827f6d0a..2542c771 100644
--- a/src/graphics/core/Atlas.hpp
+++ b/src/graphics/core/Atlas.hpp
@@ -7,8 +7,8 @@
 #include <vector>
 #include <optional>
 #include <unordered_map>
-#include "../../maths/UVRegion.hpp"
-#include "../../typedefs.hpp"
+#include <maths/UVRegion.hpp>
+#include <typedefs.hpp>
 
 class ImageData;
 class Texture;
diff --git a/src/graphics/core/Batch2D.cpp b/src/graphics/core/Batch2D.cpp
index 9531b53c..e93f1e5a 100644
--- a/src/graphics/core/Batch2D.cpp
+++ b/src/graphics/core/Batch2D.cpp
@@ -2,7 +2,7 @@
 #include "Mesh.hpp"
 #include "Texture.hpp"
 #include "gl_util.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 #include <GL/glew.h>
 
diff --git a/src/graphics/core/Batch2D.hpp b/src/graphics/core/Batch2D.hpp
index ed8f9f70..fbad1260 100644
--- a/src/graphics/core/Batch2D.hpp
+++ b/src/graphics/core/Batch2D.hpp
@@ -6,7 +6,7 @@
 #include <glm/glm.hpp>
 
 #include "commons.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 class Mesh;
 class Texture;
diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp
index c25d6f0b..94fe9ac4 100644
--- a/src/graphics/core/Batch3D.cpp
+++ b/src/graphics/core/Batch3D.cpp
@@ -4,8 +4,8 @@
 #include "Texture.hpp"
 
 #include <GL/glew.h>
-#include "../../typedefs.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <typedefs.hpp>
+#include <maths/UVRegion.hpp>
 
 /// xyz, uv, rgba
 inline constexpr uint B3D_VERTEX_SIZE = 9;
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.cpp b/src/graphics/core/DrawContext.cpp
index 68b31125..b8bb589f 100644
--- a/src/graphics/core/DrawContext.cpp
+++ b/src/graphics/core/DrawContext.cpp
@@ -6,7 +6,7 @@
 
 #include "Batch2D.hpp"
 #include "Framebuffer.hpp"
-#include "../../window/Window.hpp"
+#include <window/Window.hpp>
 
 static void set_blend_mode(BlendMode mode) {
     switch (mode) {
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.cpp b/src/graphics/core/Shader.cpp
index a758e647..56c336ea 100644
--- a/src/graphics/core/Shader.cpp
+++ b/src/graphics/core/Shader.cpp
@@ -11,7 +11,7 @@
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 
-#include "../../coders/GLSLExtension.hpp"
+#include <coders/GLSLExtension.hpp>
 
 namespace fs = std::filesystem;
 
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..1f1f8376 100644
--- a/src/graphics/core/Texture.hpp
+++ b/src/graphics/core/Texture.hpp
@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_CORE_TEXTURE_HPP_
 #define GRAPHICS_CORE_TEXTURE_HPP_
 
-#include "../../typedefs.hpp"
-#include "../../maths/UVRegion.hpp"
+#include <typedefs.hpp>
+#include <maths/UVRegion.hpp>
 #include "ImageData.hpp"
 
 #include <memory>
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..aaefcd27 100644
--- a/src/graphics/render/BlocksPreview.cpp
+++ b/src/graphics/render/BlocksPreview.cpp
@@ -1,19 +1,19 @@
 #include "BlocksPreview.hpp"
 
-#include "../../assets/Assets.hpp"
-#include "../../constants.hpp"
-#include "../../content/Content.hpp"
-#include "../../frontend/ContentGfxCache.hpp"
-#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 <assets/Assets.hpp>
+#include <constants.hpp>
+#include <content/Content.hpp>
+#include <frontend/ContentGfxCache.hpp>
+#include <voxels/Block.hpp>
+#include <window/Camera.hpp>
+#include <window/Window.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/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..a734b756 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,16 +1,16 @@
 #include "BlocksRenderer.hpp"
 
-#include "../core/Mesh.hpp"
-#include "../../maths/UVRegion.hpp"
-#include "../../constants.hpp"
-#include "../../content/Content.hpp"
-#include "../../voxels/Block.hpp"
-#include "../../voxels/Chunk.hpp"
-#include "../../voxels/VoxelsVolume.hpp"
-#include "../../voxels/ChunksStorage.hpp"
-#include "../../lighting/Lightmap.hpp"
-#include "../../frontend/ContentGfxCache.hpp"
-#include "../../settings.hpp"
+#include <graphics/core/Mesh.hpp>
+#include <maths/UVRegion.hpp>
+#include <constants.hpp>
+#include <content/Content.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/VoxelsVolume.hpp>
+#include <voxels/ChunksStorage.hpp>
+#include <lighting/Lightmap.hpp>
+#include <frontend/ContentGfxCache.hpp>
+#include <settings.hpp>
 
 #include <glm/glm.hpp>
 
diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp
index d6cd6eb1..b37e4b7a 100644
--- a/src/graphics/render/BlocksRenderer.hpp
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <memory>
 #include <glm/glm.hpp>
-#include "../../voxels/voxel.hpp"
-#include "../../typedefs.hpp"
+#include <voxels/voxel.hpp>
+#include <typedefs.hpp>
 
 class Content;
 class Mesh;
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 0e7fe5cd..29512734 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -1,10 +1,10 @@
 #include "ChunksRenderer.hpp"
 #include "BlocksRenderer.hpp"
-#include "../../debug/Logger.hpp"
-#include "../../graphics/core/Mesh.hpp"
-#include "../../voxels/Chunk.hpp"
-#include "../../world/Level.hpp"
-#include "../../settings.hpp"
+#include <debug/Logger.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <voxels/Chunk.hpp>
+#include <world/Level.hpp>
+#include <settings.hpp>
 
 #include <iostream>
 #include <glm/glm.hpp>
diff --git a/src/graphics/render/ChunksRenderer.hpp b/src/graphics/render/ChunksRenderer.hpp
index 1eac4185..bb03c09e 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -7,9 +7,9 @@
 #include <unordered_map>
 #include <glm/glm.hpp>
 
-#include "../../voxels/Block.hpp"
-#include "../../voxels/ChunksStorage.hpp"
-#include "../../util/ThreadPool.hpp"
+#include <voxels/Block.hpp>
+#include <voxels/ChunksStorage.hpp>
+#include <util/ThreadPool.hpp>
 
 class Mesh;
 class Chunk;
diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp
index 468fcbd5..673bd671 100644
--- a/src/graphics/render/ModelBatch.cpp
+++ b/src/graphics/render/ModelBatch.cpp
@@ -1,13 +1,13 @@
 #include "ModelBatch.hpp"
 
-#include "../core/Mesh.hpp"
-#include "../core/Model.hpp"
-#include "../core/Atlas.hpp"
-#include "../core/Texture.hpp"
-#include "../../assets/Assets.hpp"
-#include "../../window/Window.hpp"
-#include "../../voxels/Chunks.hpp"
-#include "../../lighting/Lightmap.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>
+#include <lighting/Lightmap.hpp>
 
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/ext/matrix_transform.hpp>
diff --git a/src/graphics/render/ModelBatch.hpp b/src/graphics/render/ModelBatch.hpp
index 69608ddc..3ff26675 100644
--- a/src/graphics/render/ModelBatch.hpp
+++ b/src/graphics/render/ModelBatch.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
 #define GRAPHICS_RENDER_MODEL_BATCH_HPP_
 
-#include "../../maths/UVRegion.hpp"
+#include <maths/UVRegion.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp
index a7aa3c46..af497396 100644
--- a/src/graphics/render/Skybox.cpp
+++ b/src/graphics/render/Skybox.cpp
@@ -1,15 +1,15 @@
 #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 "../../window/Window.hpp"
-#include "../../window/Camera.hpp"
-#include "../../maths/UVRegion.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 <window/Window.hpp>
+#include <window/Camera.hpp>
+#include <maths/UVRegion.hpp>
 
 #include <cmath>
 #include <iostream>
diff --git a/src/graphics/render/Skybox.hpp b/src/graphics/render/Skybox.hpp
index 57bd9c99..0d929b81 100644
--- a/src/graphics/render/Skybox.hpp
+++ b/src/graphics/render/Skybox.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "../../typedefs.hpp"
-#include "../../maths/fastmaths.hpp"
+#include <typedefs.hpp>
+#include <maths/fastmaths.hpp>
 
 class Mesh;
 class Shader;
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 4f2899f7..71b2faa0 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -8,37 +8,37 @@
 #include <glm/gtc/matrix_transform.hpp>
 #include <memory>
 
-#include "../../assets/Assets.hpp"
-#include "../../content/Content.hpp"
-#include "../../engine.hpp"
-#include "../../frontend/LevelFrontend.hpp"
-#include "../../items/Inventory.hpp"
-#include "../../items/ItemDef.hpp"
-#include "../../items/ItemStack.hpp"
-#include "../../logic/PlayerController.hpp"
-#include "../../logic/scripting/scripting_hud.hpp"
-#include "../../maths/FrustumCulling.hpp"
-#include "../../maths/voxmaths.hpp"
-#include "../../objects/Entities.hpp"
-#include "../../objects/Player.hpp"
-#include "../../settings.hpp"
-#include "../../voxels/Block.hpp"
-#include "../../voxels/Chunk.hpp"
-#include "../../voxels/Chunks.hpp"
-#include "../../window/Camera.hpp"
-#include "../../window/Window.hpp"
-#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 <assets/Assets.hpp>
+#include <content/Content.hpp>
+#include <engine.hpp>
+#include <frontend/LevelFrontend.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
+#include <logic/PlayerController.hpp>
+#include <logic/scripting/scripting_hud.hpp>
+#include <maths/FrustumCulling.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
+#include <settings.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <window/Camera.hpp>
+#include <window/Window.hpp>
+#include <world/Level.hpp>
+#include <world/LevelEvents.hpp>
+#include <world/World.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 40ae9bf5..8dec44bd 100644
--- a/src/graphics/ui/GUI.cpp
+++ b/src/graphics/ui/GUI.cpp
@@ -6,16 +6,16 @@
 #include "elements/Label.hpp"
 #include "elements/Menu.hpp"
 
-#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 "../../window/Events.hpp"
-#include "../../window/Window.hpp"
-#include "../../window/input.hpp"
-#include "../../window/Camera.hpp"
+#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 <window/Events.hpp>
+#include <window/Window.hpp>
+#include <window/input.hpp>
+#include <window/Camera.hpp>
 
 #include <iostream>
 #include <algorithm>
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/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 b6006c72..0002cab1 100644
--- a/src/graphics/ui/elements/Image.cpp
+++ b/src/graphics/ui/elements/Image.cpp
@@ -2,12 +2,12 @@
 
 #include <utility>
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Texture.hpp"
-#include "../../core/Atlas.hpp"
-#include "../../../assets/Assets.hpp"
-#include "../../../maths/UVRegion.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>
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp
index fef06652..f740b015 100644
--- a/src/graphics/ui/elements/InputBindBox.cpp
+++ b/src/graphics/ui/elements/InputBindBox.cpp
@@ -1,9 +1,9 @@
 #include "InputBindBox.hpp"
 
 #include "Label.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../../util/stringutil.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 3b64bbb1..1b8ba5c7 100644
--- a/src/graphics/ui/elements/InventoryView.cpp
+++ b/src/graphics/ui/elements/InventoryView.cpp
@@ -1,29 +1,29 @@
 #include "InventoryView.hpp"
 
-#include "../../../assets/Assets.hpp"
-#include "../../../content/Content.hpp"
-#include "../../../frontend/LevelFrontend.hpp"
-#include "../../../frontend/locale.hpp"
-#include "../../../items/Inventories.hpp"
-#include "../../../items/Inventory.hpp"
-#include "../../../items/ItemDef.hpp"
-#include "../../../items/ItemStack.hpp"
-#include "../../../logic/scripting/scripting.hpp"
-#include "../../../maths/voxmaths.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../util/stringutil.hpp"
-#include "../../../voxels/Block.hpp"
-#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 "../GUI.hpp"
+#include <assets/Assets.hpp>
+#include <content/Content.hpp>
+#include <frontend/LevelFrontend.hpp>
+#include <frontend/locale.hpp>
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
+#include <logic/scripting/scripting.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
+#include <voxels/Block.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
+#include <world/Level.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 <graphics/ui/GUI.hpp>
 
 #include <glm/glm.hpp>
 #include <utility>
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/Label.cpp b/src/graphics/ui/elements/Label.cpp
index e2fd44db..98a1a6c3 100644
--- a/src/graphics/ui/elements/Label.cpp
+++ b/src/graphics/ui/elements/Label.cpp
@@ -1,11 +1,11 @@
 #include "Label.hpp"
 
 #include <utility>
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
-#include "../../../assets/Assets.hpp"
-#include "../../../util/stringutil.hpp"
+#include <graphics/core/DrawContext.hpp>
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
+#include <assets/Assets.hpp>
+#include <util/stringutil.hpp>
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp
index 28057ae5..5a9e9b30 100644
--- a/src/graphics/ui/elements/Plotter.cpp
+++ b/src/graphics/ui/elements/Plotter.cpp
@@ -1,10 +1,10 @@
 #include "Plotter.hpp"
 
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../../assets/Assets.hpp"
-#include "../../../util/stringutil.hpp"
+#include <graphics/core/Batch2D.hpp>
+#include <graphics/core/Font.hpp>
+#include <graphics/core/DrawContext.hpp>
+#include <assets/Assets.hpp>
+#include <util/stringutil.hpp>
 
 using namespace gui;
 
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/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index 26eaae96..f41343fe 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -4,13 +4,13 @@
 #include <algorithm>
 
 #include "Label.hpp"
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../core/Font.hpp"
-#include "../../../assets/Assets.hpp"
-#include "../../../util/stringutil.hpp"
-#include "../../../window/Events.hpp"
-#include "../../../window/Window.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>
+#include <window/Window.hpp>
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp
index ab90b763..8cf09c47 100644
--- a/src/graphics/ui/elements/TrackBar.cpp
+++ b/src/graphics/ui/elements/TrackBar.cpp
@@ -2,9 +2,9 @@
 
 #include <utility>
 
-#include "../../core/DrawContext.hpp"
-#include "../../core/Batch2D.hpp"
-#include "../../../assets/Assets.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/TrackBar.hpp b/src/graphics/ui/elements/TrackBar.hpp
index 6e055e61..a2c99ca7 100644
--- a/src/graphics/ui/elements/TrackBar.hpp
+++ b/src/graphics/ui/elements/TrackBar.hpp
@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
 
 #include "UINode.hpp"
-#include "../../../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace gui {
     class TrackBar : public UINode {
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/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp
index 056b933f..4a8be56d 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
 #define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
 
-#include "../../../delegates.hpp"
-#include "../../../window/input.hpp"
+#include <delegates.hpp>
+#include <window/input.hpp>
 
 #include <glm/glm.hpp>
 #include <vector>
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 15e31d8a..8f40a584 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -5,10 +5,10 @@
 #include "elements/Button.hpp"
 #include "gui_xml.hpp"
 
-#include "../../logic/scripting/scripting.hpp"
-#include "../../frontend/locale.hpp"
-#include "../../util/stringutil.hpp"
-#include "../../delegates.hpp"
+#include <logic/scripting/scripting.hpp>
+#include <frontend/locale.hpp>
+#include <util/stringutil.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/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 8c61e2e8..74cf906c 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -10,13 +10,13 @@
 #include "elements/InputBindBox.hpp"
 #include "elements/InventoryView.hpp"
 
-#include "../../frontend/menu.hpp"
-#include "../../frontend/locale.hpp"
-#include "../../items/Inventory.hpp"
-#include "../../logic/scripting/scripting.hpp"
-#include "../../maths/voxmaths.hpp"
-#include "../../util/stringutil.hpp"
-#include "../../window/Events.hpp"
+#include <frontend/menu.hpp>
+#include <frontend/locale.hpp>
+#include <items/Inventory.hpp>
+#include <logic/scripting/scripting.hpp>
+#include <maths/voxmaths.hpp>
+#include <util/stringutil.hpp>
+#include <window/Events.hpp>
 
 #include <stdexcept>
 #include <utility>
diff --git a/src/graphics/ui/gui_xml.hpp b/src/graphics/ui/gui_xml.hpp
index bf466baa..b49e5c07 100644
--- a/src/graphics/ui/gui_xml.hpp
+++ b/src/graphics/ui/gui_xml.hpp
@@ -2,7 +2,7 @@
 #define FRONTEND_GUI_GUI_XML_HPP_
 
 #include "GUI.hpp"
-#include "../../coders/xml.hpp"
+#include <coders/xml.hpp>
 
 #include <memory>
 #include <stack>
diff --git a/src/interfaces/Serializable.hpp b/src/interfaces/Serializable.hpp
index cc64f226..37853662 100644
--- a/src/interfaces/Serializable.hpp
+++ b/src/interfaces/Serializable.hpp
@@ -1,7 +1,7 @@
 #ifndef SERIALIZABLE_HPP_
 #define SERIALIZABLE_HPP_
 
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 
 #include <memory>
 
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/Inventories.cpp b/src/items/Inventories.cpp
index 7fbbf789..7ae1bce9 100644
--- a/src/items/Inventories.cpp
+++ b/src/items/Inventories.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>
 
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <world/Level.hpp>
+#include <world/World.hpp>
 
 Inventories::Inventories(Level& level) : level(level) {
 }
diff --git a/src/items/Inventories.hpp b/src/items/Inventories.hpp
index e50a95b5..3c2affa2 100644
--- a/src/items/Inventories.hpp
+++ b/src/items/Inventories.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "../maths/util.hpp"
+#include <maths/util.hpp>
 #include "Inventory.hpp"
 
 class Level;
diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp
index 05d6bb5a..cd719b83 100644
--- a/src/items/Inventory.cpp
+++ b/src/items/Inventory.cpp
@@ -1,7 +1,7 @@
 #include "Inventory.hpp"
 
-#include "../content/ContentLUT.hpp"
-#include "../data/dynamic.hpp"
+#include <content/ContentLUT.hpp>
+#include <data/dynamic.hpp>
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {
 }
diff --git a/src/items/Inventory.hpp b/src/items/Inventory.hpp
index c2c73d41..111ba87f 100644
--- a/src/items/Inventory.hpp
+++ b/src/items/Inventory.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "../interfaces/Serializable.hpp"
-#include "../typedefs.hpp"
+#include <interfaces/Serializable.hpp>
+#include <typedefs.hpp>
 #include "ItemStack.hpp"
 
 namespace dynamic {
diff --git a/src/items/ItemDef.cpp b/src/items/ItemDef.cpp
index 22c48048..872fe022 100644
--- a/src/items/ItemDef.cpp
+++ b/src/items/ItemDef.cpp
@@ -1,6 +1,6 @@
 #include "ItemDef.hpp"
 
-#include "../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 ItemDef::ItemDef(const std::string& name) : name(name) {
     caption = util::id_to_caption(name);
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.cpp b/src/items/ItemStack.cpp
index eafbfea6..6a973aa4 100644
--- a/src/items/ItemStack.cpp
+++ b/src/items/ItemStack.cpp
@@ -1,6 +1,6 @@
 #include "ItemStack.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "ItemDef.hpp"
 
 ItemStack::ItemStack() : item(ITEM_EMPTY), count(0) {
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/LightSolver.cpp b/src/lighting/LightSolver.cpp
index d2df6b4b..7c7d5c4a 100644
--- a/src/lighting/LightSolver.cpp
+++ b/src/lighting/LightSolver.cpp
@@ -2,11 +2,11 @@
 #include <assert.h>
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
-#include "../content/Content.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/voxel.hpp"
-#include "../voxels/Block.hpp"
+#include <content/Content.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/voxel.hpp>
+#include <voxels/Block.hpp>
 
 LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int channel) 
 	: contentIds(contentIds), 
diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp
index 6c00af35..285d244e 100644
--- a/src/lighting/Lighting.cpp
+++ b/src/lighting/Lighting.cpp
@@ -1,13 +1,13 @@
 #include "Lighting.hpp"
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
-#include "../content/Content.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/voxel.hpp"
-#include "../voxels/Block.hpp"
-#include "../constants.hpp"
-#include "../util/timeutil.hpp"
+#include <content/Content.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/voxel.hpp>
+#include <voxels/Block.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.cpp b/src/lighting/Lightmap.cpp
index 14d7f552..e47b5e5e 100644
--- a/src/lighting/Lightmap.cpp
+++ b/src/lighting/Lightmap.cpp
@@ -1,6 +1,6 @@
 #include "Lightmap.hpp"
 
-#include "../util/data_io.hpp"
+#include <util/data_io.hpp>
 
 #include <assert.h>
 
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.cpp b/src/logic/BlocksController.cpp
index 810a1b9c..cefd316a 100644
--- a/src/logic/BlocksController.cpp
+++ b/src/logic/BlocksController.cpp
@@ -1,17 +1,17 @@
 #include "BlocksController.hpp"
 
-#include "../content/Content.hpp"
-#include "../items/Inventories.hpp"
-#include "../items/Inventory.hpp"
-#include "../lighting/Lighting.hpp"
-#include "../maths/fastmaths.hpp"
-#include "../util/timeutil.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/voxel.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <content/Content.hpp>
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
+#include <lighting/Lighting.hpp>
+#include <maths/fastmaths.hpp>
+#include <util/timeutil.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/voxel.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "scripting/scripting.hpp"
 
 BlocksController::BlocksController(Level* level, uint padding)
diff --git a/src/logic/BlocksController.hpp b/src/logic/BlocksController.hpp
index f2a74738..83d351e6 100644
--- a/src/logic/BlocksController.hpp
+++ b/src/logic/BlocksController.hpp
@@ -4,10 +4,10 @@
 #include <functional>
 #include <glm/glm.hpp>
 
-#include "../maths/fastmaths.hpp"
-#include "../typedefs.hpp"
-#include "../util/Clock.hpp"
-#include "../voxels/voxel.hpp"
+#include <maths/fastmaths.hpp>
+#include <typedefs.hpp>
+#include <util/Clock.hpp>
+#include <voxels/voxel.hpp>
 
 class Player;
 class Block;
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 148b78ec..66403c42 100644
--- a/src/logic/ChunksController.cpp
+++ b/src/logic/ChunksController.cpp
@@ -5,20 +5,20 @@
 #include <iostream>
 #include <memory>
 
-#include "../content/Content.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../graphics/core/Mesh.hpp"
-#include "../lighting/Lighting.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../util/timeutil.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/ChunksStorage.hpp"
-#include "../voxels/WorldGenerator.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
-#include "../world/WorldGenerators.hpp"
+#include <content/Content.hpp>
+#include <files/WorldFiles.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <lighting/Lighting.hpp>
+#include <maths/voxmaths.hpp>
+#include <util/timeutil.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/ChunksStorage.hpp>
+#include <voxels/WorldGenerator.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
+#include <world/WorldGenerators.hpp>
 
 const uint MAX_WORK_PER_FRAME = 128;
 const uint MIN_SURROUNDING = 9;
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/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp
index e7dbbac6..7e715caa 100644
--- a/src/logic/CommandsInterpreter.cpp
+++ b/src/logic/CommandsInterpreter.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <utility>
 
-#include "../coders/commons.hpp"
-#include "../util/stringutil.hpp"
+#include <coders/commons.hpp>
+#include <util/stringutil.hpp>
 
 using namespace cmd;
 
diff --git a/src/logic/CommandsInterpreter.hpp b/src/logic/CommandsInterpreter.hpp
index f0886de2..8a132ac4 100644
--- a/src/logic/CommandsInterpreter.hpp
+++ b/src/logic/CommandsInterpreter.hpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 namespace cmd {
     enum class ArgType { number, integer, enumvalue, selector, string };
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index e7128e27..0017aa29 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -4,22 +4,22 @@
 #include <filesystem>
 #include <memory>
 
-#include "../coders/commons.hpp"
-#include "../content/ContentLUT.hpp"
-#include "../debug/Logger.hpp"
-#include "../engine.hpp"
-#include "../files/WorldConverter.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../frontend/locale.hpp"
-#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 "../interfaces/Task.hpp"
-#include "../util/stringutil.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <coders/commons.hpp>
+#include <content/ContentLUT.hpp>
+#include <debug/Logger.hpp>
+#include <engine.hpp>
+#include <files/WorldConverter.hpp>
+#include <files/WorldFiles.hpp>
+#include <frontend/locale.hpp>
+#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 <interfaces/Task.hpp>
+#include <util/stringutil.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "LevelController.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index c86d6c75..8c82cd70 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -2,14 +2,14 @@
 
 #include <algorithm>
 
-#include "../debug/Logger.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../interfaces/Object.hpp"
-#include "../objects/Entities.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../settings.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <debug/Logger.hpp>
+#include <files/WorldFiles.hpp>
+#include <interfaces/Object.hpp>
+#include <objects/Entities.hpp>
+#include <physics/Hitbox.hpp>
+#include <settings.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "scripting/scripting.hpp"
 
 static debug::Logger logger("level-control");
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 10707fc1..499ba7f9 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -4,25 +4,25 @@
 #include <algorithm>
 #include <cmath>
 
-#include "../content/Content.hpp"
-#include "../core_defs.hpp"
-#include "../items/Inventory.hpp"
-#include "../items/ItemDef.hpp"
-#include "../items/ItemStack.hpp"
-#include "../lighting/Lighting.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../physics/PhysicsSolver.hpp"
-#include "../settings.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/voxel.hpp"
-#include "../window/Camera.hpp"
-#include "../window/Events.hpp"
-#include "../window/Window.hpp"
-#include "../window/input.hpp"
-#include "../world/Level.hpp"
+#include <content/Content.hpp>
+#include <core_defs.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <items/ItemStack.hpp>
+#include <lighting/Lighting.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
+#include <physics/Hitbox.hpp>
+#include <physics/PhysicsSolver.hpp>
+#include <settings.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/voxel.hpp>
+#include <window/Camera.hpp>
+#include <window/Events.hpp>
+#include <window/Window.hpp>
+#include <window/input.hpp>
+#include <world/Level.hpp>
 #include "BlocksController.hpp"
 #include "scripting/scripting.hpp"
 
diff --git a/src/logic/PlayerController.hpp b/src/logic/PlayerController.hpp
index e115e97c..f8b13395 100644
--- a/src/logic/PlayerController.hpp
+++ b/src/logic/PlayerController.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "../objects/Player.hpp"
+#include <objects/Player.hpp>
 
 class Camera;
 class Level;
diff --git a/src/logic/scripting/lua/lib__rigidbody.cpp b/src/logic/scripting/lua/lib__rigidbody.cpp
index 5175a36f..b9f6f782 100644
--- a/src/logic/scripting/lua/lib__rigidbody.cpp
+++ b/src/logic/scripting/lua/lib__rigidbody.cpp
@@ -1,4 +1,4 @@
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 #include "libentity.hpp"
 
 static int l_get_vel(lua::State* L) {
diff --git a/src/logic/scripting/lua/lib__skeleton.cpp b/src/logic/scripting/lua/lib__skeleton.cpp
index 8ce77c98..041183ed 100644
--- a/src/logic/scripting/lua/lib__skeleton.cpp
+++ b/src/logic/scripting/lua/lib__skeleton.cpp
@@ -1,4 +1,4 @@
-#include "../../../objects/rigging.hpp"
+#include <objects/rigging.hpp>
 #include "libentity.hpp"
 
 static int index_range_check(
diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp
index 1bf3704b..8c6a3177 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 <audio/audio.hpp>
+#include <engine.hpp>
 #include "api_lua.hpp"
 
 inline const char* DEFAULT_CHANNEL = "regular";
diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp
index e9d12128..a0720539 100644
--- a/src/logic/scripting/lua/libblock.cpp
+++ b/src/logic/scripting/lua/libblock.cpp
@@ -1,12 +1,12 @@
-#include "../../../content/Content.hpp"
-#include "../../../lighting/Lighting.hpp"
-#include "../../../logic/BlocksController.hpp"
-#include "../../../logic/LevelController.hpp"
-#include "../../../voxels/Block.hpp"
-#include "../../../voxels/Chunk.hpp"
-#include "../../../voxels/Chunks.hpp"
-#include "../../../voxels/voxel.hpp"
-#include "../../../world/Level.hpp"
+#include <content/Content.hpp>
+#include <lighting/Lighting.hpp>
+#include <logic/BlocksController.hpp>
+#include <logic/LevelController.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/voxel.hpp>
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libcamera.cpp b/src/logic/scripting/lua/libcamera.cpp
index 74c0ec2a..b3eff98c 100644
--- a/src/logic/scripting/lua/libcamera.cpp
+++ b/src/logic/scripting/lua/libcamera.cpp
@@ -1,8 +1,8 @@
 #include <glm/ext.hpp>
 
-#include "../../../content/Content.hpp"
-#include "../../../window/Camera.hpp"
-#include "../../../world/Level.hpp"
+#include <content/Content.hpp>
+#include <window/Camera.hpp>
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp
index 4a106f95..3202bc1d 100644
--- a/src/logic/scripting/lua/libconsole.cpp
+++ b/src/logic/scripting/lua/libconsole.cpp
@@ -1,6 +1,6 @@
-#include "../../../coders/commons.hpp"
-#include "../../../engine.hpp"
-#include "../../CommandsInterpreter.hpp"
+#include <coders/commons.hpp>
+#include <engine.hpp>
+#include <logic/CommandsInterpreter.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index 0b28ddbd..7a9547d3 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -1,18 +1,18 @@
 #include <memory>
 #include <vector>
 
-#include "../../../constants.hpp"
-#include "../../../engine.hpp"
-#include "../../../files/engine_paths.hpp"
-#include "../../../files/settings_io.hpp"
-#include "../../../frontend/menu.hpp"
-#include "../../../frontend/screens/MenuScreen.hpp"
-#include "../../../logic/EngineController.hpp"
-#include "../../../logic/LevelController.hpp"
-#include "../../../window/Events.hpp"
-#include "../../../window/Window.hpp"
-#include "../../../world/Level.hpp"
-#include "../../../world/WorldGenerators.hpp"
+#include <constants.hpp>
+#include <engine.hpp>
+#include <files/engine_paths.hpp>
+#include <files/settings_io.hpp>
+#include <frontend/menu.hpp>
+#include <frontend/screens/MenuScreen.hpp>
+#include <logic/EngineController.hpp>
+#include <logic/LevelController.hpp>
+#include <window/Events.hpp>
+#include <window/Window.hpp>
+#include <world/Level.hpp>
+#include <world/WorldGenerators.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp
index 9e87cc11..a4e14476 100644
--- a/src/logic/scripting/lua/libentity.cpp
+++ b/src/logic/scripting/lua/libentity.cpp
@@ -1,14 +1,14 @@
 #include "libentity.hpp"
 
-#include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
-#include "../../../objects/Entities.hpp"
-#include "../../../objects/EntityDef.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../objects/rigging.hpp"
-#include "../../../physics/Hitbox.hpp"
-#include "../../../voxels/Chunks.hpp"
-#include "../../../window/Camera.hpp"
+#include <content/Content.hpp>
+#include <engine.hpp>
+#include <objects/Entities.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
+#include <objects/rigging.hpp>
+#include <physics/Hitbox.hpp>
+#include <voxels/Chunks.hpp>
+#include <window/Camera.hpp>
 
 using namespace scripting;
 
diff --git a/src/logic/scripting/lua/libentity.hpp b/src/logic/scripting/lua/libentity.hpp
index 724aaefb..5325a6ef 100644
--- a/src/logic/scripting/lua/libentity.hpp
+++ b/src/logic/scripting/lua/libentity.hpp
@@ -3,10 +3,10 @@
 
 #include <optional>
 
-#include "../../../frontend/hud.hpp"
-#include "../../../objects/Entities.hpp"
-#include "../../../world/Level.hpp"
-#include "../../LevelController.hpp"
+#include <frontend/hud.hpp>
+#include <objects/Entities.hpp>
+#include <world/Level.hpp>
+#include <logic/LevelController.hpp>
 #include "api_lua.hpp"
 
 namespace scripting {
diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp
index 785235a7..2066cb8c 100644
--- a/src/logic/scripting/lua/libfile.cpp
+++ b/src/logic/scripting/lua/libfile.cpp
@@ -1,11 +1,11 @@
 #include <filesystem>
 #include <string>
 
-#include "../../../coders/gzip.hpp"
-#include "../../../engine.hpp"
-#include "../../../files/engine_paths.hpp"
-#include "../../../files/files.hpp"
-#include "../../../util/stringutil.hpp"
+#include <coders/gzip.hpp>
+#include <engine.hpp>
+#include <files/engine_paths.hpp>
+#include <files/files.hpp>
+#include <util/stringutil.hpp>
 #include "api_lua.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 7b9872a8..690c37bb 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -1,20 +1,20 @@
-#include "../../../assets/Assets.hpp"
-#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 "../../../items/Inventories.hpp"
-#include "../../../util/stringutil.hpp"
-#include "../../../world/Level.hpp"
+#include <assets/Assets.hpp>
+#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 <items/Inventories.hpp>
+#include <util/stringutil.hpp>
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace gui;
diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp
index a421aa2e..55d3e073 100644
--- a/src/logic/scripting/lua/libhud.cpp
+++ b/src/logic/scripting/lua/libhud.cpp
@@ -1,20 +1,20 @@
 #include <glm/glm.hpp>
 #include <iostream>
 
-#include "../../../assets/Assets.hpp"
-#include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
-#include "../../../frontend/UiDocument.hpp"
-#include "../../../frontend/hud.hpp"
-#include "../../../graphics/ui/elements/InventoryView.hpp"
-#include "../../../items/Inventories.hpp"
-#include "../../../logic/BlocksController.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../util/stringutil.hpp"
-#include "../../../voxels/Block.hpp"
-#include "../../../voxels/Chunks.hpp"
-#include "../../../voxels/voxel.hpp"
-#include "../../../world/Level.hpp"
+#include <assets/Assets.hpp>
+#include <content/Content.hpp>
+#include <engine.hpp>
+#include <frontend/UiDocument.hpp>
+#include <frontend/hud.hpp>
+#include <graphics/ui/elements/InventoryView.hpp>
+#include <items/Inventories.hpp>
+#include <logic/BlocksController.hpp>
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/voxel.hpp>
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 namespace scripting {
diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp
index 92fb4299..4ac43642 100644
--- a/src/logic/scripting/lua/libinput.cpp
+++ b/src/logic/scripting/lua/libinput.cpp
@@ -1,10 +1,10 @@
-#include "../../../engine.hpp"
-#include "../../../frontend/hud.hpp"
-#include "../../../frontend/screens/Screen.hpp"
-#include "../../../graphics/ui/GUI.hpp"
-#include "../../../util/stringutil.hpp"
-#include "../../../window/Events.hpp"
-#include "../../../window/input.hpp"
+#include <engine.hpp>
+#include <frontend/hud.hpp>
+#include <frontend/screens/Screen.hpp>
+#include <graphics/ui/GUI.hpp>
+#include <util/stringutil.hpp>
+#include <window/Events.hpp>
+#include <window/input.hpp>
 #include "api_lua.hpp"
 
 namespace scripting {
diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp
index 85c6cc27..1555ee38 100644
--- a/src/logic/scripting/lua/libinventory.cpp
+++ b/src/logic/scripting/lua/libinventory.cpp
@@ -1,8 +1,8 @@
-#include "../../../content/Content.hpp"
-#include "../../../items/Inventories.hpp"
-#include "../../../items/ItemStack.hpp"
-#include "../../../logic/BlocksController.hpp"
-#include "../../../world/Level.hpp"
+#include <content/Content.hpp>
+#include <items/Inventories.hpp>
+#include <items/ItemStack.hpp>
+#include <logic/BlocksController.hpp>
+#include <world/Level.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libitem.cpp
index 099172e9..5e203fa8 100644
--- a/src/logic/scripting/lua/libitem.cpp
+++ b/src/logic/scripting/lua/libitem.cpp
@@ -1,5 +1,5 @@
-#include "../../../content/Content.hpp"
-#include "../../../items/ItemDef.hpp"
+#include <content/Content.hpp>
+#include <items/ItemDef.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libjson.cpp
index 3fbe173c..ec9d1381 100644
--- a/src/logic/scripting/lua/libjson.cpp
+++ b/src/logic/scripting/lua/libjson.cpp
@@ -1,5 +1,5 @@
-#include "../../../coders/json.hpp"
-#include "../../../data/dynamic.hpp"
+#include <coders/json.hpp>
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 static int l_json_stringify(lua::State* L) {
diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp
index b7a20ca5..5c9d26c1 100644
--- a/src/logic/scripting/lua/libpack.cpp
+++ b/src/logic/scripting/lua/libpack.cpp
@@ -3,13 +3,13 @@
 #include <stdexcept>
 #include <string>
 
-#include "../../../assets/AssetsLoader.hpp"
-#include "../../../content/Content.hpp"
-#include "../../../engine.hpp"
-#include "../../../files/WorldFiles.hpp"
-#include "../../../files/engine_paths.hpp"
-#include "../../../world/Level.hpp"
-#include "../../../world/World.hpp"
+#include <assets/AssetsLoader.hpp>
+#include <content/Content.hpp>
+#include <engine.hpp>
+#include <files/WorldFiles.hpp>
+#include <files/engine_paths.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp
index d11e7d35..fa0b7609 100644
--- a/src/logic/scripting/lua/libplayer.cpp
+++ b/src/logic/scripting/lua/libplayer.cpp
@@ -1,12 +1,12 @@
 #include <algorithm>
 #include <glm/glm.hpp>
 
-#include "../../../items/Inventory.hpp"
-#include "../../../objects/Entities.hpp"
-#include "../../../objects/Player.hpp"
-#include "../../../physics/Hitbox.hpp"
-#include "../../../window/Camera.hpp"
-#include "../../../world/Level.hpp"
+#include <items/Inventory.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
+#include <physics/Hitbox.hpp>
+#include <window/Camera.hpp>
+#include <world/Level.hpp>
 #include "libentity.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp
index 29c501d3..a4eeb0ab 100644
--- a/src/logic/scripting/lua/libtime.cpp
+++ b/src/logic/scripting/lua/libtime.cpp
@@ -1,5 +1,5 @@
-#include "../../../engine.hpp"
-#include "../../../window/Window.hpp"
+#include <engine.hpp>
+#include <window/Window.hpp>
 #include "api_lua.hpp"
 
 static int l_time_uptime(lua::State* L) {
diff --git a/src/logic/scripting/lua/libtoml.cpp b/src/logic/scripting/lua/libtoml.cpp
index 5b3c0162..bc3e8b4b 100644
--- a/src/logic/scripting/lua/libtoml.cpp
+++ b/src/logic/scripting/lua/libtoml.cpp
@@ -1,5 +1,5 @@
-#include "../../../coders/toml.hpp"
-#include "../../../data/dynamic.hpp"
+#include <coders/toml.hpp>
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp
index 38ad347f..4300aec6 100644
--- a/src/logic/scripting/lua/libworld.cpp
+++ b/src/logic/scripting/lua/libworld.cpp
@@ -1,12 +1,12 @@
 #include <cmath>
 #include <filesystem>
 
-#include "../../../assets/Assets.hpp"
-#include "../../../assets/AssetsLoader.hpp"
-#include "../../../engine.hpp"
-#include "../../../files/engine_paths.hpp"
-#include "../../../world/Level.hpp"
-#include "../../../world/World.hpp"
+#include <assets/Assets.hpp>
+#include <assets/AssetsLoader.hpp>
+#include <engine.hpp>
+#include <files/engine_paths.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/lua/lua_commons.cpp b/src/logic/scripting/lua/lua_commons.cpp
index 00669d03..64b6c1bb 100644
--- a/src/logic/scripting/lua/lua_commons.cpp
+++ b/src/logic/scripting/lua/lua_commons.cpp
@@ -1,6 +1,6 @@
 #include "lua_commons.hpp"
 
-#include "../../../debug/Logger.hpp"
+#include <debug/Logger.hpp>
 
 static debug::Logger logger("lua");
 
diff --git a/src/logic/scripting/lua/lua_commons.hpp b/src/logic/scripting/lua/lua_commons.hpp
index 8e82899c..de7d641a 100644
--- a/src/logic/scripting/lua/lua_commons.hpp
+++ b/src/logic/scripting/lua/lua_commons.hpp
@@ -1,8 +1,8 @@
 #ifndef LOGIC_SCRIPTING_LUA_HPP_
 #define LOGIC_SCRIPTING_LUA_HPP_
 
-#include "../../../delegates.hpp"
-#include "../scripting.hpp"
+#include <delegates.hpp>
+#include <logic/scripting/scripting.hpp>
 
 #ifdef __linux__
 #include <luajit-2.1/luaconf.h>
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index fa83b0a1..7ae59f10 100644
--- a/src/logic/scripting/lua/lua_engine.cpp
+++ b/src/logic/scripting/lua/lua_engine.cpp
@@ -3,8 +3,8 @@
 #include <iomanip>
 #include <iostream>
 
-#include "../../../debug/Logger.hpp"
-#include "../../../util/stringutil.hpp"
+#include <debug/Logger.hpp>
+#include <util/stringutil.hpp>
 #include "api_lua.hpp"
 #include "lua_custom_types.hpp"
 
diff --git a/src/logic/scripting/lua/lua_engine.hpp b/src/logic/scripting/lua/lua_engine.hpp
index a21d4292..35112339 100644
--- a/src/logic/scripting/lua/lua_engine.hpp
+++ b/src/logic/scripting/lua/lua_engine.hpp
@@ -4,9 +4,9 @@
 #include <stdexcept>
 #include <string>
 
-#include "../../../data/dynamic.hpp"
-#include "../../../delegates.hpp"
-#include "../scripting_functional.hpp"
+#include <data/dynamic.hpp>
+#include <delegates.hpp>
+#include <logic/scripting/scripting_functional.hpp>
 #include "lua_util.hpp"
 
 namespace lua {
diff --git a/src/logic/scripting/lua/lua_extensions.cpp b/src/logic/scripting/lua/lua_extensions.cpp
index df88b3dd..a1667e21 100644
--- a/src/logic/scripting/lua/lua_extensions.cpp
+++ b/src/logic/scripting/lua/lua_extensions.cpp
@@ -1,4 +1,4 @@
-#include "../../../debug/Logger.hpp"
+#include <debug/Logger.hpp>
 #include "api_lua.hpp"
 
 static debug::Logger logger("lua-debug");
diff --git a/src/logic/scripting/lua/lua_util.cpp b/src/logic/scripting/lua/lua_util.cpp
index 50069cad..25c51caa 100644
--- a/src/logic/scripting/lua/lua_util.cpp
+++ b/src/logic/scripting/lua/lua_util.cpp
@@ -3,7 +3,7 @@
 #include <iomanip>
 #include <iostream>
 
-#include "../../../util/stringutil.hpp"
+#include <util/stringutil.hpp>
 
 using namespace lua;
 
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index d928ad93..5d3b95c0 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -3,24 +3,24 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "../../content/Content.hpp"
-#include "../../content/ContentPack.hpp"
-#include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
-#include "../../files/engine_paths.hpp"
-#include "../../files/files.hpp"
-#include "../../frontend/UiDocument.hpp"
-#include "../../items/Inventory.hpp"
-#include "../../items/ItemDef.hpp"
-#include "../../logic/BlocksController.hpp"
-#include "../../logic/LevelController.hpp"
-#include "../../objects/Entities.hpp"
-#include "../../objects/EntityDef.hpp"
-#include "../../objects/Player.hpp"
-#include "../../util/stringutil.hpp"
-#include "../../util/timeutil.hpp"
-#include "../../voxels/Block.hpp"
-#include "../../world/Level.hpp"
+#include <content/Content.hpp>
+#include <content/ContentPack.hpp>
+#include <debug/Logger.hpp>
+#include <engine.hpp>
+#include <files/engine_paths.hpp>
+#include <files/files.hpp>
+#include <frontend/UiDocument.hpp>
+#include <items/Inventory.hpp>
+#include <items/ItemDef.hpp>
+#include <logic/BlocksController.hpp>
+#include <logic/LevelController.hpp>
+#include <objects/Entities.hpp>
+#include <objects/EntityDef.hpp>
+#include <objects/Player.hpp>
+#include <util/stringutil.hpp>
+#include <util/timeutil.hpp>
+#include <voxels/Block.hpp>
+#include <world/Level.hpp>
 #include "lua/lua_engine.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index 85959b82..45e6ecf9 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -7,9 +7,9 @@
 #include <string>
 #include <vector>
 
-#include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
-#include "../../typedefs.hpp"
+#include <data/dynamic.hpp>
+#include <delegates.hpp>
+#include <typedefs.hpp>
 #include "scripting_functional.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp
index db26db80..9f7e294e 100644
--- a/src/logic/scripting/scripting_functional.cpp
+++ b/src/logic/scripting/scripting_functional.cpp
@@ -1,8 +1,8 @@
 #include "scripting_functional.hpp"
 
-#include "../../coders/json.hpp"
-#include "../../debug/Logger.hpp"
-#include "../../util/stringutil.hpp"
+#include <coders/json.hpp>
+#include <debug/Logger.hpp>
+#include <util/stringutil.hpp>
 #include "lua/lua_engine.hpp"
 
 using namespace scripting;
diff --git a/src/logic/scripting/scripting_functional.hpp b/src/logic/scripting/scripting_functional.hpp
index b0bec218..19da0fa7 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -4,9 +4,9 @@
 #include <glm/glm.hpp>
 #include <string>
 
-#include "../../data/dynamic.hpp"
-#include "../../delegates.hpp"
-#include "../../typedefs.hpp"
+#include <data/dynamic.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..540f08df 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -1,10 +1,10 @@
 #include "scripting_hud.hpp"
 
-#include "../../debug/Logger.hpp"
-#include "../../engine.hpp"
-#include "../../files/files.hpp"
-#include "../../frontend/hud.hpp"
-#include "../../objects/Player.hpp"
+#include <debug/Logger.hpp>
+#include <engine.hpp>
+#include <files/files.hpp>
+#include <frontend/hud.hpp>
+#include <objects/Player.hpp>
 #include "lua/api_lua.hpp"
 #include "lua/lua_engine.hpp"
 #include "scripting.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..dd7ade5e 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -3,23 +3,23 @@
 #include <glm/ext/matrix_transform.hpp>
 #include <sstream>
 
-#include "../assets/Assets.hpp"
-#include "../content/Content.hpp"
-#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 "../logic/scripting/scripting.hpp"
-#include "../maths/FrustumCulling.hpp"
-#include "../maths/rays.hpp"
-#include "../objects/EntityDef.hpp"
-#include "../objects/rigging.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../physics/PhysicsSolver.hpp"
-#include "../world/Level.hpp"
+#include <assets/Assets.hpp>
+#include <content/Content.hpp>
+#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 <logic/scripting/scripting.hpp>
+#include <maths/FrustumCulling.hpp>
+#include <maths/rays.hpp>
+#include "EntityDef.hpp"
+#include "rigging.hpp"
+#include <physics/Hitbox.hpp>
+#include <physics/PhysicsSolver.hpp>
+#include <world/Level.hpp>
 
 static debug::Logger logger("entities");
 
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index e311c7a7..0ab53635 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -6,10 +6,10 @@
 #include <optional>
 #include <vector>
 
-#include "../data/dynamic.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../typedefs.hpp"
-#include "../util/Clock.hpp"
+#include <data/dynamic.hpp>
+#include <physics/Hitbox.hpp>
+#include <typedefs.hpp>
+#include <util/Clock.hpp>
 #define GLM_ENABLE_EXPERIMENTAL
 #include <entt/entity/registry.hpp>
 #include <glm/gtx/norm.hpp>
diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp
index 6ddee669..dfaced89 100644
--- a/src/objects/EntityDef.hpp
+++ b/src/objects/EntityDef.hpp
@@ -5,9 +5,9 @@
 #include <vector>
 #include <glm/glm.hpp>
 
-#include "../typedefs.hpp"
-#include "../maths/aabb.hpp"
-#include "../physics/Hitbox.hpp"
+#include <typedefs.hpp>
+#include <maths/aabb.hpp>
+#include <physics/Hitbox.hpp>
 
 namespace rigging {
     class SkeletonConfig;
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index 1d7a2218..1d34a6a5 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -4,16 +4,16 @@
 #include <glm/glm.hpp>
 #include <utility>
 
-#include "../content/ContentLUT.hpp"
-#include "../items/Inventory.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/rigging.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../physics/PhysicsSolver.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../window/Camera.hpp"
-#include "../window/Events.hpp"
-#include "../world/Level.hpp"
+#include <content/ContentLUT.hpp>
+#include <items/Inventory.hpp>
+#include "Entities.hpp"
+#include "rigging.hpp"
+#include <physics/Hitbox.hpp>
+#include <physics/PhysicsSolver.hpp>
+#include <voxels/Chunks.hpp>
+#include <window/Camera.hpp>
+#include <window/Events.hpp>
+#include <world/Level.hpp>
 
 const float CROUCH_SPEED_MUL = 0.35f;
 const float RUN_SPEED_MUL = 1.5f;
diff --git a/src/objects/Player.hpp b/src/objects/Player.hpp
index 8e97bde1..61c8ae7f 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -5,11 +5,11 @@
 #include <memory>
 #include <optional>
 
-#include "../data/dynamic.hpp"
-#include "../interfaces/Object.hpp"
-#include "../interfaces/Serializable.hpp"
-#include "../settings.hpp"
-#include "../voxels/voxel.hpp"
+#include <data/dynamic.hpp>
+#include <interfaces/Object.hpp>
+#include <interfaces/Serializable.hpp>
+#include <settings.hpp>
+#include <voxels/voxel.hpp>
 
 class Camera;
 class Inventory;
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index c592e104..2987a740 100644
--- a/src/objects/rigging.cpp
+++ b/src/objects/rigging.cpp
@@ -1,10 +1,10 @@
 #include "rigging.hpp"
 
-#include "../assets/Assets.hpp"
-#include "../coders/json.hpp"
-#include "../data/dynamic_util.hpp"
-#include "../graphics/core/Model.hpp"
-#include "../graphics/render/ModelBatch.hpp"
+#include <assets/Assets.hpp>
+#include <coders/json.hpp>
+#include <data/dynamic_util.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/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..37db8d74 100644
--- a/src/physics/Hitbox.hpp
+++ b/src/physics/Hitbox.hpp
@@ -1,8 +1,8 @@
 #ifndef PHYSICS_HITBOX_HPP_
 #define PHYSICS_HITBOX_HPP_
 
-#include "../maths/aabb.hpp"
-#include "../typedefs.hpp"
+#include <maths/aabb.hpp>
+#include <typedefs.hpp>
 
 #include <set>
 #include <string>
diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp
index 01701c4d..ddd6d6ee 100644
--- a/src/physics/PhysicsSolver.cpp
+++ b/src/physics/PhysicsSolver.cpp
@@ -1,10 +1,10 @@
 #include "PhysicsSolver.hpp"
 #include "Hitbox.hpp"
 
-#include "../maths/aabb.hpp"
-#include "../voxels/Block.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/voxel.hpp"
+#include <maths/aabb.hpp>
+#include <voxels/Block.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/voxel.hpp>
 
 #include <iostream>
 #include <algorithm>
diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp
index fbc9812b..b50a751a 100644
--- a/src/physics/PhysicsSolver.hpp
+++ b/src/physics/PhysicsSolver.hpp
@@ -3,8 +3,8 @@
 
 #include "Hitbox.hpp"
 
-#include "../typedefs.hpp"
-#include "../voxels/voxel.hpp"
+#include <typedefs.hpp>
+#include <voxels/voxel.hpp>
 
 #include <vector>
 #include <glm/glm.hpp>
diff --git a/src/settings.hpp b/src/settings.hpp
index 58fb2c07..486a3f2d 100644
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -4,9 +4,9 @@
 #include <string>
 #include <unordered_map>
 
-#include "data/setting.hpp"
-#include "constants.hpp"
-#include "typedefs.hpp"
+#include <data/setting.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..13ead840 100644
--- a/src/util/ThreadPool.hpp
+++ b/src/util/ThreadPool.hpp
@@ -10,9 +10,9 @@
 #include <thread>
 #include <utility>
 
-#include "../debug/Logger.hpp"
-#include "../delegates.hpp"
-#include "../interfaces/Task.hpp"
+#include <debug/Logger.hpp>
+#include <delegates.hpp>
+#include <interfaces/Task.hpp>
 
 namespace util {
 
diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp
index 1f988e5c..9485e6f8 100644
--- a/src/util/command_line.cpp
+++ b/src/util/command_line.cpp
@@ -6,7 +6,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../files/engine_paths.hpp"
+#include <files/engine_paths.hpp>
 
 namespace fs = std::filesystem;
 
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/listutil.cpp b/src/util/listutil.cpp
index ccbe0d15..97d24aa6 100644
--- a/src/util/listutil.cpp
+++ b/src/util/listutil.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "../util/stringutil.hpp"
+#include "stringutil.hpp"
 
 std::string util::to_string(const std::vector<std::string>& vec) {
     std::stringstream ss;
diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index c7b71bbf..9f50d97d 100644
--- a/src/util/platform.cpp
+++ b/src/util/platform.cpp
@@ -6,12 +6,12 @@
 #include <iostream>
 #include <sstream>
 
-#include "../typedefs.hpp"
+#include <typedefs.hpp>
 
 #ifdef _WIN32
 #include <Windows.h>
 
-#include "./stringutil.hpp"
+#include "stringutil.hpp"
 
 void platform::configure_encoding() {
     // set utf-8 encoding to console output
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..584f6214 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -1,10 +1,10 @@
-#include "engine.hpp"
-#include "settings.hpp"
-#include "files/settings_io.hpp"
-#include "files/engine_paths.hpp"
-#include "util/platform.hpp"
-#include "util/command_line.hpp"
-#include "debug/Logger.hpp"
+#include <engine.hpp>
+#include <settings.hpp>
+#include <files/settings_io.hpp>
+#include <files/engine_paths.hpp>
+#include <util/platform.hpp>
+#include <util/command_line.hpp>
+#include <debug/Logger.hpp>
 
 #include <stdexcept>
 
diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp
index 4abdd339..0586ac1c 100644
--- a/src/voxels/Block.cpp
+++ b/src/voxels/Block.cpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "../core_defs.hpp"
-#include "../util/stringutil.hpp"
+#include <core_defs.hpp>
+#include <util/stringutil.hpp>
 
 std::string to_string(BlockModel model) {
     switch (model) {
diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp
index 9a01bb44..feb7f5cf 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
-#include "../maths/UVRegion.hpp"
-#include "../maths/aabb.hpp"
-#include "../typedefs.hpp"
+#include <maths/UVRegion.hpp>
+#include <maths/aabb.hpp>
+#include <typedefs.hpp>
 
 inline std::string BLOCK_ITEM_SUFFIX = ".item";
 
diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp
index 6a299221..5e35d61f 100644
--- a/src/voxels/Chunk.cpp
+++ b/src/voxels/Chunk.cpp
@@ -2,9 +2,9 @@
 
 #include <utility>
 
-#include "../content/ContentLUT.hpp"
-#include "../items/Inventory.hpp"
-#include "../lighting/Lightmap.hpp"
+#include <content/ContentLUT.hpp>
+#include <items/Inventory.hpp>
+#include <lighting/Lightmap.hpp>
 #include "voxel.hpp"
 
 Chunk::Chunk(int xpos, int zpos) : x(xpos), z(zpos) {
diff --git a/src/voxels/Chunk.hpp b/src/voxels/Chunk.hpp
index 0d8b0d8a..206542bc 100644
--- a/src/voxels/Chunk.hpp
+++ b/src/voxels/Chunk.hpp
@@ -6,8 +6,8 @@
 #include <memory>
 #include <unordered_map>
 
-#include "../constants.hpp"
-#include "../lighting/Lightmap.hpp"
+#include <constants.hpp>
+#include <lighting/Lightmap.hpp>
 #include "voxel.hpp"
 
 inline constexpr int CHUNK_DATA_LEN = CHUNK_VOL * 4;
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 014712c6..cfff7b0c 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -6,18 +6,18 @@
 #include <algorithm>
 #include <vector>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/json.hpp"
-#include "../content/Content.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../graphics/core/Mesh.hpp"
-#include "../lighting/Lightmap.hpp"
-#include "../maths/aabb.hpp"
-#include "../maths/rays.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../objects/Entities.hpp"
-#include "../world/Level.hpp"
-#include "../world/LevelEvents.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/json.hpp>
+#include <content/Content.hpp>
+#include <files/WorldFiles.hpp>
+#include <graphics/core/Mesh.hpp>
+#include <lighting/Lightmap.hpp>
+#include <maths/aabb.hpp>
+#include <maths/rays.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/Entities.hpp>
+#include <world/Level.hpp>
+#include <world/LevelEvents.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "WorldGenerator.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..19989e52 100644
--- a/src/voxels/ChunksStorage.cpp
+++ b/src/voxels/ChunksStorage.cpp
@@ -1,15 +1,15 @@
 #include "ChunksStorage.hpp"
 
-#include "../content/Content.hpp"
-#include "../debug/Logger.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../items/Inventories.hpp"
-#include "../lighting/Lightmap.hpp"
-#include "../maths/voxmaths.hpp"
-#include "../objects/Entities.hpp"
-#include "../typedefs.hpp"
-#include "../world/Level.hpp"
-#include "../world/World.hpp"
+#include <content/Content.hpp>
+#include <debug/Logger.hpp>
+#include <files/WorldFiles.hpp>
+#include <items/Inventories.hpp>
+#include <lighting/Lightmap.hpp>
+#include <maths/voxmaths.hpp>
+#include <objects/Entities.hpp>
+#include <typedefs.hpp>
+#include <world/Level.hpp>
+#include <world/World.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "VoxelsVolume.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..ed76d0f2 100644
--- a/src/voxels/DefaultWorldGenerator.cpp
+++ b/src/voxels/DefaultWorldGenerator.cpp
@@ -14,11 +14,11 @@
 #include <stdexcept>
 #include <vector>
 
-#include "../content/Content.hpp"
-#include "../core_defs.hpp"
-#include "../maths/FastNoiseLite.h"
-#include "../maths/util.hpp"
-#include "../maths/voxmaths.hpp"
+#include <content/Content.hpp>
+#include <core_defs.hpp>
+#include <maths/FastNoiseLite.h>
+#include <maths/util.hpp>
+#include <maths/voxmaths.hpp>
 
 // will be refactored in generators update
 
diff --git a/src/voxels/DefaultWorldGenerator.hpp b/src/voxels/DefaultWorldGenerator.hpp
index 63fbb6d6..2e1070f9 100644
--- a/src/voxels/DefaultWorldGenerator.hpp
+++ b/src/voxels/DefaultWorldGenerator.hpp
@@ -1,8 +1,8 @@
 #ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
 #define VOXELS_DEFAULTWORLDGENERATOR_HPP_
 
-#include "../typedefs.hpp"
-#include "../voxels/WorldGenerator.hpp"
+#include <typedefs.hpp>
+#include "WorldGenerator.hpp"
 
 struct voxel;
 class Content;
diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp
index 2121f888..61884fee 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 <content/Content.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..33b9edae 100644
--- a/src/voxels/FlatWorldGenerator.hpp
+++ b/src/voxels/FlatWorldGenerator.hpp
@@ -1,8 +1,8 @@
 #ifndef VOXELS_FLATWORLDGENERATOR_HPP_
 #define VOXELS_FLATWORLDGENERATOR_HPP_
 
-#include "../typedefs.hpp"
-#include "../voxels/WorldGenerator.hpp"
+#include <typedefs.hpp>
+#include "WorldGenerator.hpp"
 
 struct voxel;
 class Content;
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.cpp b/src/voxels/WorldGenerator.cpp
index 84d44d25..bb4af870 100644
--- a/src/voxels/WorldGenerator.cpp
+++ b/src/voxels/WorldGenerator.cpp
@@ -1,6 +1,6 @@
 #include "WorldGenerator.hpp"
 
-#include "../content/Content.hpp"
+#include <content/Content.hpp>
 #include "Block.hpp"
 #include "Chunk.hpp"
 #include "voxel.hpp"
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.cpp b/src/window/Events.cpp
index e2d3288e..2cb13087 100644
--- a/src/window/Events.cpp
+++ b/src/window/Events.cpp
@@ -4,8 +4,8 @@
 #include <GLFW/glfw3.h>
 #include <string.h>
 
-#include "../debug/Logger.hpp"
-#include "../util/stringutil.hpp"
+#include <debug/Logger.hpp>
+#include <util/stringutil.hpp>
 #include "Window.hpp"
 
 static debug::Logger logger("events");
@@ -165,9 +165,9 @@ void Events::setPosition(float xpos, float ypos) {
     Events::cursor.y = ypos;
 }
 
-#include "../coders/json.hpp"
-#include "../coders/toml.hpp"
-#include "../data/dynamic.hpp"
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
+#include <data/dynamic.hpp>
 
 std::string Events::writeBindings() {
     dynamic::Map obj;
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 42ef7f70..984a23e8 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -7,11 +7,11 @@
 #include <iostream>
 #include <thread>
 
-#include "../debug/Logger.hpp"
-#include "../graphics/core/ImageData.hpp"
-#include "../graphics/core/Texture.hpp"
-#include "../settings.hpp"
-#include "../util/ObjectsKeeper.hpp"
+#include <debug/Logger.hpp>
+#include <graphics/core/ImageData.hpp>
+#include <graphics/core/Texture.hpp>
+#include <settings.hpp>
+#include <util/ObjectsKeeper.hpp>
 #include "Events.hpp"
 
 static debug::Logger logger("window");
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/window/input.hpp b/src/window/input.hpp
index 5cc51671..e9150b3f 100644
--- a/src/window/input.hpp
+++ b/src/window/input.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../util/RunnablesList.hpp"
+#include <util/RunnablesList.hpp>
 
 /// @brief Represents glfw3 keycode values.
 enum class keycode : int {
diff --git a/src/world/Level.cpp b/src/world/Level.cpp
index f27ae8d8..90e828a3 100644
--- a/src/world/Level.cpp
+++ b/src/world/Level.cpp
@@ -1,19 +1,19 @@
 #include "Level.hpp"
 
-#include "../content/Content.hpp"
-#include "../data/dynamic_util.hpp"
-#include "../items/Inventories.hpp"
-#include "../items/Inventory.hpp"
-#include "../lighting/Lighting.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
-#include "../physics/Hitbox.hpp"
-#include "../physics/PhysicsSolver.hpp"
-#include "../settings.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/ChunksStorage.hpp"
-#include "../window/Camera.hpp"
+#include <content/Content.hpp>
+#include <data/dynamic_util.hpp>
+#include <items/Inventories.hpp>
+#include <items/Inventory.hpp>
+#include <lighting/Lighting.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
+#include <physics/Hitbox.hpp>
+#include <physics/PhysicsSolver.hpp>
+#include <settings.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/ChunksStorage.hpp>
+#include <window/Camera.hpp>
 #include "LevelEvents.hpp"
 #include "World.hpp"
 
diff --git a/src/world/Level.hpp b/src/world/Level.hpp
index 04faa6a7..f7ea1e23 100644
--- a/src/world/Level.hpp
+++ b/src/world/Level.hpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "../interfaces/Object.hpp"
+#include <interfaces/Object.hpp>
 
 inline constexpr float DEF_PLAYER_Y = 100.0f;
 inline constexpr float DEF_PLAYER_SPEED = 4.0f;
diff --git a/src/world/LevelEvents.cpp b/src/world/LevelEvents.cpp
index 12bedc1a..9139dc37 100644
--- a/src/world/LevelEvents.cpp
+++ b/src/world/LevelEvents.cpp
@@ -1,6 +1,6 @@
 #include "LevelEvents.hpp"
 
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 
 using std::vector;
 
diff --git a/src/world/World.cpp b/src/world/World.cpp
index e6cff781..8945d494 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -4,18 +4,18 @@
 #include <memory>
 #include <utility>
 
-#include "../content/Content.hpp"
-#include "../content/ContentLUT.hpp"
-#include "../debug/Logger.hpp"
-#include "../files/WorldFiles.hpp"
-#include "../items/Inventories.hpp"
-#include "../objects/Entities.hpp"
-#include "../objects/Player.hpp"
-#include "../settings.hpp"
-#include "../voxels/Chunk.hpp"
-#include "../voxels/Chunks.hpp"
-#include "../voxels/ChunksStorage.hpp"
-#include "../world/WorldGenerators.hpp"
+#include <content/Content.hpp>
+#include <content/ContentLUT.hpp>
+#include <debug/Logger.hpp>
+#include <files/WorldFiles.hpp>
+#include <items/Inventories.hpp>
+#include <objects/Entities.hpp>
+#include <objects/Player.hpp>
+#include <settings.hpp>
+#include <voxels/Chunk.hpp>
+#include <voxels/Chunks.hpp>
+#include <voxels/ChunksStorage.hpp>
+#include "WorldGenerators.hpp"
 #include "Level.hpp"
 
 static debug::Logger logger("world");
diff --git a/src/world/World.hpp b/src/world/World.hpp
index 2c4eac32..e7e38a79 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -6,11 +6,11 @@
 #include <string>
 #include <vector>
 
-#include "../content/ContentPack.hpp"
-#include "../data/dynamic.hpp"
-#include "../interfaces/Serializable.hpp"
-#include "../typedefs.hpp"
-#include "../util/timeutil.hpp"
+#include <content/ContentPack.hpp>
+#include <data/dynamic.hpp>
+#include <interfaces/Serializable.hpp>
+#include <typedefs.hpp>
+#include <util/timeutil.hpp>
 
 class Content;
 class WorldFiles;
diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp
index 75925323..caa0174b 100644
--- a/src/world/WorldGenerators.cpp
+++ b/src/world/WorldGenerators.cpp
@@ -2,9 +2,9 @@
 
 #include <iostream>
 
-#include "../content/Content.hpp"
-#include "../voxels/FlatWorldGenerator.hpp"
-#include "../voxels/WorldGenerator.hpp"
+#include <content/Content.hpp>
+#include <voxels/FlatWorldGenerator.hpp>
+#include <voxels/WorldGenerator.hpp>
 
 std::vector<std::string> WorldGenerators::getGeneratorsIDs() {
     std::vector<std::string> ids;
diff --git a/src/world/WorldGenerators.hpp b/src/world/WorldGenerators.hpp
index e21ddb12..49afce15 100644
--- a/src/world/WorldGenerators.hpp
+++ b/src/world/WorldGenerators.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "../voxels/WorldGenerator.hpp"
+#include <voxels/WorldGenerator.hpp>
 
 class Content;