diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index 663bc80d..4b26c34f 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -4,7 +4,7 @@
 #include <memory>
 #include <utility>
 
-#include "../coders/imageio.hpp"
+#include <coders/imageio.hpp>
 #include <constants.hpp>
 #include "../content/Content.hpp"
 #include "../content/ContentPack.hpp"
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 702c38e0..31eec6ca 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -5,11 +5,11 @@
 #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 <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"
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/content/ContentLUT.cpp b/src/content/ContentLUT.cpp
index fafb81e1..620b4d0f 100644
--- a/src/content/ContentLUT.cpp
+++ b/src/content/ContentLUT.cpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 #include <constants.hpp>
 #include "../files/files.hpp"
 #include "../items/ItemDef.hpp"
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index e518340e..387cea25 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 #include <core_defs.hpp>
 #include "../data/dynamic.hpp"
 #include "../debug/Logger.hpp"
diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index 6fdd83e3..d972a026 100644
--- a/src/content/ContentPack.cpp
+++ b/src/content/ContentPack.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <utility>
 
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 #include "../data/dynamic.hpp"
 #include "../files/engine_paths.hpp"
 #include "../files/files.hpp"
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/engine.cpp b/src/engine.cpp
index b48a9c2e..8782749a 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -5,10 +5,10 @@
 #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 <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"
diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
index 46ccba7b..82f98c4a 100644
--- a/src/files/WorldFiles.cpp
+++ b/src/files/WorldFiles.cpp
@@ -8,8 +8,8 @@
 #include <sstream>
 #include <utility>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/json.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/json.hpp>
 #include <constants.hpp>
 #include "../content/Content.hpp"
 #include <core_defs.hpp>
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index 5660ab75..f5852675 100644
--- a/src/files/WorldRegions.cpp
+++ b/src/files/WorldRegions.cpp
@@ -4,8 +4,8 @@
 #include <utility>
 #include <vector>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/rle.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/rle.hpp>
 #include "../data/dynamic.hpp"
 #include "../items/Inventory.hpp"
 #include "../maths/voxmaths.hpp"
diff --git a/src/files/files.cpp b/src/files/files.cpp
index e471a627..469feec7 100644
--- a/src/files/files.cpp
+++ b/src/files/files.cpp
@@ -7,10 +7,10 @@
 #include <memory>
 #include <stdexcept>
 
-#include "../coders/commons.hpp"
-#include "../coders/gzip.hpp"
-#include "../coders/json.hpp"
-#include "../coders/toml.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"
 
diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp
index 2799ac81..133cddde 100644
--- a/src/files/settings_io.cpp
+++ b/src/files/settings_io.cpp
@@ -3,8 +3,8 @@
 #include <memory>
 #include <utility>
 
-#include "../coders/json.hpp"
-#include "../coders/toml.hpp"
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
 #include "../debug/Logger.hpp"
 #include <settings.hpp>
 #include "../window/Events.hpp"
diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp
index f4f08a26..6c6823c0 100644
--- a/src/frontend/locale.cpp
+++ b/src/frontend/locale.cpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "../coders/json.hpp"
-#include "../coders/commons.hpp"
+#include <coders/json.hpp>
+#include <coders/commons.hpp>
 #include "../content/ContentPack.hpp"
 #include "../files/files.hpp"
 #include "../util/stringutil.hpp"
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index a69a91e7..04882933 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -14,7 +14,7 @@
 #include "../graphics/ui/GUI.hpp"
 #include "../logic/scripting/scripting.hpp"
 #include <settings.hpp>
-#include "../coders/commons.hpp"
+#include <coders/commons.hpp>
 #include "../util/stringutil.hpp"
 #include "../window/Window.hpp"
 
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index f11ccd46..f7546360 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -4,7 +4,7 @@
 #include "../hud.hpp"
 #include "../LevelFrontend.hpp"
 #include "../../audio/audio.hpp"
-#include "../../coders/imageio.hpp"
+#include <coders/imageio.hpp>
 #include "../../debug/Logger.hpp"
 #include <engine.hpp>
 #include "../../files/files.hpp"
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/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/logic/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp
index e7dbbac6..a197cb4a 100644
--- a/src/logic/CommandsInterpreter.cpp
+++ b/src/logic/CommandsInterpreter.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <utility>
 
-#include "../coders/commons.hpp"
+#include <coders/commons.hpp>
 #include "../util/stringutil.hpp"
 
 using namespace cmd;
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index 2a6c36ef..ee05f3f8 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -4,7 +4,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "../coders/commons.hpp"
+#include <coders/commons.hpp>
 #include "../content/ContentLUT.hpp"
 #include "../debug/Logger.hpp"
 #include <engine.hpp>
diff --git a/src/logic/scripting/lua/libconsole.cpp b/src/logic/scripting/lua/libconsole.cpp
index 0ec904a2..28655f80 100644
--- a/src/logic/scripting/lua/libconsole.cpp
+++ b/src/logic/scripting/lua/libconsole.cpp
@@ -1,4 +1,4 @@
-#include "../../../coders/commons.hpp"
+#include <coders/commons.hpp>
 #include <engine.hpp>
 #include "../../CommandsInterpreter.hpp"
 #include "api_lua.hpp"
diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp
index b140bbc4..df4cf545 100644
--- a/src/logic/scripting/lua/libfile.cpp
+++ b/src/logic/scripting/lua/libfile.cpp
@@ -1,7 +1,7 @@
 #include <filesystem>
 #include <string>
 
-#include "../../../coders/gzip.hpp"
+#include <coders/gzip.hpp>
 #include <engine.hpp>
 #include "../../../files/engine_paths.hpp"
 #include "../../../files/files.hpp"
diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libjson.cpp
index 3fbe173c..f30b7cf2 100644
--- a/src/logic/scripting/lua/libjson.cpp
+++ b/src/logic/scripting/lua/libjson.cpp
@@ -1,4 +1,4 @@
-#include "../../../coders/json.hpp"
+#include <coders/json.hpp>
 #include "../../../data/dynamic.hpp"
 #include "api_lua.hpp"
 
diff --git a/src/logic/scripting/lua/libtoml.cpp b/src/logic/scripting/lua/libtoml.cpp
index 5b3c0162..06a79399 100644
--- a/src/logic/scripting/lua/libtoml.cpp
+++ b/src/logic/scripting/lua/libtoml.cpp
@@ -1,4 +1,4 @@
-#include "../../../coders/toml.hpp"
+#include <coders/toml.hpp>
 #include "../../../data/dynamic.hpp"
 #include "api_lua.hpp"
 
diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp
index db26db80..2854c6c5 100644
--- a/src/logic/scripting/scripting_functional.cpp
+++ b/src/logic/scripting/scripting_functional.cpp
@@ -1,6 +1,6 @@
 #include "scripting_functional.hpp"
 
-#include "../../coders/json.hpp"
+#include <coders/json.hpp>
 #include "../../debug/Logger.hpp"
 #include "../../util/stringutil.hpp"
 #include "lua/lua_engine.hpp"
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index c93523be..82880372 100644
--- a/src/objects/rigging.cpp
+++ b/src/objects/rigging.cpp
@@ -1,7 +1,7 @@
 #include "rigging.hpp"
 
 #include <assets/Assets.hpp>
-#include "../coders/json.hpp"
+#include <coders/json.hpp>
 #include "../data/dynamic_util.hpp"
 #include "../graphics/core/Model.hpp"
 #include "../graphics/render/ModelBatch.hpp"
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 014712c6..b9538f1f 100644
--- a/src/voxels/Chunks.cpp
+++ b/src/voxels/Chunks.cpp
@@ -6,8 +6,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "../coders/byte_utils.hpp"
-#include "../coders/json.hpp"
+#include <coders/byte_utils.hpp>
+#include <coders/json.hpp>
 #include "../content/Content.hpp"
 #include "../files/WorldFiles.hpp"
 #include "../graphics/core/Mesh.hpp"
diff --git a/src/window/Events.cpp b/src/window/Events.cpp
index e2d3288e..10448224 100644
--- a/src/window/Events.cpp
+++ b/src/window/Events.cpp
@@ -165,8 +165,8 @@ void Events::setPosition(float xpos, float ypos) {
     Events::cursor.y = ypos;
 }
 
-#include "../coders/json.hpp"
-#include "../coders/toml.hpp"
+#include <coders/json.hpp>
+#include <coders/toml.hpp>
 #include "../data/dynamic.hpp"
 
 std::string Events::writeBindings() {