diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp
index a3b689e7..c6af22ed 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 d4b6d5ed..9a570fc2 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 38db983b..f8b0e7c6 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 e64687e5..97107862 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 a2f72c41..6843cba0 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 4a3f0e55..c39bfe64 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/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 7d59e7ea..43391827 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 26a11289..54323300 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 0b8f979a..0dc0f591 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 ab7313af..2a827fc0 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 fafd13f9..186522a5 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 0603328a..9b8bac22 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 9bcdf04e..12586c76 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 326bcdb1..f1212541 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 5da5659e..a6406e4d 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 6a16b7d4..2714808d 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 87184acb..c89a258b 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 90d34bee..f13e13cb 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 77cce710..ac18eb3c 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 8254eeb5..776cbeac 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 0e0b29dc..b69ff342 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 123b6979..df5f9826 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 14f5c801..76f4a7b2 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");
 
diff --git a/src/coders/rle.hpp b/src/coders/rle.hpp
index a2e45a85..da97adcb 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 dc5624cd..63e13025 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 032e1cf6..314767df 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 28a94bda..6ba337fd 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 647ad4b6..6a8777c5 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 5189a359..e98d5914 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 3f3cf32e..677258ad 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 e8e8a2d7..d06edc98 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 f68af5d3..4bf194bc 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 f27bd8f8..b1e03bf1 100644
--- a/src/content/ContentBuilder.hpp
+++ b/src/content/ContentBuilder.hpp
@@ -7,9 +7,9 @@
 
 #include "Content.hpp"
 #include "ContentPack.hpp"
-#include <items/ItemDef.hpp>
-#include <objects/EntityDef.hpp>
-#include <voxels/Block.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 c1c4c960..490fbbb4 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 12723073..5026d414 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 67f1965e..26e8f5f0 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 0a81970e..90e4b73a 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 ff8555f2..67a54128 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 5934feb3..370bed98 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 377b4d4d..312c5d01 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 1c00d0c7..cf8dc1f4 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 792f1932..f0d60bf1 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 154d4d70..351be865 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 397caf24..2f39be94 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 73378459..0ec643bd 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 b00294ed..17bb2b8b 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 b9007699..de18b3e3 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 da0f625e..637e3890 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 5b9f13fa..3a56cf68 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 68f3b56f..b85e34bf 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 2ba543b8..0a24a3f4 100644
--- a/src/files/WorldFiles.hpp
+++ b/src/files/WorldFiles.hpp
@@ -7,13 +7,13 @@
 #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
-#include "glm/gtx/hash.hpp"
+#include <glm/gtx/hash.hpp>
 
 inline constexpr uint WORLD_FORMAT_VERSION = 1;
 
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index c7d54edc..854be0be 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 11e32980..bf838e24 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -9,13 +9,13 @@
 #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"
+#include <glm/gtx/hash.hpp>
 
 namespace fs = std::filesystem;
 
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index da74ef82..759d277e 100644
--- a/src/files/engine_paths.cpp
+++ b/src/files/engine_paths.cpp
@@ -5,8 +5,8 @@
 #include <filesystem>
 #include <sstream>
 #include <stack>
-#include <typedefs.hpp>
-#include <util/stringutil.hpp>
+#include "typedefs.hpp"
+#include "util/stringutil.hpp"
 #include <utility>
 
 #include "WorldFiles.hpp"
diff --git a/src/files/engine_paths.hpp b/src/files/engine_paths.hpp
index a32e7fad..2360cc30 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"
 
 
 class files_access_error : public std::runtime_error {
diff --git a/src/files/files.cpp b/src/files/files.cpp
index cf36a635..e0e52297 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 5557b0f2..6b784098 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 c9a7668b..b9993f15 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 1bb84d32..dcea564a 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 c8bff298..f45259e1 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 213e38c1..a833430e 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 281798d1..68f308c8 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 06e6029c..e218d975 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 6a9840b3..8ddcb67e 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 2e481832..4b01e32f 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 fccebf00..178563ac 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 a47303d1..8375b3bb 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 fd562ffe..1ce866b2 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 88bc2c0d..9769a2b5 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 8c9afafe..0c0d47d2 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 21eb8855..bf452c20 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 <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>
+#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 5e96500f..305b42ed 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 a167b98a..2c1c998a 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 4e6f3120..174c5059 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 00f1f589..039db4d2 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 2542c771..302bff9a 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 e93f1e5a..d9cc0ec2 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 fbad1260..975b7e0f 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 94fe9ac4..82bc3bc3 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 5d05c460..1809dac1 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 b8bb589f..29afae2e 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 ac816d13..85769c87 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 d2dd7e69..0af6dddb 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 ddb96316..29b8da84 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 e4a77b09..5c33573d 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 ee5bfbd1..bd93f219 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 56c336ea..71a7288b 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 cd5e8832..ab4446cd 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 1f1f8376..323dec73 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 cc5da102..234ca84c 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 447289d3..e1574a09 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 aaefcd27..bf6b2a10 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 <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 "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 ba08c0c2..8cdec60b 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 a734b756..382a410d 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,16 +1,16 @@
 #include "BlocksRenderer.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 "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 b37e4b7a..311936e1 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 29512734..743676fa 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 bb03c09e..c1e2c721 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 673bd671..1b97ad69 100644
--- a/src/graphics/render/ModelBatch.cpp
+++ b/src/graphics/render/ModelBatch.cpp
@@ -1,13 +1,13 @@
 #include "ModelBatch.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>
+#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 3ff26675..128bcaaa 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 af497396..420f0ec7 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 0d929b81..be737e1a 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 71b2faa0..b8eb5011 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 <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 "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 8dec44bd..40b74a4c 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 d54fd868..7910b1af 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 91b96a3b..b6a11232 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 <graphics/core/DrawContext.hpp>
-#include <graphics/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 26f3c3d9..21b7153f 100644
--- a/src/graphics/ui/elements/CheckBox.cpp
+++ b/src/graphics/ui/elements/CheckBox.cpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/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 77a01413..8d298769 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/Container.cpp
@@ -1,7 +1,7 @@
 #include "Container.hpp"
 
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/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 0002cab1..f922c9b6 100644
--- a/src/graphics/ui/elements/Image.cpp
+++ b/src/graphics/ui/elements/Image.cpp
@@ -2,12 +2,12 @@
 
 #include <utility>
 
-#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>
+#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 f740b015..322f570a 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 <graphics/core/DrawContext.hpp>
-#include <graphics/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 1b8ba5c7..1b759a57 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 <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 "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 7dd1b356..8afe7820 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 98a1a6c3..a0d356b3 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 <graphics/core/DrawContext.hpp>
-#include <graphics/core/Batch2D.hpp>
-#include <graphics/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 5a9e9b30..86e159bf 100644
--- a/src/graphics/ui/elements/Plotter.cpp
+++ b/src/graphics/ui/elements/Plotter.cpp
@@ -1,10 +1,10 @@
 #include "Plotter.hpp"
 
-#include <graphics/core/Batch2D.hpp>
-#include <graphics/core/Font.hpp>
-#include <graphics/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 17d7d922..5f070718 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 f41343fe..7d481048 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 <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>
+#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 8cf09c47..0a443876 100644
--- a/src/graphics/ui/elements/TrackBar.cpp
+++ b/src/graphics/ui/elements/TrackBar.cpp
@@ -2,9 +2,9 @@
 
 #include <utility>
 
-#include <graphics/core/DrawContext.hpp>
-#include <graphics/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 a2c99ca7..e85b4e80 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 5fe69741..85646480 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 <graphics/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 4a8be56d..3a2d3165 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 8f40a584..2045713a 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 31572f02..df16b36a 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 74cf906c..215be1ef 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 b49e5c07..6f0a9b4d 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 37853662..ffcbffc4 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 ebcdc7fa..9be4587c 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 7ae1bce9..d3af607d 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 3c2affa2..132570a8 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 cd719b83..34f20bba 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 111ba87f..25e03c0b 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 872fe022..539682c6 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 8ac8e47f..11b9b1dd 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 6a973aa4..932f4417 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 f880f5f6..ce642253 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 7c7d5c4a..1aa415bf 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 285d244e..df1e358d 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 ecc588ba..40003554 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 e47b5e5e..cb077b8b 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 36a7515f..c02792a9 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 cefd316a..570c1f46 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 83d351e6..25c1f088 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 66403c42..66d9f539 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 d65eb9cb..5b58237c 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 7e715caa..ffe5d22e 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 8a132ac4..afd13ab0 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 5d000a1e..b68b476e 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 8c82cd70..1badb0dc 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 499ba7f9..d567c374 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 f8b13395..9ef41a13 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 b9f6f782..bb58e448 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 041183ed..9c6295d2 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 8c6a3177..03214e6e 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 a0720539..af4cae48 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 b3eff98c..9f3e1c8e 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 3202bc1d..abaf1cbd 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 <logic/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 7a9547d3..2e1034a0 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 a4e14476..f952a83d 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 5325a6ef..c3b0298a 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 <logic/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 2066cb8c..5da4358d 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 690c37bb..460b1caf 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 55d3e073..91edca3e 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 dfe91952..bfa0af2d 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 1555ee38..bc5abd47 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 5e203fa8..fc66b6ff 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 ec9d1381..a0e394f5 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 108ac196..bc9bb204 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 fa0b7609..943e12da 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 a4eeb0ab..93708dda 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 bc3e8b4b..6aa2e1a7 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 0581f71a..ab87ee1c 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 64b6c1bb..f9fb859a 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 de7d641a..53a491d1 100644
--- a/src/logic/scripting/lua/lua_commons.hpp
+++ b/src/logic/scripting/lua/lua_commons.hpp
@@ -1,15 +1,15 @@
 #ifndef LOGIC_SCRIPTING_LUA_HPP_
 #define LOGIC_SCRIPTING_LUA_HPP_
 
-#include <delegates.hpp>
-#include <logic/scripting/scripting.hpp>
+#include "delegates.hpp"
+#include "logic/scripting/scripting.hpp"
 
 #ifdef __linux__
 #include <luajit-2.1/luaconf.h>
 
 #include <luajit-2.1/lua.hpp>
 #else
-#include <lua.hpp>
+#include <lua.hpp"
 #endif
 #include <glm/glm.hpp>
 #include <stdexcept>
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index 7ae59f10..01df4ea9 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 35112339..06311e3b 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 <logic/scripting/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 a1667e21..cb095e9f 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 25c51caa..a6b934aa 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 27c66535..05beaa32 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 45e6ecf9..64151fbf 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 9f7e294e..30c31b54 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 19da0fa7..c1f91cb8 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 540f08df..f48e42da 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 1b8e9ae2..ac27afa4 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 4c03fd61..3f9f8256 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/rays.cpp b/src/maths/rays.cpp
index d47850ee..d332b181 100644
--- a/src/maths/rays.cpp
+++ b/src/maths/rays.cpp
@@ -2,7 +2,7 @@
 #include "rays.hpp"
 
 #include "aabb.hpp"
-#include "glm/glm.hpp"
+#include <glm/glm.hpp>
 
 static const rayvec3 X_AXIS = rayvec3(1, 0, 0), Y_AXIS = rayvec3(0, 1, 0),
                      Z_AXIS = rayvec3(0, 0, 1);
diff --git a/src/maths/rays.hpp b/src/maths/rays.hpp
index 7d053267..b30814b8 100644
--- a/src/maths/rays.hpp
+++ b/src/maths/rays.hpp
@@ -2,11 +2,11 @@
 #define MATHS_RAYS_HPP_
 
 #include "aabb.hpp"
-#include "glm/glm.hpp"
+#include <glm/glm.hpp>
 #define GLM_ENABLE_EXPERIMENTAL
 #include <array>
 
-#include "glm/gtx/hash.hpp"
+#include <glm/gtx/hash.hpp>
 
 using rayvec3 = glm::highp_dvec3;
 using rayvec2 = glm::highp_dvec2;
diff --git a/src/maths/voxmaths.hpp b/src/maths/voxmaths.hpp
index bd11e79b..89474182 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 231cc685..cbb023cc 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 "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>
+#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 4ab157c3..a390b6b6 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 dfaced89..811c8def 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 b30f74ca..74fad257 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 "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>
+#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 61c8ae7f..5a85478f 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 2987a740..3f36daf3 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 0abf1fb1..ee7d7ff0 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 37db8d74..009a0426 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 f5e75269..f247522d 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 b50a751a..3580e4bc 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 486a3f2d..58fb2c07 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 cf7b0412..f5826fb9 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 7ae8af4f..40fe9839 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 13ead840..4ac3ee19 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 f64789a4..99501c12 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 9aa1248c..dfad3bb4 100644
--- a/src/util/data_io.hpp
+++ b/src/util/data_io.hpp
@@ -1,7 +1,7 @@
 #ifndef UTIL_DATA_IO_HPP_
 #define UTIL_DATA_IO_HPP_
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace dataio {
     /* Read big-endian 16 bit signed integer from bytes */
diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index 9f50d97d..b749718d 100644
--- a/src/util/platform.cpp
+++ b/src/util/platform.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <sstream>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #ifdef _WIN32
 #include <Windows.h>
diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp
index 04de47a8..69db71e8 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 b92d84d4..eeb6e63e 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 584f6214..c6a2ec7e 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 0586ac1c..aee744a1 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 feb7f5cf..8abf8578 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 5e35d61f..78932659 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 206542bc..f79e83e0 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 2725cc9b..5eba4f86 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 73fea7ab..c0940ff0 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 19989e52..5954a799 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 8b425350..10414802 100644
--- a/src/voxels/ChunksStorage.hpp
+++ b/src/voxels/ChunksStorage.hpp
@@ -4,11 +4,11 @@
 #include <memory>
 #include <unordered_map>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "voxel.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL
-#include "glm/gtx/hash.hpp"
+#include <glm/gtx/hash.hpp>
 
 class Chunk;
 class Level;
diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp
index ed76d0f2..dc5361e8 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 2e1070f9..47c5d401 100644
--- a/src/voxels/DefaultWorldGenerator.hpp
+++ b/src/voxels/DefaultWorldGenerator.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
 #define VOXELS_DEFAULTWORLDGENERATOR_HPP_
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "WorldGenerator.hpp"
 
 struct voxel;
diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp
index 61884fee..d97ab545 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 33b9edae..7e3e36a8 100644
--- a/src/voxels/FlatWorldGenerator.hpp
+++ b/src/voxels/FlatWorldGenerator.hpp
@@ -1,7 +1,7 @@
 #ifndef VOXELS_FLATWORLDGENERATOR_HPP_
 #define VOXELS_FLATWORLDGENERATOR_HPP_
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "WorldGenerator.hpp"
 
 struct voxel;
diff --git a/src/voxels/VoxelsVolume.hpp b/src/voxels/VoxelsVolume.hpp
index 8bf0016f..7109dd41 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 bb4af870..525a04ca 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 b404dd58..fa52ee53 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 9243dc89..fb6f4179 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 2cb13087..a88adcc5 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 aa5b64e5..61526178 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 984a23e8..3c66451c 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 e5214725..31a65a4a 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 e9150b3f..322e5caa 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 90e828a3..3c8e9dba 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 f7ea1e23..52f397d1 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 9139dc37..00017cc6 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 8945d494..e15837b8 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -4,17 +4,17 @@
 #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 "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"
 
diff --git a/src/world/World.hpp b/src/world/World.hpp
index e7e38a79..b6a00b50 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 caa0174b..c64ab756 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 49afce15..b100b708 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;