diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a726e648..579ee11b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
 file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 
-add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
+add_executable(${PROJECT_NAME} ${SOURCES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 if(VOXELENGINE_BUILD_APPDIR)
diff --git a/src/assets/Assets.hpp b/src/assets/Assets.hpp
index a3b689e7e..86d6fb22e 100644
--- a/src/assets/Assets.hpp
+++ b/src/assets/Assets.hpp
@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSETS_HPP_
-#define ASSETS_ASSETS_HPP_
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -11,7 +10,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <graphics/core/TextureAnimation.hpp>
+#include "graphics/core/TextureAnimation.hpp"
 
 class Assets;
 
@@ -113,5 +112,3 @@ void assetload::assets_setup(const Assets* assets) {
         }
     }
 }
-
-#endif  // ASSETS_ASSETS_HPP_
diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index d4b6d5ed5..9a570fc2e 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 38db983ba..1f30130d8 100644
--- a/src/assets/AssetsLoader.hpp
+++ b/src/assets/AssetsLoader.hpp
@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSETS_LOADER_HPP_
-#define ASSETS_ASSETS_LOADER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <functional>
@@ -9,9 +8,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 {
@@ -104,5 +103,3 @@ public:
         const std::vector<std::filesystem::path>& alternatives
     );
 };
-
-#endif  // ASSETS_ASSETS_LOADER_HPP_
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index e64687e50..97107862b 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/assets/assetload_funcs.hpp b/src/assets/assetload_funcs.hpp
index 6a88eabcf..3348edaa1 100644
--- a/src/assets/assetload_funcs.hpp
+++ b/src/assets/assetload_funcs.hpp
@@ -1,5 +1,4 @@
-#ifndef ASSETS_ASSET_LOADERS_HPP_
-#define ASSETS_ASSET_LOADERS_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -64,5 +63,3 @@ namespace assetload {
         const std::shared_ptr<AssetCfg>& settings
     );
 }
-
-#endif  // ASSETS_ASSET_LOADERS_HPP_
diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp
index a2f72c410..6843cba0f 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 4a3f0e55c..7e0f0c29d 100644
--- a/src/audio/AL/ALAudio.hpp
+++ b/src/audio/AL/ALAudio.hpp
@@ -1,5 +1,4 @@
-#ifndef SRC_AUDIO_AUDIO_HPP_
-#define SRC_AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <queue>
@@ -7,8 +6,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>
@@ -178,5 +177,3 @@ namespace audio {
         static std::unique_ptr<ALAudio> create();
     };
 }
-
-#endif  // SRC_AUDIO_AUDIO_HPP_
diff --git a/src/audio/AL/alutil.cpp b/src/audio/AL/alutil.cpp
index 7d59e7eaf..43391827e 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 26a11289f..bfa701184 100644
--- a/src/audio/AL/alutil.hpp
+++ b/src/audio/AL/alutil.hpp
@@ -1,11 +1,10 @@
-#ifndef AUDIO_AUDIOUTIL_HPP_
-#define AUDIO_AUDIOUTIL_HPP_
+#pragma once
 
 #include <cstdint>
 #include <string>
 #include <type_traits>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
@@ -83,5 +82,3 @@ namespace AL {
         }
     }
 }
-
-#endif  // AUDIO_AUDIOUTIL_HPP_
diff --git a/src/audio/NoAudio.hpp b/src/audio/NoAudio.hpp
index 848e322e0..edfc33199 100644
--- a/src/audio/NoAudio.hpp
+++ b/src/audio/NoAudio.hpp
@@ -1,5 +1,4 @@
-#ifndef AUDIO_NOAUDIO_HPP_
-#define AUDIO_NOAUDIO_HPP_
+#pragma once
 
 #include "audio.hpp"
 
@@ -91,5 +90,3 @@ namespace audio {
         static std::unique_ptr<NoAudio> create();
     };
 }
-
-#endif  // AUDIO_NOAUDIO_HPP_
diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 0b8f979a0..0dc0f591c 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 ab7313af1..a37ebeea5 100644
--- a/src/audio/audio.hpp
+++ b/src/audio/audio.hpp
@@ -1,12 +1,11 @@
-#ifndef AUDIO_AUDIO_HPP_
-#define AUDIO_AUDIO_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
 #include <memory>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -520,5 +519,3 @@ namespace audio {
     /// @brief Finalize audio system
     void close();
 };
-
-#endif  // AUDIO_AUDIO_HPP_
diff --git a/src/coders/GLSLExtension.cpp b/src/coders/GLSLExtension.cpp
index fafd13f99..186522a5f 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/GLSLExtension.hpp b/src/coders/GLSLExtension.hpp
index fdee2e3e4..6187d7d43 100644
--- a/src/coders/GLSLExtension.hpp
+++ b/src/coders/GLSLExtension.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_GLSL_EXTESION_HPP_
-#define CODERS_GLSL_EXTESION_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
@@ -35,5 +34,3 @@ public:
         bool header = false
     );
 };
-
-#endif  // CODERS_GLSL_EXTESION_HPP_
diff --git a/src/coders/binary_json.cpp b/src/coders/binary_json.cpp
index 0603328a6..9b8bac222 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 9bcdf04e8..1a7d9330d 100644
--- a/src/coders/binary_json.hpp
+++ b/src/coders/binary_json.hpp
@@ -1,10 +1,9 @@
-#ifndef CODERS_BINARY_JSON_HPP_
-#define CODERS_BINARY_JSON_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
 
-#include <data/dynamic_fwd.hpp>
+#include "data/dynamic_fwd.hpp"
 
 namespace dynamic {
     class Map;
@@ -34,5 +33,3 @@ namespace json {
     );
     std::shared_ptr<dynamic::Map> from_binary(const ubyte* src, size_t size);
 }
-
-#endif  // CODERS_BINARY_JSON_HPP_
diff --git a/src/coders/byte_utils.hpp b/src/coders/byte_utils.hpp
index 326bcdb1e..20c5d1502 100644
--- a/src/coders/byte_utils.hpp
+++ b/src/coders/byte_utils.hpp
@@ -1,10 +1,9 @@
-#ifndef CODERS_BYTE_UTILS_HPP_
-#define CODERS_BYTE_UTILS_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 /* byteorder: little-endian */
 class ByteBuilder {
@@ -79,5 +78,3 @@ public:
     const ubyte* pointer() const;
     void skip(size_t n);
 };
-
-#endif  // CODERS_BYTE_UTILS_HPP_
diff --git a/src/coders/commons.cpp b/src/coders/commons.cpp
index 5da5659eb..a6406e4d0 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 6a16b7d4c..77c8cbf54 100644
--- a/src/coders/commons.hpp
+++ b/src/coders/commons.hpp
@@ -1,11 +1,10 @@
-#ifndef CODERS_COMMONS_HPP_
-#define CODERS_COMMONS_HPP_
+#pragma once
 
 #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) {
@@ -108,5 +107,3 @@ public:
 
     BasicParser(std::string_view file, std::string_view source);
 };
-
-#endif  // CODERS_COMMONS_HPP_
diff --git a/src/coders/gzip.hpp b/src/coders/gzip.hpp
index 87184acbe..f18b1c14b 100644
--- a/src/coders/gzip.hpp
+++ b/src/coders/gzip.hpp
@@ -1,9 +1,8 @@
-#ifndef CODERS_GZIP_HPP_
-#define CODERS_GZIP_HPP_
+#pragma once
 
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace gzip {
     const unsigned char MAGIC[] = "\x1F\x8B";
@@ -18,5 +17,3 @@ namespace gzip {
      @param size length of GZIP data */
     std::vector<ubyte> decompress(const ubyte* src, size_t size);
 }
-
-#endif  // CODERS_GZIP_HPP_
diff --git a/src/coders/imageio.cpp b/src/coders/imageio.cpp
index 90d34beec..f13e13cb7 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/imageio.hpp b/src/coders/imageio.hpp
index c5481beaf..24554b3fc 100644
--- a/src/coders/imageio.hpp
+++ b/src/coders/imageio.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_IMAGEIO_HPP_
-#define CODERS_IMAGEIO_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -15,5 +14,3 @@ namespace imageio {
     std::unique_ptr<ImageData> read(const std::string& filename);
     void write(const std::string& filename, const ImageData* image);
 }
-
-#endif  // CODERS_IMAGEIO_HPP_
diff --git a/src/coders/json.cpp b/src/coders/json.cpp
index 77cce7104..ac18eb3cb 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 8254eeb55..ef48ac37d 100644
--- a/src/coders/json.hpp
+++ b/src/coders/json.hpp
@@ -1,10 +1,9 @@
-#ifndef CODERS_JSON_HPP_
-#define CODERS_JSON_HPP_
+#pragma once
 
 #include <string>
 
-#include <data/dynamic.hpp>
-#include <typedefs.hpp>
+#include "data/dynamic.hpp"
+#include "typedefs.hpp"
 #include "binary_json.hpp"
 
 namespace json {
@@ -19,5 +18,3 @@ namespace json {
         const dynamic::Value& value, bool nice, const std::string& indent
     );
 }
-
-#endif  // CODERS_JSON_HPP_
diff --git a/src/coders/obj.cpp b/src/coders/obj.cpp
index 0e0b29dc9..b69ff3428 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/obj.hpp b/src/coders/obj.hpp
index 786414e82..552d0ba66 100644
--- a/src/coders/obj.hpp
+++ b/src/coders/obj.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_OBJ_HPP_
-#define CODERS_OBJ_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -15,5 +14,3 @@ namespace obj {
         const std::string_view file, const std::string_view src
     );
 }
-
-#endif  // CODERS_OBJ_HPP_
diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp
index 123b6979a..df5f98263 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/ogg.hpp b/src/coders/ogg.hpp
index 29c3da606..67ea24581 100644
--- a/src/coders/ogg.hpp
+++ b/src/coders/ogg.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_OGG_HPP_
-#define CODERS_OGG_HPP_
+#pragma once
 
 #include <filesystem>
 
@@ -16,5 +15,3 @@ namespace ogg {
         const std::filesystem::path& file
     );
 }
-
-#endif  // CODERS_OGG_HPP_
diff --git a/src/coders/png.cpp b/src/coders/png.cpp
index 14f5c8010..76f4a7b20 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/png.hpp b/src/coders/png.hpp
index a092e15b4..871c03ad7 100644
--- a/src/coders/png.hpp
+++ b/src/coders/png.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_PNG_HPP_
-#define CODERS_PNG_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
@@ -12,5 +11,3 @@ namespace png {
     void write_image(const std::string& filename, const ImageData* image);
     std::unique_ptr<Texture> load_texture(const std::string& filename);
 }
-
-#endif  // CODERS_PNG_HPP_
diff --git a/src/coders/rle.hpp b/src/coders/rle.hpp
index a2e45a859..0692cc9a8 100644
--- a/src/coders/rle.hpp
+++ b/src/coders/rle.hpp
@@ -1,7 +1,6 @@
-#ifndef CODERS_RLE_HPP_
-#define CODERS_RLE_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace rle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);
@@ -13,5 +12,3 @@ namespace extrle {
     size_t encode(const ubyte* src, size_t length, ubyte* dst);
     size_t decode(const ubyte* src, size_t length, ubyte* dst);
 }
-
-#endif  // CODERS_RLE_HPP_
diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp
index dc5624cda..63e130257 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 032e1cf63..669e22791 100644
--- a/src/coders/toml.hpp
+++ b/src/coders/toml.hpp
@@ -1,9 +1,8 @@
-#ifndef CODERS_TOML_HPP_
-#define CODERS_TOML_HPP_
+#pragma once
 
 #include <string>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 
 class SettingsHandler;
 
@@ -16,5 +15,3 @@ namespace toml {
         SettingsHandler& handler, std::string_view file, std::string_view source
     );
 }
-
-#endif  // CODERS_TOML_HPP_
diff --git a/src/coders/wav.cpp b/src/coders/wav.cpp
index 28a94bda0..6ba337fdc 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/wav.hpp b/src/coders/wav.hpp
index 7ea8bf59a..5f5270c25 100644
--- a/src/coders/wav.hpp
+++ b/src/coders/wav.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_WAV_HPP_
-#define CODERS_WAV_HPP_
+#pragma once
 
 #include <filesystem>
 
@@ -16,5 +15,3 @@ namespace wav {
         const std::filesystem::path& file
     );
 }
-
-#endif  // CODERS_WAV_HPP_
diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index 647ad4b66..6a8777c5e 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/coders/xml.hpp b/src/coders/xml.hpp
index 72fdb5634..136c60dfb 100644
--- a/src/coders/xml.hpp
+++ b/src/coders/xml.hpp
@@ -1,5 +1,4 @@
-#ifndef CODERS_XML_HPP_
-#define CODERS_XML_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
@@ -144,5 +143,3 @@ namespace xml {
         const std::string& filename, const std::string& source
     );
 }
-
-#endif  // CODERS_XML_HPP_
diff --git a/src/constants.hpp b/src/constants.hpp
index 5189a359b..15b3e7327 100644
--- a/src/constants.hpp
+++ b/src/constants.hpp
@@ -1,7 +1,6 @@
-#ifndef CONSTANTS_HPP_
-#define CONSTANTS_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <limits>
 #include <string>
@@ -52,5 +51,3 @@ inline const std::string LAYOUTS_FOLDER = "layouts";
 inline const std::string SOUNDS_FOLDER = "sounds";
 inline const std::string MODELS_FOLDER = "models";
 inline const std::string SKELETONS_FOLDER = "skeletons";
-
-#endif // CONSTANTS_HPP_
diff --git a/src/content/Content.cpp b/src/content/Content.cpp
index 3f3cf32eb..677258ade 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 e8e8a2d70..4178b7d85 100644
--- a/src/content/Content.hpp
+++ b/src/content/Content.hpp
@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_HPP_
-#define CONTENT_CONTENT_HPP_
+#pragma once
 
 #include <memory>
 #include <optional>
@@ -9,7 +8,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>;
@@ -230,5 +229,3 @@ public:
     const UptrsMap<std::string, ContentPackRuntime>& getPacks() const;
     const UptrsMap<std::string, rigging::SkeletonConfig>& getSkeletons() const;
 };
-
-#endif  // CONTENT_CONTENT_HPP_
diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp
index f68af5d3f..4bf194bcb 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 f27bd8f8a..9207316cf 100644
--- a/src/content/ContentBuilder.hpp
+++ b/src/content/ContentBuilder.hpp
@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_BUILDER_HPP_
-#define CONTENT_CONTENT_BUILDER_HPP_
+#pragma once
 
 #include <memory>
 #include <unordered_map>
@@ -7,9 +6,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 {
@@ -71,5 +70,3 @@ public:
 
     std::unique_ptr<Content> build();
 };
-
-#endif  // CONTENT_CONTENT_BUILDER_HPP_
diff --git a/src/content/ContentLUT.cpp b/src/content/ContentLUT.cpp
index c1c4c9602..490fbbb41 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 12723073c..972a77cf4 100644
--- a/src/content/ContentLUT.hpp
+++ b/src/content/ContentLUT.hpp
@@ -1,14 +1,13 @@
-#ifndef CONTENT_CONTENT_LUT_HPP_
-#define CONTENT_CONTENT_LUT_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
 #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;
@@ -113,5 +112,3 @@ public:
 
     std::vector<contententry> getMissingContent() const;
 };
-
-#endif  // CONTENT_CONTENT_LUT_HPP_
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 67f1965ec..26e8f5f03 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/ContentLoader.hpp b/src/content/ContentLoader.hpp
index df3459e0c..0673a96df 100644
--- a/src/content/ContentLoader.hpp
+++ b/src/content/ContentLoader.hpp
@@ -1,5 +1,4 @@
-#ifndef CONTENT_CONTENT_LOADER_HPP_
-#define CONTENT_CONTENT_LOADER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <memory>
@@ -64,5 +63,3 @@ public:
     void fixPackIndices();
     void load();
 };
-
-#endif  // CONTENT_CONTENT_LOADER_HPP_
diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp
index 0a81970ef..90e4b73ad 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 ff8555f2d..70b344725 100644
--- a/src/content/ContentPack.hpp
+++ b/src/content/ContentPack.hpp
@@ -1,12 +1,11 @@
-#ifndef CONTENT_CONTENT_PACK_HPP_
-#define CONTENT_CONTENT_PACK_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class EnginePaths;
 
@@ -115,5 +114,3 @@ public:
         return env;
     }
 };
-
-#endif  // CONTENT_CONTENT_PACK_HPP_
diff --git a/src/content/PacksManager.cpp b/src/content/PacksManager.cpp
index 5934feb3e..370bed989 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/PacksManager.hpp b/src/content/PacksManager.hpp
index f8c584d32..3784bbfbc 100644
--- a/src/content/PacksManager.hpp
+++ b/src/content/PacksManager.hpp
@@ -1,5 +1,4 @@
-#ifndef CONTENT_PACKS_MANAGER_HPP_
-#define CONTENT_PACKS_MANAGER_HPP_
+#pragma once
 
 #include <filesystem>
 #include <unordered_map>
@@ -47,5 +46,3 @@ public:
         const std::vector<ContentPack>& packs
     );
 };
-
-#endif  // CONTENT_PACKS_MANAGER_HPP_
diff --git a/src/content/content_fwd.hpp b/src/content/content_fwd.hpp
index 377b4d4d4..719fbfca5 100644
--- a/src/content/content_fwd.hpp
+++ b/src/content/content_fwd.hpp
@@ -1,7 +1,6 @@
-#ifndef CONTENT_CONTENT_FWD_HPP_
-#define CONTENT_CONTENT_FWD_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Content;
 class ContentPackRuntime;
@@ -12,5 +11,3 @@ enum class ResourceType : size_t { CAMERA, LAST = CAMERA };
 
 inline constexpr auto RESOURCE_TYPES_COUNT =
     static_cast<size_t>(ResourceType::LAST) + 1;
-
-#endif  // CONTENT_CONTENT_FWD_HPP_
diff --git a/src/core_defs.cpp b/src/core_defs.cpp
index 1c00d0c7b..cf8dc1f40 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/core_defs.hpp b/src/core_defs.hpp
index d57435ad5..32b2424c7 100644
--- a/src/core_defs.hpp
+++ b/src/core_defs.hpp
@@ -1,5 +1,4 @@
-#ifndef CORE_DEFS_HPP_
-#define CORE_DEFS_HPP_
+#pragma once
 
 #include <string>
 
@@ -34,5 +33,3 @@ class ContentBuilder;
 namespace corecontent {
     void setup(EnginePaths* paths, ContentBuilder* builder);
 }
-
-#endif // CORE_DEFS_HPP_
diff --git a/src/data/dynamic.cpp b/src/data/dynamic.cpp
index 792f1932a..f0d60bf13 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.hpp b/src/data/dynamic.hpp
index 5b52064b9..65320fbb3 100644
--- a/src/data/dynamic.hpp
+++ b/src/data/dynamic.hpp
@@ -1,5 +1,4 @@
-#ifndef DATA_DYNAMIC_HPP_
-#define DATA_DYNAMIC_HPP_
+#pragma once
 
 #include <cmath>
 #include <memory>
@@ -163,5 +162,3 @@ namespace dynamic {
 std::ostream& operator<<(std::ostream& stream, const dynamic::Value& value);
 std::ostream& operator<<(std::ostream& stream, const dynamic::Map_sptr& value);
 std::ostream& operator<<(std::ostream& stream, const dynamic::List_sptr& value);
-
-#endif  // DATA_DYNAMIC_HPP_
diff --git a/src/data/dynamic_fwd.hpp b/src/data/dynamic_fwd.hpp
index 154d4d706..148e244be 100644
--- a/src/data/dynamic_fwd.hpp
+++ b/src/data/dynamic_fwd.hpp
@@ -1,12 +1,11 @@
-#ifndef DATA_DYNAMIC_FWD_HPP_
-#define DATA_DYNAMIC_FWD_HPP_
+#pragma once
 
 #include <functional>
 #include <memory>
 #include <string>
 #include <variant>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace dynamic {
     class Map;
@@ -30,5 +29,3 @@ namespace dynamic {
 
     using to_string_func = std::function<std::string(const Value&)>;
 }
-
-#endif  // DATA_DYNAMIC_FWD_HPP_
diff --git a/src/data/dynamic_util.hpp b/src/data/dynamic_util.hpp
index c7808f706..81ba5be0a 100644
--- a/src/data/dynamic_util.hpp
+++ b/src/data/dynamic_util.hpp
@@ -1,5 +1,4 @@
-#ifndef DATA_DYNAMIC_UTIL_HPP_
-#define DATA_DYNAMIC_UTIL_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 
@@ -78,5 +77,3 @@ namespace dynamic {
         }
     }
 }
-
-#endif  // DATA_DYNAMIC_UTIL_HPP_
diff --git a/src/data/setting.cpp b/src/data/setting.cpp
index 397caf245..2f39be948 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 73378459c..2053254a8 100644
--- a/src/data/setting.hpp
+++ b/src/data/setting.hpp
@@ -1,13 +1,12 @@
-#ifndef DATA_SETTING_HPP_
-#define DATA_SETTING_HPP_
+#pragma once
 
 #include <limits>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <delegates.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "typedefs.hpp"
 
 enum class setting_format { simple, percent };
 
@@ -174,5 +173,3 @@ public:
 
     virtual std::string toString() const override;
 };
-
-#endif  // DATA_SETTING_HPP_
diff --git a/src/debug/Logger.hpp b/src/debug/Logger.hpp
index eb5b3c4ee..6b931fe0a 100644
--- a/src/debug/Logger.hpp
+++ b/src/debug/Logger.hpp
@@ -1,5 +1,4 @@
-#ifndef DEBUG_LOGGER_HPP_
-#define DEBUG_LOGGER_HPP_
+#pragma once
 
 #include <fstream>
 #include <mutex>
@@ -63,5 +62,3 @@ namespace debug {
         }
     };
 }
-
-#endif  // DEBUG_LOGGER_HPP_
diff --git a/src/delegates.hpp b/src/delegates.hpp
index fe1c95e60..324921643 100644
--- a/src/delegates.hpp
+++ b/src/delegates.hpp
@@ -1,5 +1,4 @@
-#ifndef DELEGATES_HPP_
-#define DELEGATES_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <functional>
@@ -21,5 +20,3 @@ using doubleconsumer = std::function<void(double)>;
 using boolconsumer = std::function<void(bool)>;
 using int_array_consumer = std::function<void(const int[], size_t)>;
 using wstringchecker = std::function<bool(const std::wstring&)>;
-
-#endif // DELEGATES_HPP_
diff --git a/src/engine.cpp b/src/engine.cpp
index b00294edc..17bb2b8b2 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 b90076994..de25c2201 100644
--- a/src/engine.hpp
+++ b/src/engine.hpp
@@ -1,15 +1,14 @@
-#ifndef ENGINE_HPP_
-#define ENGINE_HPP_
+#pragma once
 
-#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>
@@ -148,5 +147,3 @@ public:
 
     SettingsHandler& getSettingsHandler();
 };
-
-#endif // ENGINE_HPP_
diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp
index da0f625ea..637e38909 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 5b9f13fa5..20d7c3269 100644
--- a/src/files/WorldConverter.hpp
+++ b/src/files/WorldConverter.hpp
@@ -1,13 +1,12 @@
-#ifndef FILES_WORLD_CONVERTER_HPP_
-#define FILES_WORLD_CONVERTER_HPP_
+#pragma once
 
 #include <filesystem>
 #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;
 
@@ -61,4 +60,3 @@ public:
     );
 };
 
-#endif  // FILES_WORLD_CONVERTER_HPP_
diff --git a/src/files/WorldFiles.cpp b/src/files/WorldFiles.cpp
index 68f3b56fe..b85e34bf8 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 2ba543b89..311a5feb0 100644
--- a/src/files/WorldFiles.hpp
+++ b/src/files/WorldFiles.hpp
@@ -1,5 +1,4 @@
-#ifndef FILES_WORLD_FILES_HPP_
-#define FILES_WORLD_FILES_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
@@ -7,13 +6,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;
 
@@ -72,5 +71,3 @@ public:
         return doWriteLights;
     }
 };
-
-#endif  // FILES_WORLD_FILES_HPP_
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index c7d54edc1..854be0bef 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 11e32980c..e346dddcb 100644
--- a/src/files/WorldRegions.hpp
+++ b/src/files/WorldRegions.hpp
@@ -1,5 +1,4 @@
-#ifndef FILES_WORLD_REGIONS_HPP_
-#define FILES_WORLD_REGIONS_HPP_
+#pragma once
 
 #include <condition_variable>
 #include <filesystem>
@@ -9,13 +8,14 @@
 #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;
 
@@ -213,5 +213,3 @@ public:
     /// @return false if std::invalid_argument or std::out_of_range occurred
     static bool parseRegionFilename(const std::string& name, int& x, int& y);
 };
-
-#endif  // FILES_WORLD_REGIONS_HPP_
diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp
index da74ef82c..759d277e3 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 a32e7fadf..ab9667913 100644
--- a/src/files/engine_paths.hpp
+++ b/src/files/engine_paths.hpp
@@ -1,12 +1,11 @@
-#ifndef FILES_ENGINE_PATHS_HPP_
-#define FILES_ENGINE_PATHS_HPP_
+#pragma once
 
 #include <filesystem>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include <content/ContentPack.hpp>
+#include "content/ContentPack.hpp"
 
 
 class files_access_error : public std::runtime_error {
@@ -68,5 +67,3 @@ private:
     std::filesystem::path mainRoot;
     std::vector<PathsRoot> roots;
 };
-
-#endif  // FILES_ENGINE_PATHS_HPP_
diff --git a/src/files/files.cpp b/src/files/files.cpp
index cf36a635f..e0e52297b 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 5557b0f27..abcbdbb40 100644
--- a/src/files/files.hpp
+++ b/src/files/files.hpp
@@ -1,5 +1,4 @@
-#ifndef FILES_FILES_HPP_
-#define FILES_FILES_HPP_
+#pragma once
 
 #include <filesystem>
 #include <fstream>
@@ -7,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -71,5 +70,3 @@ namespace files {
     std::shared_ptr<dynamic::Map> read_toml(const fs::path& file);
     std::vector<std::string> read_list(const fs::path& file);
 }
-
-#endif /* FILES_FILES_HPP_ */
diff --git a/src/files/settings_io.cpp b/src/files/settings_io.cpp
index c9a7668ba..b9993f15b 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 1bb84d32d..00d3eb765 100644
--- a/src/files/settings_io.hpp
+++ b/src/files/settings_io.hpp
@@ -1,12 +1,11 @@
-#ifndef FILES_SETTINGS_IO_HPP_
-#define FILES_SETTINGS_IO_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 
 class Setting;
 struct EngineSettings;
@@ -30,5 +29,3 @@ public:
 
     std::vector<Section>& getSections();
 };
-
-#endif  // FILES_SETTINGS_IO_HPP_
diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp
index c8bff2983..f45259e17 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 213e38c16..8d92d1a35 100644
--- a/src/frontend/ContentGfxCache.hpp
+++ b/src/frontend/ContentGfxCache.hpp
@@ -1,7 +1,6 @@
-#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
-#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <memory>
 
@@ -23,5 +22,3 @@ public:
     
     const Content* getContent() const;
 };
-
-#endif // FRONTEND_BLOCKS_GFX_CACHE_HPP_
diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp
index 281798d1a..68f308c86 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/LevelFrontend.hpp b/src/frontend/LevelFrontend.hpp
index 0a57e7c7f..ed149598b 100644
--- a/src/frontend/LevelFrontend.hpp
+++ b/src/frontend/LevelFrontend.hpp
@@ -1,5 +1,4 @@
-#ifndef FRONTEND_LEVEL_FRONTEND_HPP_
-#define FRONTEND_LEVEL_FRONTEND_HPP_
+#pragma once
 
 #include <memory>
 
@@ -23,5 +22,3 @@ public:
     ContentGfxCache* getContentGfxCache() const;
     LevelController* getController() const;
 };
-
-#endif // FRONTEND_LEVEL_FRONTEND_HPP_
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index 06e6029ce..e218d975d 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 6a9840b36..dcd2a34ee 100644
--- a/src/frontend/UiDocument.hpp
+++ b/src/frontend/UiDocument.hpp
@@ -1,7 +1,6 @@
-#ifndef FRONTEND_UI_DOCUMENT_HPP_
-#define FRONTEND_UI_DOCUMENT_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <string>
 #include <memory>
@@ -49,5 +48,3 @@ public:
     static std::unique_ptr<UiDocument> read(const scriptenv& parent_env, const std::string& name, const fs::path& file);
     static std::shared_ptr<gui::UINode> readElement(const fs::path& file);
 };
-
-#endif // FRONTEND_UI_DOCUMENT_HPP_
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 2e4818321..4b01e32fe 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 fccebf003..178563ac1 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 a47303d1a..26d0d9d3a 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -1,8 +1,7 @@
-#ifndef FRONTEND_HUD_HPP_
-#define FRONTEND_HUD_HPP_
+#pragma once
 
-#include <typedefs.hpp>
-#include <util/ObjectsKeeper.hpp>
+#include "typedefs.hpp"
+#include "util/ObjectsKeeper.hpp"
 
 #include <string>
 #include <memory>
@@ -169,5 +168,3 @@ public:
 
     std::shared_ptr<Inventory> getBlockInventory();
 };
-
-#endif // FRONTEND_HUD_HPP_
diff --git a/src/frontend/locale.cpp b/src/frontend/locale.cpp
index fd562ffe5..1ce866b28 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/locale.hpp b/src/frontend/locale.hpp
index e22097883..b3e200c92 100644
--- a/src/frontend/locale.hpp
+++ b/src/frontend/locale.hpp
@@ -1,5 +1,4 @@
-#ifndef FRONTEND_LOCALES_HPP_
-#define FRONTEND_LOCALES_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -68,5 +67,3 @@ namespace langs {
                       std::string locale,
                       const std::vector<ContentPack>& packs);
 }
-
-#endif // FRONTEND_LOCALES_HPP_
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 88bc2c0d8..9769a2b5d 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 8c9afafed..f4e70db27 100644
--- a/src/frontend/menu.hpp
+++ b/src/frontend/menu.hpp
@@ -1,8 +1,7 @@
-#ifndef FRONTEND_MENU_MENU_HPP_
-#define FRONTEND_MENU_MENU_HPP_
+#pragma once
 
-#include <data/dynamic.hpp>
-#include <graphics/ui/elements/Menu.hpp>
+#include "data/dynamic.hpp"
+#include "graphics/ui/elements/Menu.hpp"
 
 #include <string>
 #include <vector>
@@ -29,5 +28,3 @@ namespace menus {
 
     bool call(Engine* engine, runnable func);
 }
-
-#endif // FRONTEND_MENU_MENU_HPP_
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index 21eb88551..bf452c20c 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/LevelScreen.hpp b/src/frontend/screens/LevelScreen.hpp
index 2da4cbec6..d2fe1a58a 100644
--- a/src/frontend/screens/LevelScreen.hpp
+++ b/src/frontend/screens/LevelScreen.hpp
@@ -1,5 +1,4 @@
-#ifndef FRONTEND_SCREENS_LEVEL_SCREEN_HPP_
-#define FRONTEND_SCREENS_LEVEL_SCREEN_HPP_
+#pragma once
 
 #include "Screen.hpp"
 
@@ -40,5 +39,3 @@ public:
 
     LevelController* getLevelController() const;
 };
-
-#endif // FRONTEND_SCREENS_LEVEL_SCREEN_HPP_
diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp
index 5e96500f0..305b42eda 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/MenuScreen.hpp b/src/frontend/screens/MenuScreen.hpp
index b8e097ba4..fa6de8ba3 100644
--- a/src/frontend/screens/MenuScreen.hpp
+++ b/src/frontend/screens/MenuScreen.hpp
@@ -1,5 +1,4 @@
-#ifndef FRONTEND_SCREENS_MENU_SCREEN_HPP_
-#define FRONTEND_SCREENS_MENU_SCREEN_HPP_
+#pragma once
 
 #include "Screen.hpp"
 
@@ -17,6 +16,3 @@ public:
     void update(float delta) override;
     void draw(float delta) override;
 };
-
-
-#endif // FRONTEND_SCREENS_MENU_SCREEN_HPP_
diff --git a/src/frontend/screens/Screen.cpp b/src/frontend/screens/Screen.cpp
index a167b98ad..2c1c998aa 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 4e6f31204..28a49a063 100644
--- a/src/frontend/screens/Screen.hpp
+++ b/src/frontend/screens/Screen.hpp
@@ -1,7 +1,6 @@
-#ifndef FRONTEND_SCREENS_SCREEN_HPP_
-#define FRONTEND_SCREENS_SCREEN_HPP_
+#pragma once
 
-#include <util/ObjectsKeeper.hpp>
+#include "util/ObjectsKeeper.hpp"
 
 class Engine;
 class Batch2D;
@@ -18,5 +17,3 @@ public:
     virtual void draw(float delta) = 0;
     virtual void onEngineShutdown() {};
 };
-
-#endif // FRONTEND_SCREENS_SCREEN_HPP_
diff --git a/src/graphics/core/Atlas.cpp b/src/graphics/core/Atlas.cpp
index 00f1f5893..039db4d28 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 2542c771e..2e563e8a2 100644
--- a/src/graphics/core/Atlas.hpp
+++ b/src/graphics/core/Atlas.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_ATLAS_HPP_
-#define GRAPHICS_CORE_ATLAS_HPP_
+#pragma once
 
 #include <set>
 #include <string>
@@ -7,8 +6,9 @@
 #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;
@@ -59,5 +59,3 @@ public:
     /// @param maxResolution max atlas resolution
     std::unique_ptr<Atlas> build(uint extrusion, bool prepare=true, uint maxResolution=0);
 };
-
-#endif // GRAPHICS_CORE_ATLAS_HPP_
diff --git a/src/graphics/core/Batch2D.cpp b/src/graphics/core/Batch2D.cpp
index e93f1e5a5..d9cc0ec2c 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 fbad12606..4e38ffe59 100644
--- a/src/graphics/core/Batch2D.hpp
+++ b/src/graphics/core/Batch2D.hpp
@@ -1,12 +1,11 @@
-#ifndef GRAPHICS_CORE_BATCH2D_HPP_
-#define GRAPHICS_CORE_BATCH2D_HPP_
+#pragma once
 
 #include <memory>
 #include <stdlib.h>
 #include <glm/glm.hpp>
 
 #include "commons.hpp"
-#include <maths/UVRegion.hpp>
+#include "maths/UVRegion.hpp"
 
 class Mesh;
 class Texture;
@@ -93,5 +92,3 @@ public:
 
     void lineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_BATCH2D_HPP_
diff --git a/src/graphics/core/Batch3D.cpp b/src/graphics/core/Batch3D.cpp
index 94fe9ac40..82bc3bc32 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 5d05c4602..f53b0a0c4 100644
--- a/src/graphics/core/Batch3D.hpp
+++ b/src/graphics/core/Batch3D.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_CORE_BATCH3D_HPP_
-#define GRAPHICS_CORE_BATCH3D_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "commons.hpp"
 
 #include <memory>
@@ -58,5 +57,3 @@ public:
     void flush() override;
     void flushPoints();
 };
-
-#endif // GRAPHICS_CORE_BATCH3D_HPP_
diff --git a/src/graphics/core/Cubemap.hpp b/src/graphics/core/Cubemap.hpp
index 7ff5913c0..72d29a21b 100644
--- a/src/graphics/core/Cubemap.hpp
+++ b/src/graphics/core/Cubemap.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_CUBEMAP_HPP_
-#define GRAPHICS_CORE_CUBEMAP_HPP_
+#pragma once
 
 #include "GLTexture.hpp"
 
@@ -11,5 +10,3 @@ public:
     virtual void bind() override;
     virtual void unbind() override;
 };
-
-#endif // GRAPHICS_CORE_CUBEMAP_HPP_
diff --git a/src/graphics/core/DrawContext.cpp b/src/graphics/core/DrawContext.cpp
index b8bb589f0..29afae2ef 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 ac816d139..9174be1b8 100644
--- a/src/graphics/core/DrawContext.hpp
+++ b/src/graphics/core/DrawContext.hpp
@@ -1,9 +1,8 @@
-#ifndef GRAPHICS_CORE_GFX_CONTEXT_HPP_
-#define GRAPHICS_CORE_GFX_CONTEXT_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "Viewport.hpp"
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Batch2D;
 class Framebuffer;
@@ -38,5 +37,3 @@ public:
     void setScissors(glm::vec4 area);
     void setLineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_GFX_CONTEXT_HPP_
diff --git a/src/graphics/core/Font.hpp b/src/graphics/core/Font.hpp
index d2dd7e695..ecda77a50 100644
--- a/src/graphics/core/Font.hpp
+++ b/src/graphics/core/Font.hpp
@@ -1,10 +1,9 @@
-#ifndef GRAPHICS_CORE_FONT_HPP_
-#define GRAPHICS_CORE_FONT_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Texture;
 class Batch2D;
@@ -46,5 +45,3 @@ public:
     void draw(Batch2D* batch, const std::wstring& text, int x, int y, FontStyle style);
     void draw(Batch2D* batch, std::wstring_view text, int x, int y, FontStyle style);
 };
-
-#endif // GRAPHICS_CORE_FONT_HPP_
diff --git a/src/graphics/core/Framebuffer.hpp b/src/graphics/core/Framebuffer.hpp
index ddb96316f..795ca2c47 100644
--- a/src/graphics/core/Framebuffer.hpp
+++ b/src/graphics/core/Framebuffer.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_CORE_FRAMEBUFFER_HPP_
-#define GRAPHICS_CORE_FRAMEBUFFER_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <memory>
 
@@ -38,5 +37,3 @@ public:
     /// @brief Get framebuffer height
     uint getHeight() const;
 };
-
-#endif // GRAPHICS_CORE_FRAMEBUFFER_HPP_
diff --git a/src/graphics/core/GLTexture.hpp b/src/graphics/core/GLTexture.hpp
index 8274c2021..10e002e9c 100644
--- a/src/graphics/core/GLTexture.hpp
+++ b/src/graphics/core/GLTexture.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_GLTEXTURE_HPP_
-#define GRAPHICS_CORE_GLTEXTURE_HPP_
+#pragma once
 
 #include "Texture.hpp"
 
@@ -26,5 +25,3 @@ public:
 
     static std::unique_ptr<GLTexture> from(const ImageData* image);
 };
-
-#endif // GRAPHICS_CORE_GLTEXTURE_HPP_
diff --git a/src/graphics/core/ImageData.cpp b/src/graphics/core/ImageData.cpp
index ee40bafc9..ccf9f908e 100644
--- a/src/graphics/core/ImageData.cpp
+++ b/src/graphics/core/ImageData.cpp
@@ -3,14 +3,7 @@
 #include <assert.h>
 #include <stdexcept>
 #include <cstring>
-
-inline int min(int a, int b) {
-    return (a < b) ? a : b;
-}
-
-inline int max(int a, int b) {
-    return (a > b) ? a : b;
-}
+#include <algorithm>
 
 ImageData::ImageData(ImageFormat format, uint width, uint height) 
     : format(format), width(width), height(height) {
@@ -49,10 +42,11 @@ void ImageData::flipX() {
         case ImageFormat::rgba8888: {
             uint size = (format == ImageFormat::rgba8888) ? 4 : 3;
             for (uint y = 0; y < height; y++) {
-                for (uint x = 0; x < width/2; x++) {
+                for (uint x = 0; x < width / 2; x++) {
                     for (uint c = 0; c < size; c++) {
                         ubyte temp = data[(y * width + x) * size + c];
-                        data[(y * width + x) * size + c] = data[(y * width + (width - x - 1)) * size + c];
+                        data[(y * width + x) * size + c] =
+                            data[(y * width + (width - x - 1)) * size + c];
                         data[(y * width + (width - x - 1)) * size + c] = temp;
                     }
                 }
@@ -104,8 +98,12 @@ void ImageData::blitRGB_on_RGBA(const ImageData* image, int x, int y) {
     uint srcwidth = image->getWidth();
     uint srcheight = image->getHeight();
 
-    for (uint srcy = max(0, -y); (int)srcy < min(srcheight, height-y); srcy++) {
-        for (uint srcx = max(0, -x); (int)srcx < min(srcwidth, width-x); srcx++) {
+    for (uint srcy = std::max(0, -y);
+         srcy < std::min(srcheight, height - y);
+         srcy++) {
+        for (uint srcx = std::max(0, -x);
+             srcx < std::min(srcwidth, width - x);
+             srcx++) {
             uint dstx = srcx + x;
             uint dsty = srcy + y;
             uint dstidx = (dsty * width + dstx) * 4;
@@ -130,8 +128,12 @@ void ImageData::blitMatchingFormat(const ImageData* image, int x, int y) {
     uint srcwidth = image->getWidth();
     uint srcheight = image->getHeight();
 
-    for (uint srcy = max(0, -y); (int)srcy < min(srcheight, height-y); srcy++) {
-        for (uint srcx = max(0, -x); (int)srcx < min(srcwidth, width-x); srcx++) {
+    for (uint srcy = std::max(0, -y);
+         srcy < std::min(srcheight, height - y);
+         srcy++) {
+        for (uint srcx = std::max(0, -x);
+             srcx < std::min(srcwidth, width - x);
+             srcx++) {
             uint dstx = srcx + x;
             uint dsty = srcy + y;
             uint dstidx = (dsty * width + dstx) * comps;
@@ -156,7 +158,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     int rx = x + w - 1;
     int ry = y + h - 1;
     // top-left pixel
-    if (x > 0 && (uint)x < width && y > 0 && (uint)y < height) {
+    if (x > 0 && static_cast<uint>(x) < width && 
+        y > 0 && static_cast<uint>(y) < height) {
         uint srcidx = (y * width + x) * comps;
         uint dstidx = ((y - 1) * width + x - 1) * comps;
         for (uint c = 0; c < comps; c++) {
@@ -165,7 +168,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
     
     // top-right pixel
-    if (rx >= 0 && (uint)rx < width-1 && y > 0 && (uint)y < height) {
+    if (rx >= 0 && static_cast<uint>(rx) < width-1 && 
+          y > 0 && static_cast<uint>(y) < height) {
         uint srcidx = (y * width + rx) * comps;
         uint dstidx = ((y - 1) * width + rx + 1) * comps;
         for (uint c = 0; c < comps; c++) {
@@ -174,7 +178,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
 
     // bottom-left pixel
-    if (x > 0 && (uint)x < width && ry >= 0 && (uint)ry < height-1) {
+    if (x > 0 && static_cast<uint>(x) < width && 
+        ry >= 0 && static_cast<uint>(ry) < height-1) {
         uint srcidx = (ry * width + x) * comps;
         uint dstidx = ((ry + 1) * width + x - 1) * comps;
         for (uint c = 0; c < comps; c++) {
@@ -183,7 +188,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
     
     // bottom-right pixel
-    if (rx >= 0 && (uint)rx < width-1 && ry >= 0 && (uint)ry < height-1) {
+    if (rx >= 0 && static_cast<uint>(rx) < width-1 && 
+        ry >= 0 && static_cast<uint>(ry) < height-1) {
         uint srcidx = (ry * width + rx) * comps;
         uint dstidx = ((ry + 1) * width + rx + 1) * comps;
         for (uint c = 0; c < comps; c++) {
@@ -192,8 +198,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
 
     // left border
-    if (x > 0 && (uint)x < width) {
-        for (uint ey = max(y, 0); (int)ey < y + h; ey++) {
+    if (x > 0 && static_cast<uint>(x) < width) {
+        for (uint ey = std::max(y, 0); static_cast<int>(ey) < y + h; ey++) {
             uint srcidx = (ey * width + x) * comps;
             uint dstidx = (ey * width + x - 1) * comps;
             for (uint c = 0; c < comps; c++) {
@@ -203,8 +209,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
 
     // top border
-    if (y > 0 && (uint)y < height) {
-        for (uint ex = max(x, 0); (int)ex < x + w; ex++) {
+    if (y > 0 && static_cast<uint>(y) < height) {
+        for (uint ex = std::max(x, 0); static_cast<int>(ex) < x + w; ex++) {
             uint srcidx = (y * width + ex) * comps;
             uint dstidx = ((y-1) * width + ex) * comps;
             for (uint c = 0; c < comps; c++) {
@@ -214,8 +220,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
     
     // right border
-    if (rx >= 0 && (uint)rx < width-1) {
-        for (uint ey = max(y, 0); (int)ey < y + h; ey++) {
+    if (rx >= 0 && static_cast<uint>(rx) < width-1) {
+        for (uint ey = std::max(y, 0); static_cast<int>(ey) < y + h; ey++) {
             uint srcidx = (ey * width + rx) * comps;
             uint dstidx = (ey * width + rx + 1) * comps;
             for (uint c = 0; c < comps; c++) {
@@ -225,8 +231,8 @@ void ImageData::extrude(int x, int y, int w, int h) {
     }
 
     // bottom border
-    if (ry >= 0 && (uint)ry < height-1) {
-        for (uint ex = max(x, 0); (int)ex < x + w; ex++) {
+    if (ry >= 0 && static_cast<uint>(ry) < height-1) {
+        for (uint ex = std::max(x, 0); static_cast<int>(ex) < x + w; ex++) {
             uint srcidx = (ry * width + ex) * comps;
             uint dstidx = ((ry+1) * width + ex) * comps;
             for (uint c = 0; c < comps; c++) {
@@ -275,8 +281,8 @@ std::unique_ptr<ImageData> add_atlas_margins(ImageData* image, int grid_size) {
             int doy = 1 + row * (imgres + 2);
             for (int ly = -1; ly <= imgres; ly++) {
                 for (int lx = -1; lx <= imgres; lx++) {
-                    int sy = max(min(ly, imgres-1), 0);
-                    int sx = max(min(lx, imgres-1), 0);
+                    int sy = std::max(std::min(ly, imgres-1), 0);
+                    int sx = std::max(std::min(lx, imgres-1), 0);
                     for (int c = 0; c < 4; c++)
                         dstdata[((doy+ly) * dstwidth + dox + lx) * 4 + c] = 
                            srcdata[((soy+sy) * srcwidth + sox + sx) * 4 + c];
diff --git a/src/graphics/core/ImageData.hpp b/src/graphics/core/ImageData.hpp
index e4a77b090..328ff8967 100644
--- a/src/graphics/core/ImageData.hpp
+++ b/src/graphics/core/ImageData.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_CORE_IMAGE_DATA_HPP_
-#define GRAPHICS_CORE_IMAGE_DATA_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <memory>
 
@@ -48,5 +47,3 @@ public:
 };
 
 std::unique_ptr<ImageData> add_atlas_margins(ImageData* image, int grid_size);
-
-#endif // GRAPHICS_CORE_IMAGE_DATA_HPP_
diff --git a/src/graphics/core/LineBatch.hpp b/src/graphics/core/LineBatch.hpp
index a31b827d0..fe77da60f 100644
--- a/src/graphics/core/LineBatch.hpp
+++ b/src/graphics/core/LineBatch.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_LINEBATCH_HPP_
-#define GRAPHICS_CORE_LINEBATCH_HPP_
+#pragma once
 
 #include <memory>
 #include <stdlib.h>
@@ -34,5 +33,3 @@ public:
     void flush() override;
     void lineWidth(float width);
 };
-
-#endif // GRAPHICS_CORE_LINEBATCH_HPP_
diff --git a/src/graphics/core/Mesh.hpp b/src/graphics/core/Mesh.hpp
index ee5bfbd17..c94154a61 100644
--- a/src/graphics/core/Mesh.hpp
+++ b/src/graphics/core/Mesh.hpp
@@ -1,8 +1,7 @@
-#ifndef GRAPHICS_CORE_MESH_HPP_
-#define GRAPHICS_CORE_MESH_HPP_
+#pragma once
 
 #include <stdlib.h>
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 struct vattr {
     ubyte size;
@@ -39,5 +38,3 @@ public:
     static int meshesCount;
     static int drawCalls;
 };
-
-#endif // GRAPHICS_CORE_MESH_HPP_
diff --git a/src/graphics/core/Model.hpp b/src/graphics/core/Model.hpp
index 03d008268..786b9ac9a 100644
--- a/src/graphics/core/Model.hpp
+++ b/src/graphics/core/Model.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_MODEL_HPP_
-#define GRAPHICS_CORE_MODEL_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -34,5 +33,3 @@ namespace model {
         void clean();
     };
 }
-
-#endif // GRAPHICS_CORE_MODEL_HPP_
diff --git a/src/graphics/core/PostProcessing.hpp b/src/graphics/core/PostProcessing.hpp
index 408839c95..b31a13691 100644
--- a/src/graphics/core/PostProcessing.hpp
+++ b/src/graphics/core/PostProcessing.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_POST_PROCESSING_HPP_
-#define GRAPHICS_CORE_POST_PROCESSING_HPP_
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@ public:
 
     Framebuffer* getFramebuffer() const;
 };
-
-#endif // GRAPHICS_CORE_POST_PROCESSING_HPP_
diff --git a/src/graphics/core/Shader.cpp b/src/graphics/core/Shader.cpp
index 56c336eae..71a7288b8 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 cd5e88329..dd3997511 100644
--- a/src/graphics/core/Shader.hpp
+++ b/src/graphics/core/Shader.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_CORE_SHADER_HPP_
-#define GRAPHICS_CORE_SHADER_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <string>
 #include <memory>
@@ -44,5 +43,3 @@ public:
         const std::string& fragmentSource
     );
 };
-
-#endif // GRAPHICS_SHADER_HPP_
diff --git a/src/graphics/core/Texture.hpp b/src/graphics/core/Texture.hpp
index 1f1f83765..9e16f6705 100644
--- a/src/graphics/core/Texture.hpp
+++ b/src/graphics/core/Texture.hpp
@@ -1,8 +1,7 @@
-#ifndef GRAPHICS_CORE_TEXTURE_HPP_
-#define GRAPHICS_CORE_TEXTURE_HPP_
+#pragma once
 
-#include <typedefs.hpp>
-#include <maths/UVRegion.hpp>
+#include "typedefs.hpp"
+#include "maths/UVRegion.hpp"
 #include "ImageData.hpp"
 
 #include <memory>
@@ -35,5 +34,3 @@ public:
 
     static std::unique_ptr<Texture> from(const ImageData* image);
 };
-
-#endif // GRAPHICS_CORE_TEXTURE_HPP_
diff --git a/src/graphics/core/TextureAnimation.cpp b/src/graphics/core/TextureAnimation.cpp
index 59175ba30..fd49e5082 100644
--- a/src/graphics/core/TextureAnimation.cpp
+++ b/src/graphics/core/TextureAnimation.cpp
@@ -54,9 +54,9 @@ void TextureAnimator::update(float delta) {
 
             glBlitFramebuffer(
                 frame.srcPos.x, srcPosY,
-                frame.srcPos.x + frame.size.x,	
+                frame.srcPos.x + frame.size.x,    
                 srcPosY + frame.size.y,
-                frame.dstPos.x, frame.dstPos.y,	
+                frame.dstPos.x, frame.dstPos.y,    
                 frame.dstPos.x + frame.size.x,
                 frame.dstPos.y + frame.size.y,
                 GL_COLOR_BUFFER_BIT, GL_NEAREST
diff --git a/src/graphics/core/TextureAnimation.hpp b/src/graphics/core/TextureAnimation.hpp
index cc5da1023..dc93063c9 100644
--- a/src/graphics/core/TextureAnimation.hpp
+++ b/src/graphics/core/TextureAnimation.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
-#define GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <glm/glm.hpp>
 #include <vector>
@@ -48,5 +47,3 @@ private:
 
     std::vector<TextureAnimation> animations;
 };
-
-#endif // GRAPHICS_CORE_TEXTURE_ANIMATION_HPP_
diff --git a/src/graphics/core/Viewport.hpp b/src/graphics/core/Viewport.hpp
index 447289d3f..7ec826a1d 100644
--- a/src/graphics/core/Viewport.hpp
+++ b/src/graphics/core/Viewport.hpp
@@ -1,9 +1,8 @@
-#ifndef GRAPHICS_CORE_VIEWPORT_HPP_
-#define GRAPHICS_CORE_VIEWPORT_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Viewport {
     uint width;
@@ -18,5 +17,3 @@ public:
         return glm::ivec2(width, height);
     }
 };
-
-#endif // GRAPHICS_VIEWPORT_HPP_
diff --git a/src/graphics/core/commons.hpp b/src/graphics/core/commons.hpp
index e6ccc57fb..4d3f376f2 100644
--- a/src/graphics/core/commons.hpp
+++ b/src/graphics/core/commons.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_COMMONS_HPP_
-#define GRAPHICS_CORE_COMMONS_HPP_
+#pragma once
 
 enum class DrawPrimitive {
     point = 0,
@@ -17,5 +16,3 @@ public:
 
     virtual void flush() = 0;
 };
-
-#endif // GRAPHICS_CORE_COMMONS_HPP_
diff --git a/src/graphics/core/gl_util.hpp b/src/graphics/core/gl_util.hpp
index f95f9f2a2..3e34b923d 100644
--- a/src/graphics/core/gl_util.hpp
+++ b/src/graphics/core/gl_util.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_CORE_GL_UTIL_HPP_
-#define GRAPHICS_CORE_GL_UTIL_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "ImageData.hpp"
@@ -25,5 +24,3 @@ namespace gl {
         return primitives[static_cast<int>(primitive)];
     }
 }
-
-#endif // GRAPHICS_CORE_GL_UTIL_HPP_
diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp
index aaefcd278..bf6b2a108 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 ba08c0c2c..3dba931c0 100644
--- a/src/graphics/render/BlocksPreview.hpp
+++ b/src/graphics/render/BlocksPreview.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
-#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <glm/glm.hpp>
 #include <memory>
@@ -32,5 +31,3 @@ public:
         const Content* content
     );
 };
-
-#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index a734b756d..5b6f1257d 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,25 +1,18 @@
 #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/ChunksStorage.hpp"
+#include "lighting/Lightmap.hpp"
+#include "frontend/ContentGfxCache.hpp"
+#include "settings.hpp"
 
 #include <glm/glm.hpp>
 
-using glm::ivec3;
-using glm::vec3;
-using glm::vec4;
-
 const uint BlocksRenderer::VERTEX_SIZE = 6;
-const vec3 BlocksRenderer::SUN_VECTOR (0.411934f, 0.863868f, -0.279161f);
+const glm::vec3 BlocksRenderer::SUN_VECTOR (0.411934f, 0.863868f, -0.279161f);
 
 BlocksRenderer::BlocksRenderer(
     size_t capacity,
@@ -46,8 +39,10 @@ BlocksRenderer::BlocksRenderer(
 BlocksRenderer::~BlocksRenderer() {
 }
 
-/* Basic vertex add method */
-void BlocksRenderer::vertex(const vec3& coord, float u, float v, const vec4& light) {
+/// Basic vertex add method
+void BlocksRenderer::vertex(
+    const glm::vec3& coord, float u, float v, const glm::vec4& light
+) {
     vertexBuffer[vertexOffset++] = coord.x;
     vertexBuffer[vertexOffset++] = coord.y;
     vertexBuffer[vertexOffset++] = coord.z;
@@ -80,22 +75,22 @@ void BlocksRenderer::index(int a, int b, int c, int d, int e, int f) {
 
 /// @brief Add face with precalculated lights
 void BlocksRenderer::face(
-    const vec3& coord, 
+    const glm::vec3& coord, 
     float w, float h, float d,
-    const vec3& axisX,
-    const vec3& axisY,
-    const vec3& axisZ,
+    const glm::vec3& axisX,
+    const glm::vec3& axisY,
+    const glm::vec3& axisZ,
     const UVRegion& region,
-    const vec4(&lights)[4],
-    const vec4& tint
+    const glm::vec4(&lights)[4],
+    const glm::vec4& tint
 ) {
     if (vertexOffset + BlocksRenderer::VERTEX_SIZE * 4 > capacity) {
         overflow = true;
         return;
     }
-    vec3 X = axisX * w;
-    vec3 Y = axisY * h;
-    vec3 Z = axisZ * d;
+    auto X = axisX * w;
+    auto Y = axisY * h;
+    auto Z = axisZ * d;
     float s = 0.5f;
     vertex(coord + (-X - Y + Z) * s, region.u1, region.v1, lights[0] * tint);
     vertex(coord + ( X - Y + Z) * s, region.u2, region.v1, lights[1] * tint);
@@ -105,23 +100,27 @@ void BlocksRenderer::face(
 }
 
 void BlocksRenderer::vertexAO(
-    const vec3& coord, 
+    const glm::vec3& coord, 
     float u, float v,
-    const vec4& tint,
-    const vec3& axisX,
-    const vec3& axisY,
-    const vec3& axisZ
+    const glm::vec4& tint,
+    const glm::vec3& axisX,
+    const glm::vec3& axisY,
+    const glm::vec3& axisZ
 ) {
-    vec3 pos = coord+axisZ*0.5f+(axisX+axisY)*0.5f;
-    vec4 light = pickSoftLight(ivec3(round(pos.x), round(pos.y), round(pos.z)), axisX, axisY);
+    auto pos = coord+axisZ*0.5f+(axisX+axisY)*0.5f;
+    auto light = pickSoftLight(
+        glm::ivec3(std::round(pos.x), std::round(pos.y), std::round(pos.z)),
+        axisX,
+        axisY
+    );
     vertex(coord, u, v, light * tint);
 }
 
 void BlocksRenderer::faceAO(
-    const vec3& coord,
-    const vec3& X,
-    const vec3& Y,
-    const vec3& Z,
+    const glm::vec3& coord,
+    const glm::vec3& X,
+    const glm::vec3& Y,
+    const glm::vec3& Z,
     const UVRegion& region,
     bool lights
 ) {
@@ -135,11 +134,11 @@ void BlocksRenderer::faceAO(
         float d = glm::dot(glm::normalize(Z), SUN_VECTOR);
         d = 0.8f + d * 0.2f;
 
-        vec3 axisX = glm::normalize(X);
-        vec3 axisY = glm::normalize(Y);
-        vec3 axisZ = glm::normalize(Z);
+        auto axisX = glm::normalize(X);
+        auto axisY = glm::normalize(Y);
+        auto axisZ = glm::normalize(Z);
 
-        vec4 tint(d);
+        glm::vec4 tint(d);
         vertexAO(coord + (-X - Y + Z) * s, region.u1, region.v1, tint, axisX, axisY, axisZ);
         vertexAO(coord + ( X - Y + Z) * s, region.u2, region.v1, tint, axisX, axisY, axisZ);
         vertexAO(coord + ( X + Y + Z) * s, region.u2, region.v2, tint, axisX, axisY, axisZ);
@@ -155,12 +154,12 @@ void BlocksRenderer::faceAO(
 }
 
 void BlocksRenderer::face(
-    const vec3& coord,
-    const vec3& X,
-    const vec3& Y,
-    const vec3& Z,
+    const glm::vec3& coord,
+    const glm::vec3& X,
+    const glm::vec3& Y,
+    const glm::vec3& Z,
     const UVRegion& region,
-    vec4 tint,
+    glm::vec4 tint,
     bool lights
 ) {
     if (vertexOffset + BlocksRenderer::VERTEX_SIZE * 4 > capacity) {
@@ -182,21 +181,22 @@ void BlocksRenderer::face(
 }
 
 void BlocksRenderer::tetragonicFace(
-    const vec3& coord, 
-    const vec3& p1, const vec3& p2, const vec3& p3, const vec3& p4,
-    const vec3& X, const vec3& Y, const vec3& Z,
+    const glm::vec3& coord, 
+    const glm::vec3& p1, const glm::vec3& p2, 
+    const glm::vec3& p3, const glm::vec3& p4,
+    const glm::vec3& X, const glm::vec3& Y, const glm::vec3& Z,
     const UVRegion& texreg,
     bool lights
 ) {    
-    const vec3 fp1 = (p1.x - 0.5f) * X + (p1.y - 0.5f) * Y + (p1.z - 0.5f) * Z;
-    const vec3 fp2 = (p2.x - 0.5f) * X + (p2.y - 0.5f) * Y + (p2.z - 0.5f) * Z;
-    const vec3 fp3 = (p3.x - 0.5f) * X + (p3.y - 0.5f) * Y + (p3.z - 0.5f) * Z;
-    const vec3 fp4 = (p4.x - 0.5f) * X + (p4.y - 0.5f) * Y + (p4.z - 0.5f) * Z;
+    const auto fp1 = (p1.x - 0.5f) * X + (p1.y - 0.5f) * Y + (p1.z - 0.5f) * Z;
+    const auto fp2 = (p2.x - 0.5f) * X + (p2.y - 0.5f) * Y + (p2.z - 0.5f) * Z;
+    const auto fp3 = (p3.x - 0.5f) * X + (p3.y - 0.5f) * Y + (p3.z - 0.5f) * Z;
+    const auto fp4 = (p4.x - 0.5f) * X + (p4.y - 0.5f) * Y + (p4.z - 0.5f) * Z;
 
-    vec4 tint(1.0f);
+    glm::vec4 tint(1.0f);
     if (lights) {
-        vec3 dir = glm::cross(fp2 - fp1, fp3 - fp1);
-        vec3 normal = glm::normalize(dir);
+        auto dir = glm::cross(fp2 - fp1, fp3 - fp1);
+        auto normal = glm::normalize(dir);
 
         float d = glm::dot(normal, SUN_VECTOR);
         d = 0.8f + d * 0.2f;
@@ -216,12 +216,12 @@ void BlocksRenderer::tetragonicFace(
 
 void BlocksRenderer::blockXSprite(
     int x, int y, int z, 
-    const vec3& size, 
+    const glm::vec3& size, 
     const UVRegion& texface1, 
     const UVRegion& texface2, 
     float spread
 ) {
-    vec4 lights[] {
+    glm::vec4 lights[] {
         pickSoftLight({x, y + 1, z}, {1, 0, 0}, {0, 1, 0}),
         pickSoftLight({x + 1, y + 1, z}, {1, 0, 0}, {0, 1, 0}),
         pickSoftLight({x + 1, y + 1, z}, {1, 0, 0}, {0, 1, 0}),
@@ -233,28 +233,24 @@ void BlocksRenderer::blockXSprite(
     float zs = ((float)(char)(rand >> 8) / 512) * spread;
 
     const float w = size.x / 1.41f;
-    const float tint = 0.8f;
+    const glm::vec4 tint (0.8f);
 
-    face(vec3(x + xs, y, z + zs), 
-        w, size.y, 0, vec3(1, 0, 1), vec3(0, 1, 0), vec3(),
-        texface1, lights, vec4(tint));
-    face(vec3(x + xs, y, z + zs), 
-        w, size.y, 0, vec3(-1, 0, -1), vec3(0, 1, 0), vec3(), 
-        texface1, lights, vec4(tint));
+    face({x + xs, y, z + zs}, w, size.y, 0, {1, 0, 1}, {0, 1, 0}, glm::vec3(),
+        texface1, lights, tint);
+    face({x + xs, y, z + zs}, w, size.y, 0, {-1, 0, -1}, {0, 1, 0}, glm::vec3(), 
+        texface1, lights, tint);
 
-    face(vec3(x + xs, y, z + zs), 
-        w, size.y, 0, vec3(1, 0, -1), vec3(0, 1, 0), vec3(), 
-        texface2, lights, vec4(tint));
-    face(vec3(x + xs, y, z + zs), 
-        w, size.y, 0, vec3(-1, 0, 1), vec3(0, 1, 0), vec3(), 
-        texface2, lights, vec4(tint));
+    face({x + xs, y, z + zs}, w, size.y, 0, {1, 0, -1}, {0, 1, 0}, glm::vec3(), 
+        texface2, lights, tint);
+    face({x + xs, y, z + zs}, w, size.y, 0, {-1, 0, 1}, {0, 1, 0}, glm::vec3(), 
+        texface2, lights, tint);
 }
 
 // HINT: texture faces order: {east, west, bottom, top, south, north}
 
 /// @brief AABB blocks render method
 void BlocksRenderer::blockAABB(
-    const ivec3& icoord,
+    const glm::ivec3& icoord,
     const UVRegion(&texfaces)[6], 
     const Block* block, 
     ubyte rotation,
@@ -269,11 +265,11 @@ void BlocksRenderer::blockAABB(
         hitbox.a = glm::min(hitbox.a, box.a);
         hitbox.b = glm::max(hitbox.b, box.b);
     }
-    vec3 size = hitbox.size();
-    vec3 X(1, 0, 0);
-    vec3 Y(0, 1, 0);
-    vec3 Z(0, 0, 1);
-    vec3 coord(icoord);
+    auto size = hitbox.size();
+    glm::vec3 X(1, 0, 0);
+    glm::vec3 Y(0, 1, 0);
+    glm::vec3 Z(0, 0, 1);
+    glm::vec3 coord(icoord);
     if (block->rotatable) {
         auto& rotations = block->rotations;
         auto& orient = rotations.variants[rotation];
@@ -282,7 +278,7 @@ void BlocksRenderer::blockAABB(
         Z = orient.axisZ;
         orient.transform(hitbox);
     }
-    coord = vec3(icoord) - vec3(0.5f) + hitbox.center();
+    coord -= glm::vec3(0.5f) - hitbox.center();
     
     if (ao) {
         faceAO(coord,  X*size.x,  Y*size.y,  Z*size.z, texfaces[5], lights); // north
@@ -307,13 +303,13 @@ void BlocksRenderer::blockAABB(
 }
 
 void BlocksRenderer::blockCustomModel(
-    const ivec3& icoord, const Block* block, ubyte rotation, bool lights, bool ao
+    const glm::ivec3& icoord, const Block* block, ubyte rotation, bool lights, bool ao
 ) {
-    vec3 X(1, 0, 0);
-    vec3 Y(0, 1, 0);
-    vec3 Z(0, 0, 1);
+    glm::vec3 X(1, 0, 0);
+    glm::vec3 Y(0, 1, 0);
+    glm::vec3 Z(0, 0, 1);
     CoordSystem orient(X,Y,Z);
-    vec3 coord(icoord);
+    glm::vec3 coord(icoord);
     if (block->rotatable) {
         auto& rotations = block->rotations;
         orient = rotations.variants[rotation];
@@ -324,11 +320,11 @@ void BlocksRenderer::blockCustomModel(
 
     for (size_t i = 0; i < block->modelBoxes.size(); i++) {
         AABB box = block->modelBoxes[i];
-        vec3 size = box.size();
+        auto size = box.size();
         if (block->rotatable) {
             orient.transform(box);
         }
-        vec3 center_coord = coord - vec3(0.5f) + box.center();
+        glm::vec3 center_coord = coord - glm::vec3(0.5f) + box.center();
         faceAO(center_coord, X * size.x, Y * size.y, Z * size.z, block->modelUVs[i * 6 + 5], lights); // north
         faceAO(center_coord, -X * size.x, Y * size.y, -Z * size.z, block->modelUVs[i * 6 + 4], lights); // south
         faceAO(center_coord, X * size.x, -Z * size.z, Y * size.y, block->modelUVs[i * 6 + 3], lights); // top
@@ -350,21 +346,21 @@ void BlocksRenderer::blockCustomModel(
 
 /* Fastest solid shaded blocks render method */
 void BlocksRenderer::blockCube(
-    int x, int y, int z, 
+    const glm::ivec3& coord, 
     const UVRegion(&texfaces)[6], 
-    const Block* block, 
+    const Block& block, 
     blockstate states,
     bool lights,
     bool ao
 ) {
-    ubyte group = block->drawGroup;
+    ubyte group = block.drawGroup;
 
-    vec3 X(1, 0, 0);
-    vec3 Y(0, 1, 0);
-    vec3 Z(0, 0, 1);
-    vec3 coord(x, y, z);
-    if (block->rotatable) {
-        auto& rotations = block->rotations;
+    glm::ivec3 X(1, 0, 0);
+    glm::ivec3 Y(0, 1, 0);
+    glm::ivec3 Z(0, 0, 1);
+
+    if (block.rotatable) {
+        auto& rotations = block.rotations;
         auto& orient = rotations.variants[states.rotation];
         X = orient.axisX;
         Y = orient.axisY;
@@ -372,61 +368,46 @@ void BlocksRenderer::blockCube(
     }
     
     if (ao) {
-        if (isOpen(x+Z.x, y+Z.y, z+Z.z, group)) {
+        if (isOpen(coord + Z, group)) {
             faceAO(coord, X, Y, Z, texfaces[5], lights);
         }
-        if (isOpen(x-Z.x, y-Z.y, z-Z.z, group)) {
+        if (isOpen(coord - Z, group)) {
             faceAO(coord, -X, Y, -Z, texfaces[4], lights);
         }
-        if (isOpen(x+Y.x, y+Y.y, z+Y.z, group)) {
+        if (isOpen(coord + Y, group)) {
             faceAO(coord, X, -Z, Y, texfaces[3], lights);
         }
-        if (isOpen(x-Y.x, y-Y.y, z-Y.z, group)) {
+        if (isOpen(coord - Y, group)) {
             faceAO(coord, X, Z, -Y, texfaces[2], lights);
         }
-        if (isOpen(x+X.x, y+X.y, z+X.z, group)) {
+        if (isOpen(coord + X, group)) {
             faceAO(coord, -Z, Y, X, texfaces[1], lights);
         }
-        if (isOpen(x-X.x, y-X.y, z-X.z, group)) {
+        if (isOpen(coord - X, group)) {
             faceAO(coord, Z, Y, -X, texfaces[0], lights);
         }
     } else {
-        if (isOpen(x+Z.x, y+Z.y, z+Z.z, group)) {
-            face(coord, X, Y, Z, texfaces[5], pickLight({x, y, z+1}), lights);
+        if (isOpen(coord + Z, group)) {
+            face(coord, X, Y, Z, texfaces[5], pickLight(coord + Z), lights);
         }
-        if (isOpen(x-Z.x, y-Z.y, z-Z.z, group)) {
-            face(coord, -X, Y, -Z, texfaces[4], pickLight({x, y, z-1}), lights);
+        if (isOpen(coord - Z, group)) {
+            face(coord, -X, Y, -Z, texfaces[4], pickLight(coord - Z), lights);
         }
-        if (isOpen(x+Y.x, y+Y.y, z+Y.z, group)) {
-            face(coord, X, -Z, Y, texfaces[3], pickLight({x, y+1, z}), lights);
+        if (isOpen(coord + Y, group)) {
+            face(coord, X, -Z, Y, texfaces[3], pickLight(coord + Y), lights);
         }
-        if (isOpen(x-Y.x, y-Y.y, z-Y.z, group)) {
-            face(coord, X, Z, -Y, texfaces[2], pickLight({x, y-1, z}), lights);
+        if (isOpen(coord - Y, group)) {
+            face(coord, X, Z, -Y, texfaces[2], pickLight(coord - Y), lights);
         }
-        if (isOpen(x+X.x, y+X.y, z+X.z, group)) {
-            face(coord, -Z, Y, X, texfaces[1], pickLight({x+1, y, z}), lights);
+        if (isOpen(coord + X, group)) {
+            face(coord, -Z, Y, X, texfaces[1], pickLight(coord + X), lights);
         }
-        if (isOpen(x-X.x, y-X.y, z-X.z, group)) {
-            face(coord, Z, Y, -X, texfaces[0], pickLight({x-1, y, z}), lights);
+        if (isOpen(coord - X, group)) {
+            face(coord, Z, Y, -X, texfaces[0], pickLight(coord - X), lights);
         }
     }
 }
 
-// Does block allow to see other blocks sides (is it transparent)
-bool BlocksRenderer::isOpen(int x, int y, int z, ubyte group) const {
-    blockid_t id = voxelsBuffer->pickBlockId(chunk->x * CHUNK_W + x, 
-                                             y, 
-                                             chunk->z * CHUNK_D + z);
-    if (id == BLOCK_VOID) {
-        return false;
-    }
-    const Block& block = *blockDefsCache[id];
-    if ((block.drawGroup != group && block.lightPassing) || !block.rt.solid) {
-        return true;
-    }
-    return !id;
-}
-
 bool BlocksRenderer::isOpenForLight(int x, int y, int z) const {
     blockid_t id = voxelsBuffer->pickBlockId(chunk->x * CHUNK_W + x, 
                                              y, 
@@ -441,39 +422,39 @@ bool BlocksRenderer::isOpenForLight(int x, int y, int z) const {
     return !id;
 }
 
-vec4 BlocksRenderer::pickLight(int x, int y, int z) const {
+glm::vec4 BlocksRenderer::pickLight(int x, int y, int z) const {
     if (isOpenForLight(x, y, z)) {
         light_t light = voxelsBuffer->pickLight(chunk->x * CHUNK_W + x, y, 
                                                 chunk->z * CHUNK_D + z);
-        return vec4(Lightmap::extract(light, 0) / 15.0f,
-                    Lightmap::extract(light, 1) / 15.0f,
-                    Lightmap::extract(light, 2) / 15.0f,
-                    Lightmap::extract(light, 3) / 15.0f);
+        return glm::vec4(Lightmap::extract(light, 0),
+                         Lightmap::extract(light, 1),
+                         Lightmap::extract(light, 2),
+                         Lightmap::extract(light, 3)) / 15.0f;
     } else {
-        return vec4(0.0f);
+        return glm::vec4(0.0f);
     }
 }
 
-vec4 BlocksRenderer::pickLight(const ivec3& coord) const {
+glm::vec4 BlocksRenderer::pickLight(const glm::ivec3& coord) const {
     return pickLight(coord.x, coord.y, coord.z);
 }
 
-vec4 BlocksRenderer::pickSoftLight(const ivec3& coord, 
-                                   const ivec3& right, 
-                                   const ivec3& up) const {
+glm::vec4 BlocksRenderer::pickSoftLight(
+    const glm::ivec3& coord, const glm::ivec3& right, const glm::ivec3& up
+) const {
     return (pickLight(coord) +
             pickLight(coord - right) +
             pickLight(coord - right - up) +
             pickLight(coord - up)) * 0.25f;
 }
 
-vec4 BlocksRenderer::pickSoftLight(float x, float y, float z, 
-                                   const ivec3& right, 
-                                   const ivec3& up) const {
+glm::vec4 BlocksRenderer::pickSoftLight(
+    float x, float y, float z, const glm::ivec3& right, const glm::ivec3& up
+) const {
     return pickSoftLight({
-        static_cast<int>(round(x)), 
-        static_cast<int>(round(y)), 
-        static_cast<int>(round(z))},
+        static_cast<int>(std::round(x)), 
+        static_cast<int>(std::round(y)), 
+        static_cast<int>(std::round(z))},
         right, up);
 }
 
@@ -485,7 +466,7 @@ void BlocksRenderer::render(const voxel* voxels) {
             const voxel& vox = voxels[i];
             blockid_t id = vox.id;
             blockstate state = vox.state;
-            const Block& def = *blockDefsCache[id];
+            const auto& def = *blockDefsCache[id];
             if (id == 0 || def.drawGroup != drawGroup || state.segment) {
                 continue;
             }
@@ -502,21 +483,21 @@ void BlocksRenderer::render(const voxel* voxels) {
             int z = (i / CHUNK_D) % CHUNK_W;
             switch (def.model) {
                 case BlockModel::block:
-                    blockCube(x, y, z, texfaces, &def, vox.state, !def.shadeless,
+                    blockCube({x, y, z}, texfaces, def, vox.state, !def.shadeless,
                               def.ambientOcclusion);
                     break;
                 case BlockModel::xsprite: {
-                    blockXSprite(x, y, z, vec3(1.0f), 
+                    blockXSprite(x, y, z, glm::vec3(1.0f), 
                                 texfaces[FACE_MX], texfaces[FACE_MZ], 1.0f);
                     break;
                 }
                 case BlockModel::aabb: {
-                    blockAABB(ivec3(x,y,z), texfaces, &def, vox.state.rotation, 
+                    blockAABB({x, y, z}, texfaces, &def, vox.state.rotation, 
                               !def.shadeless, def.ambientOcclusion);
                     break;
                 }
                 case BlockModel::custom: {
-                    blockCustomModel(ivec3(x, y, z), &def, vox.state.rotation, 
+                    blockCustomModel({x, y, z}, &def, vox.state.rotation, 
                                      !def.shadeless, def.ambientOcclusion);
                     break;
                 }
diff --git a/src/graphics/render/BlocksRenderer.hpp b/src/graphics/render/BlocksRenderer.hpp
index b37e4b7a7..73ac02e2f 100644
--- a/src/graphics/render/BlocksRenderer.hpp
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -1,12 +1,15 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
-#define GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
+#pragma once
 
 #include <stdlib.h>
 #include <vector>
 #include <memory>
 #include <glm/glm.hpp>
-#include <voxels/voxel.hpp>
-#include <typedefs.hpp>
+#include "voxels/voxel.hpp"
+#include "typedefs.hpp"
+
+#include "voxels/Block.hpp"
+#include "voxels/Chunk.hpp"
+#include "voxels/VoxelsVolume.hpp"
 
 class Content;
 class Mesh;
@@ -85,9 +88,9 @@ class BlocksRenderer {
         bool lights
     );
     void blockCube(
-        int x, int y, int z, 
+        const glm::ivec3& coord,
         const UVRegion(&faces)[6], 
-        const Block* block, 
+        const Block& block, 
         blockstate states, 
         bool lights,
         bool ao
@@ -116,7 +119,22 @@ class BlocksRenderer {
     );
 
     bool isOpenForLight(int x, int y, int z) const;
-    bool isOpen(int x, int y, int z, ubyte group) const;
+
+
+    // Does block allow to see other blocks sides (is it transparent)
+    inline bool isOpen(const glm::ivec3& pos, ubyte group) const {
+        auto id = voxelsBuffer->pickBlockId(
+            chunk->x * CHUNK_W + pos.x, pos.y, chunk->z * CHUNK_D + pos.z
+        );
+        if (id == BLOCK_VOID) {
+            return false;
+        }
+        const auto& block = *blockDefsCache[id];
+        if ((block.drawGroup != group && block.lightPassing) || !block.rt.solid) {
+            return true;
+        }
+        return !id;
+    }
 
     glm::vec4 pickLight(int x, int y, int z) const;
     glm::vec4 pickLight(const glm::ivec3& coord) const;
@@ -132,5 +150,3 @@ public:
     std::shared_ptr<Mesh> createMesh();
     VoxelsVolume* getVoxelsBuffer() const;
 };
-
-#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index 295127346..743676fad 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 bb03c09e3..353877a0a 100644
--- a/src/graphics/render/ChunksRenderer.hpp
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
-#define GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
+#pragma once
 
 #include <queue>
 #include <memory>
@@ -7,9 +6,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;
@@ -46,5 +45,3 @@ public:
 
     void update();
 };
-
-#endif // GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
diff --git a/src/graphics/render/ModelBatch.cpp b/src/graphics/render/ModelBatch.cpp
index 673bd6718..1b97ad690 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 3ff266755..31dfc2927 100644
--- a/src/graphics/render/ModelBatch.hpp
+++ b/src/graphics/render/ModelBatch.hpp
@@ -1,7 +1,6 @@
-#ifndef GRAPHICS_RENDER_MODEL_BATCH_HPP_
-#define GRAPHICS_RENDER_MODEL_BATCH_HPP_
+#pragma once
 
-#include <maths/UVRegion.hpp>
+#include "maths/UVRegion.hpp"
 
 #include <memory>
 #include <vector>
@@ -90,5 +89,3 @@ public:
               const texture_names_map* varTextures);
     void render();
 };
-
-#endif // GRAPHICS_RENDER_MODEL_BATCH_HPP_
diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp
index af4973969..420f0ec74 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 0d929b815..01bffab7e 100644
--- a/src/graphics/render/Skybox.hpp
+++ b/src/graphics/render/Skybox.hpp
@@ -1,11 +1,10 @@
-#ifndef GRAPHICS_RENDER_SKYBOX_HPP_
-#define GRAPHICS_RENDER_SKYBOX_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
-#include <typedefs.hpp>
-#include <maths/fastmaths.hpp>
+#include "typedefs.hpp"
+#include "maths/fastmaths.hpp"
 
 class Mesh;
 class Shader;
@@ -54,5 +53,3 @@ public:
         return ready;
     }
 };
-
-#endif // GRAPHICS_RENDER_SKYBOX_HPP_
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index 71b2faa04..b8eb50119 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/render/WorldRenderer.hpp b/src/graphics/render/WorldRenderer.hpp
index 9a199ce65..13bdb185a 100644
--- a/src/graphics/render/WorldRenderer.hpp
+++ b/src/graphics/render/WorldRenderer.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_RENDER_WORLD_RENDERER_HPP_
-#define GRAPHICS_RENDER_WORLD_RENDERER_HPP_
+#pragma once
 
 #include <vector>
 #include <memory>
@@ -98,6 +97,3 @@ public:
         bool pause
     );
 };
-
-
-#endif // GRAPHICS_RENDER_WORLD_RENDERER_HPP_
diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp
index 8dec44bdd..40b74a4ce 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 d54fd8681..b2b20bd02 100644
--- a/src/graphics/ui/GUI.hpp
+++ b/src/graphics/ui/GUI.hpp
@@ -1,7 +1,6 @@
-#ifndef FRONTEND_GUI_GUI_HPP_
-#define FRONTEND_GUI_GUI_HPP_
+#pragma once
 
-#include <delegates.hpp>
+#include "delegates.hpp"
 
 #include <queue>
 #include <memory>
@@ -135,5 +134,3 @@ namespace gui {
         float getDoubleClickDelay() const;
     };
 }
-
-#endif // FRONTEND_GUI_GUI_HPP_
diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp
index 91b96a3b8..b6a112326 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/Button.hpp b/src/graphics/ui/elements/Button.hpp
index bfa84abdb..61bfea037 100644
--- a/src/graphics/ui/elements/Button.hpp
+++ b/src/graphics/ui/elements/Button.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
-#define GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
+#pragma once
 
 #include "Panel.hpp"
 
@@ -31,5 +30,3 @@ namespace gui {
         virtual void refresh() override;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp
index 26f3c3d93..21b7153f2 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/CheckBox.hpp b/src/graphics/ui/elements/CheckBox.hpp
index 7b546e0d9..f4e31f38e 100644
--- a/src/graphics/ui/elements/CheckBox.hpp
+++ b/src/graphics/ui/elements/CheckBox.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
+#pragma once
 
 #include <utility>
 
@@ -59,5 +58,3 @@ namespace gui {
         }
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp
index 77a014132..8d2987696 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/Container.hpp b/src/graphics/ui/elements/Container.hpp
index 606c91797..52d2a3747 100644
--- a/src/graphics/ui/elements/Container.hpp
+++ b/src/graphics/ui/elements/Container.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
-#define GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "commons.hpp"
@@ -38,5 +37,3 @@ namespace gui {
         const std::vector<std::shared_ptr<UINode>>& getNodes() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
diff --git a/src/graphics/ui/elements/Image.cpp b/src/graphics/ui/elements/Image.cpp
index 0002cab12..f922c9b68 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/Image.hpp b/src/graphics/ui/elements/Image.hpp
index 06bab69d6..898b5df87 100644
--- a/src/graphics/ui/elements/Image.hpp
+++ b/src/graphics/ui/elements/Image.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
-#define GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
+#pragma once
 
 #include "UINode.hpp"
 
@@ -19,5 +18,3 @@ namespace gui {
         virtual void setTexture(const std::string& name);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
diff --git a/src/graphics/ui/elements/InputBindBox.cpp b/src/graphics/ui/elements/InputBindBox.cpp
index f740b0154..322f570a7 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/InputBindBox.hpp b/src/graphics/ui/elements/InputBindBox.hpp
index 768d741a1..cd1a074b8 100644
--- a/src/graphics/ui/elements/InputBindBox.hpp
+++ b/src/graphics/ui/elements/InputBindBox.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
+#pragma once
 
 #include "Panel.hpp"
 
@@ -21,5 +20,3 @@ namespace gui {
         virtual bool isFocuskeeper() const override {return true;}
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp
index 1b8ba5c79..1b759a574 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 7dd1b3564..1700c168d 100644
--- a/src/graphics/ui/elements/InventoryView.hpp
+++ b/src/graphics/ui/elements/InventoryView.hpp
@@ -1,10 +1,9 @@
-#ifndef FRONTEND_INVENTORY_VIEW_HPP_
-#define FRONTEND_INVENTORY_VIEW_HPP_
+#pragma once
 
 #include "UINode.hpp"
 #include "Container.hpp"
-#include <typedefs.hpp>
-#include <constants.hpp>
+#include "typedefs.hpp"
+#include "constants.hpp"
 
 #include <vector>
 #include <functional>
@@ -140,5 +139,3 @@ namespace gui {
         std::shared_ptr<InventoryView> build();
     };
 }
-
-#endif // FRONTEND_INVENTORY_VIEW_HPP_
diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp
index 98a1a6c35..a0d356b39 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/Label.hpp b/src/graphics/ui/elements/Label.hpp
index 0c3cb8f99..4aca8a7a4 100644
--- a/src/graphics/ui/elements/Label.hpp
+++ b/src/graphics/ui/elements/Label.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_LABEL_HPP_
-#define GRAPHICS_UI_ELEMENTS_LABEL_HPP_
+#pragma once
 
 #include "UINode.hpp"
 
@@ -110,5 +109,3 @@ namespace gui {
         virtual bool isTextWrapping() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_LABEL_HPP_
diff --git a/src/graphics/ui/elements/Menu.hpp b/src/graphics/ui/elements/Menu.hpp
index 9a7f1859f..8f18d2c48 100644
--- a/src/graphics/ui/elements/Menu.hpp
+++ b/src/graphics/ui/elements/Menu.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_MENU_HPP_
-#define GRAPHICS_UI_ELEMENTS_MENU_HPP_
+#pragma once
 
 #include "Container.hpp"
 
@@ -56,5 +55,3 @@ namespace gui {
         Page& getCurrent();
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_MENU_HPP_
diff --git a/src/graphics/ui/elements/Panel.hpp b/src/graphics/ui/elements/Panel.hpp
index 100239cf6..0ad69be76 100644
--- a/src/graphics/ui/elements/Panel.hpp
+++ b/src/graphics/ui/elements/Panel.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_PANEL_HPP_
-#define GRAPHICS_UI_ELEMENTS_PANEL_HPP_
+#pragma once
 
 #include "commons.hpp"
 #include "Container.hpp"
@@ -36,5 +35,3 @@ namespace gui {
         glm::vec4 getPadding() const;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_PANEL_HPP_
diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/Plotter.cpp
index 5a9e9b30a..86e159bf6 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 17d7d9220..f8e912269 100644
--- a/src/graphics/ui/elements/Plotter.hpp
+++ b/src/graphics/ui/elements/Plotter.hpp
@@ -1,8 +1,7 @@
-#ifndef GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
-#define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
+#pragma once
 
 #include "UINode.hpp"
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 #include <memory>
 #include <glm/glm.hpp>
@@ -33,5 +32,3 @@ namespace gui {
         void draw(const DrawContext* pctx, Assets* assets) override;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index f41343fe8..7d4810488 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/TextBox.hpp b/src/graphics/ui/elements/TextBox.hpp
index dc2ef9a6e..376244cb4 100644
--- a/src/graphics/ui/elements/TextBox.hpp
+++ b/src/graphics/ui/elements/TextBox.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
-#define GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
+#pragma once
 
 #include "Panel.hpp"
 #include "Label.hpp"
@@ -173,5 +172,3 @@ namespace gui {
         virtual void setOnDownPressed(const runnable &callback);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
diff --git a/src/graphics/ui/elements/TrackBar.cpp b/src/graphics/ui/elements/TrackBar.cpp
index 8cf09c475..0a4438762 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 a2c99ca75..3d9cbfe9f 100644
--- a/src/graphics/ui/elements/TrackBar.hpp
+++ b/src/graphics/ui/elements/TrackBar.hpp
@@ -1,8 +1,7 @@
-#ifndef GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
-#define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
+#pragma once
 
 #include "UINode.hpp"
-#include <data/dynamic_fwd.hpp>
+#include "data/dynamic_fwd.hpp"
 
 namespace gui {
     class TrackBar : public UINode {
@@ -49,5 +48,3 @@ namespace gui {
         virtual void setChangeOnRelease(bool);
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp
index 5fe697412..856464800 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 4a8be56dd..29de089ef 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -1,8 +1,7 @@
-#ifndef GRAPHICS_UI_ELEMENTS_UINODE_HPP_
-#define GRAPHICS_UI_ELEMENTS_UINODE_HPP_
+#pragma once
 
-#include <delegates.hpp>
-#include <window/input.hpp>
+#include "delegates.hpp"
+#include "window/input.hpp"
 
 #include <glm/glm.hpp>
 #include <vector>
@@ -259,5 +258,3 @@ namespace gui {
         );
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_UINODE_HPP_
diff --git a/src/graphics/ui/elements/commons.hpp b/src/graphics/ui/elements/commons.hpp
index cdad6354d..82a369298 100644
--- a/src/graphics/ui/elements/commons.hpp
+++ b/src/graphics/ui/elements/commons.hpp
@@ -1,5 +1,4 @@
-#ifndef GRAPHICS_UI_ELEMENTS_COMMONS_HPP_
-#define GRAPHICS_UI_ELEMENTS_COMMONS_HPP_
+#pragma once
 
 #include <functional>
 
@@ -16,5 +15,3 @@ namespace gui {
         int repeat;
     };
 }
-
-#endif // GRAPHICS_UI_ELEMENTS_COMMONS_HPP_
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 8f40a5841..2045713ad 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 31572f028..c42acde9e 100644
--- a/src/graphics/ui/gui_util.hpp
+++ b/src/graphics/ui/gui_util.hpp
@@ -1,9 +1,8 @@
-#ifndef FRONTEND_GUI_GUI_UTIL_HPP_
-#define FRONTEND_GUI_GUI_UTIL_HPP_
+#pragma once
 
 #include "GUI.hpp"
-#include <typedefs.hpp>
-#include <delegates.hpp>
+#include "typedefs.hpp"
+#include "delegates.hpp"
 
 #include <memory>
 #include <string>
@@ -26,5 +25,3 @@ namespace guiutil {
         std::wstring yestext=L"", 
         std::wstring notext=L"");
 }
-
-#endif // FRONTEND_GUI_GUI_UTIL_HPP_
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 74cf906cd..215be1efd 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 b49e5c070..78fe8b373 100644
--- a/src/graphics/ui/gui_xml.hpp
+++ b/src/graphics/ui/gui_xml.hpp
@@ -1,8 +1,7 @@
-#ifndef FRONTEND_GUI_GUI_XML_HPP_
-#define FRONTEND_GUI_GUI_XML_HPP_
+#pragma once
 
 #include "GUI.hpp"
-#include <coders/xml.hpp>
+#include "coders/xml.hpp"
 
 #include <memory>
 #include <stack>
@@ -56,5 +55,3 @@ namespace gui {
         const std::string& getFilename() const;
     };
 }
-
-#endif // FRONTEND_GUI_GUI_XML_HPP_
diff --git a/src/interfaces/Object.hpp b/src/interfaces/Object.hpp
index 6f3a3f4b9..bb21fedb1 100644
--- a/src/interfaces/Object.hpp
+++ b/src/interfaces/Object.hpp
@@ -1,5 +1,4 @@
-#ifndef OBJECT_HPP_
-#define OBJECT_HPP_
+#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -22,5 +21,3 @@ public:
     virtual void update(float delta) { }
     virtual void destroyed() {  }
 };
-
-#endif // OBJECT_HPP_
diff --git a/src/interfaces/Serializable.hpp b/src/interfaces/Serializable.hpp
index 378536620..89962079a 100644
--- a/src/interfaces/Serializable.hpp
+++ b/src/interfaces/Serializable.hpp
@@ -1,7 +1,6 @@
-#ifndef SERIALIZABLE_HPP_
-#define SERIALIZABLE_HPP_
+#pragma once
 
-#include <coders/json.hpp>
+#include "coders/json.hpp"
 
 #include <memory>
 
@@ -11,5 +10,3 @@ public:
     virtual std::unique_ptr<dynamic::Map>  serialize() const = 0;
     virtual void deserialize(dynamic::Map* src) = 0;
 };
-
-#endif // SERIALIZABLE_HPP_
diff --git a/src/interfaces/Task.hpp b/src/interfaces/Task.hpp
index ebcdc7fa1..6477c471a 100644
--- a/src/interfaces/Task.hpp
+++ b/src/interfaces/Task.hpp
@@ -1,7 +1,6 @@
-#ifndef INTERFACES_TASK_HPP_
-#define INTERFACES_TASK_HPP_
+#pragma once
 
-#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)
@@ -16,6 +15,3 @@ public:
     virtual void waitForEnd() = 0;
     virtual void terminate() = 0;
 };
-
-#endif // INTERFACES_TASK_HPP_
-
diff --git a/src/items/Inventories.cpp b/src/items/Inventories.cpp
index 7ae1bce9b..d3af607d8 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 3c2affa2e..aed3e0906 100644
--- a/src/items/Inventories.hpp
+++ b/src/items/Inventories.hpp
@@ -1,11 +1,10 @@
-#ifndef ITEMS_INVENTORIES_HPP_
-#define ITEMS_INVENTORIES_HPP_
+#pragma once
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 
-#include <maths/util.hpp>
+#include "maths/util.hpp"
 #include "Inventory.hpp"
 
 class Level;
@@ -41,4 +40,3 @@ public:
     const inventories_map& getMap() const;
 };
 
-#endif  // ITEMS_INVENTORIES_HPP_
diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp
index cd719b836..34f20bba4 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 111ba87f0..a557d2c07 100644
--- a/src/items/Inventory.hpp
+++ b/src/items/Inventory.hpp
@@ -1,11 +1,10 @@
-#ifndef ITEMS_INVENTORY_HPP_
-#define ITEMS_INVENTORY_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
 
-#include <interfaces/Serializable.hpp>
-#include <typedefs.hpp>
+#include "interfaces/Serializable.hpp"
+#include "typedefs.hpp"
 #include "ItemStack.hpp"
 
 namespace dynamic {
@@ -59,5 +58,3 @@ public:
 
     static const size_t npos;
 };
-
-#endif  // ITEMS_INVENTORY_HPP_
diff --git a/src/items/ItemDef.cpp b/src/items/ItemDef.cpp
index 872fe022f..539682c6a 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 8ac8e47f8..348ff844f 100644
--- a/src/items/ItemDef.hpp
+++ b/src/items/ItemDef.hpp
@@ -1,10 +1,9 @@
-#ifndef CONTENT_ITEMS_ITEM_DEF_HPP_
-#define CONTENT_ITEMS_ITEM_DEF_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <string>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 struct item_funcs_set {
     bool init : 1;
@@ -46,5 +45,3 @@ struct ItemDef {
     ItemDef(const std::string& name);
     ItemDef(const ItemDef&) = delete;
 };
-
-#endif  // CONTENT_ITEMS_ITEM_DEF_HPP_
diff --git a/src/items/ItemStack.cpp b/src/items/ItemStack.cpp
index 6a973aa43..932f44176 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 f880f5f6b..1a8e191dd 100644
--- a/src/items/ItemStack.hpp
+++ b/src/items/ItemStack.hpp
@@ -1,8 +1,7 @@
-#ifndef ITEMS_ITEM_STACK_HPP_
-#define ITEMS_ITEM_STACK_HPP_
+#pragma once
 
-#include <constants.hpp>
-#include <typedefs.hpp>
+#include "constants.hpp"
+#include "typedefs.hpp"
 
 class ContentIndices;
 
@@ -36,5 +35,3 @@ public:
         return count;
     }
 };
-
-#endif  // ITEMS_ITEM_STACK_HPP_
diff --git a/src/lighting/LightSolver.cpp b/src/lighting/LightSolver.cpp
index 7c7d5c4aa..fa5b45d3e 100644
--- a/src/lighting/LightSolver.cpp
+++ b/src/lighting/LightSolver.cpp
@@ -1,114 +1,115 @@
 #include <iostream>
 #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), 
-	  chunks(chunks), 
-	  channel(channel) {
+    : contentIds(contentIds), 
+      chunks(chunks), 
+      channel(channel) {
 }
 
 void LightSolver::add(int x, int y, int z, int emission) {
-	if (emission <= 1)
-		return;
+    if (emission <= 1)
+        return;
 
-	addqueue.push(lightentry {x, y, z, ubyte(emission)});
+    addqueue.push(lightentry {x, y, z, ubyte(emission)});
 
-	Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
+    Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
     chunk->flags.modified = true;
-	chunk->lightmap.set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, emission);
+    chunk->lightmap.set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, emission);
 }
 
 void LightSolver::add(int x, int y, int z) {
-	assert (chunks != nullptr);
-	add(x,y,z, chunks->getLight(x,y,z, channel));
+    assert (chunks != nullptr);
+    add(x,y,z, chunks->getLight(x,y,z, channel));
 }
 
 void LightSolver::remove(int x, int y, int z) {
-	Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
-	if (chunk == nullptr)
-		return;
+    Chunk* chunk = chunks->getChunkByVoxel(x, y, z);
+    if (chunk == nullptr)
+        return;
 
-	ubyte light = chunk->lightmap.get(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel);
-	if (light == 0){
-		return;
-	}
-	remqueue.push(lightentry {x, y, z, light});
-	chunk->lightmap.set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, 0);
+    ubyte light = chunk->lightmap.get(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel);
+    if (light == 0){
+        return;
+    }
+    remqueue.push(lightentry {x, y, z, light});
+    chunk->lightmap.set(x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, channel, 0);
 }
 
 void LightSolver::solve(){
-	const int coords[] = {
-			0, 0, 1,
-			0, 0,-1,
-			0, 1, 0,
-			0,-1, 0,
-			1, 0, 0,
-		   -1, 0, 0
-	};
+    const int coords[] = {
+            0, 0, 1,
+            0, 0,-1,
+            0, 1, 0,
+            0,-1, 0,
+            1, 0, 0,
+           -1, 0, 0
+    };
 
-	while (!remqueue.empty()){
-		const lightentry entry = remqueue.front();
-		remqueue.pop();
+    while (!remqueue.empty()){
+        const lightentry entry = remqueue.front();
+        remqueue.pop();
 
-		for (int i = 0; i < 6; i++) {
-			int imul3 = i*3;
-			int x = entry.x+coords[imul3];
-			int y = entry.y+coords[imul3+1];
-			int z = entry.z+coords[imul3+2];
-			
-			Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
-			if (chunk) {
-				int lx = x - chunk->x * CHUNK_W;
-				int lz = z - chunk->z * CHUNK_D;
+        for (int i = 0; i < 6; i++) {
+            int imul3 = i*3;
+            int x = entry.x+coords[imul3];
+            int y = entry.y+coords[imul3+1];
+            int z = entry.z+coords[imul3+2];
+            
+            Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
+            if (chunk) {
+                int lx = x - chunk->x * CHUNK_W;
+                int lz = z - chunk->z * CHUNK_D;
                 chunk->flags.modified = true;
 
-				ubyte light = chunk->lightmap.get(lx,y,lz, channel);
-				if (light != 0 && light == entry.light-1){
-					remqueue.push(lightentry {x, y, z, light});
-					chunk->lightmap.set(lx, y, lz, channel, 0);
-				}
-				else if (light >= entry.light){
-					addqueue.push(lightentry {x, y, z, light});
-				}
-			}
-		}
-	}
+                ubyte light = chunk->lightmap.get(lx,y,lz, channel);
+                if (light != 0 && light == entry.light-1){
+                    remqueue.push(lightentry {x, y, z, light});
+                    chunk->lightmap.set(lx, y, lz, channel, 0);
+                }
+                else if (light >= entry.light){
+                    addqueue.push(lightentry {x, y, z, light});
+                }
+            }
+        }
+    }
 
-	const Block* const* blockDefs = contentIds->blocks.getDefs();
-	while (!addqueue.empty()){
-		const lightentry entry = addqueue.front();
-		addqueue.pop();
+    const Block* const* blockDefs = contentIds->blocks.getDefs();
+    while (!addqueue.empty()){
+        const lightentry entry = addqueue.front();
+        addqueue.pop();
 
-		for (int i = 0; i < 6; i++) {
-			int imul3 = i*3;
-			int x = entry.x+coords[imul3];
-			int y = entry.y+coords[imul3+1];
-			int z = entry.z+coords[imul3+2];
+        for (int i = 0; i < 6; i++) {
+            int imul3 = i*3;
+            int x = entry.x+coords[imul3];
+            int y = entry.y+coords[imul3+1];
+            int z = entry.z+coords[imul3+2];
 
-			Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
-			if (chunk) {
-				int lx = x - chunk->x * CHUNK_W;
-				int lz = z - chunk->z * CHUNK_D;
+            Chunk* chunk = chunks->getChunkByVoxel(x,y,z);
+            if (chunk) {
+                int lx = x - chunk->x * CHUNK_W;
+                int lz = z - chunk->z * CHUNK_D;
                 chunk->flags.modified = true;
 
-				ubyte light = chunk->lightmap.get(lx, y, lz, channel);
-				voxel& v = chunk->voxels[vox_index(lx, y, lz)];
-				const Block* block = blockDefs[v.id];
-				if (block->lightPassing && light+2 <= entry.light){
-					chunk->lightmap.set(
-						x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, 
-						channel, 
-						entry.light-1);
-					addqueue.push(lightentry {x, y, z, ubyte(entry.light-1)});
-				}
-			}
-		}
-	}
+                ubyte light = chunk->lightmap.get(lx, y, lz, channel);
+                voxel& v = chunk->voxels[vox_index(lx, y, lz)];
+                const Block* block = blockDefs[v.id];
+                if (block->lightPassing && light+2 <= entry.light){
+                    chunk->lightmap.set(
+                        x-chunk->x*CHUNK_W, y, z-chunk->z*CHUNK_D, 
+                        channel, 
+                        entry.light-1);
+                    addqueue.push(lightentry {x, y, z, ubyte(entry.light-1)});
+                }
+            }
+        }
+    }
 }
diff --git a/src/lighting/LightSolver.hpp b/src/lighting/LightSolver.hpp
index a15f9734a..3be580245 100644
--- a/src/lighting/LightSolver.hpp
+++ b/src/lighting/LightSolver.hpp
@@ -1,5 +1,4 @@
-#ifndef LIGHTING_LIGHTSOLVER_HPP_
-#define LIGHTING_LIGHTSOLVER_HPP_
+#pragma once
 
 #include <queue>
 
@@ -27,5 +26,3 @@ public:
     void remove(int x, int y, int z);
     void solve();
 };
-
-#endif // LIGHTING_LIGHTSOLVER_HPP_
diff --git a/src/lighting/Lighting.cpp b/src/lighting/Lighting.cpp
index 285d244ed..df1e358da 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 ecc588ba5..b1ea2fbc1 100644
--- a/src/lighting/Lighting.hpp
+++ b/src/lighting/Lighting.hpp
@@ -1,7 +1,6 @@
-#ifndef LIGHTING_LIGHTING_HPP_
-#define LIGHTING_LIGHTING_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Content;
 class ContentIndices;
@@ -27,5 +26,3 @@ public:
 
     static void prebuildSkyLight(Chunk* chunk, const ContentIndices* indices);
 };
-
-#endif /* LIGHTING_LIGHTING_HPP_ */
diff --git a/src/lighting/Lightmap.cpp b/src/lighting/Lightmap.cpp
index e47b5e5e8..cb077b8b1 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 36a7515f5..21b5bce53 100644
--- a/src/lighting/Lightmap.hpp
+++ b/src/lighting/Lightmap.hpp
@@ -1,8 +1,7 @@
-#ifndef LIGHTING_LIGHTMAP_HPP_
-#define LIGHTING_LIGHTMAP_HPP_
+#pragma once
 
-#include <constants.hpp>
-#include <typedefs.hpp>
+#include "constants.hpp"
+#include "typedefs.hpp"
 
 #include <memory>
 
@@ -86,5 +85,3 @@ public:
     std::unique_ptr<ubyte[]> encode() const;
     static std::unique_ptr<light_t[]> decode(const ubyte* buffer);
 };
-
-#endif // LIGHTING_LIGHTMAP_HPP_
diff --git a/src/logic/BlocksController.cpp b/src/logic/BlocksController.cpp
index cefd316ae..570c1f46b 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 83d351e68..a3baf96fc 100644
--- a/src/logic/BlocksController.hpp
+++ b/src/logic/BlocksController.hpp
@@ -1,13 +1,12 @@
-#ifndef LOGIC_BLOCKS_CONTROLLER_HPP_
-#define LOGIC_BLOCKS_CONTROLLER_HPP_
+#pragma once
 
 #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;
@@ -62,5 +61,3 @@ public:
     /// @brief Add block interaction callback
     void listenBlockInteraction(const on_block_interaction& callback);
 };
-
-#endif  // LOGIC_BLOCKS_CONTROLLER_HPP_
diff --git a/src/logic/ChunksController.cpp b/src/logic/ChunksController.cpp
index 66403c426..66d9f539b 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 d65eb9cbe..5e607f516 100644
--- a/src/logic/ChunksController.hpp
+++ b/src/logic/ChunksController.hpp
@@ -1,9 +1,8 @@
-#ifndef VOXELS_CHUNKSCONTROLLER_HPP_
-#define VOXELS_CHUNKSCONTROLLER_HPP_
+#pragma once
 
 #include <memory>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Level;
 class Chunk;
@@ -31,5 +30,3 @@ public:
     /// @param maxDuration milliseconds reserved for chunks loading
     void update(int64_t maxDuration);
 };
-
-#endif  // VOXELS_CHUNKSCONTROLLER_HPP_
diff --git a/src/logic/CommandsInterpreter.cpp b/src/logic/CommandsInterpreter.cpp
index 7e715caa3..ffe5d22ed 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 8a132ac43..111447203 100644
--- a/src/logic/CommandsInterpreter.hpp
+++ b/src/logic/CommandsInterpreter.hpp
@@ -1,12 +1,11 @@
-#ifndef LOGIC_COMMANDS_INTERPRETER_HPP_
-#define LOGIC_COMMANDS_INTERPRETER_HPP_
+#pragma once
 
 #include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <data/dynamic.hpp>
+#include "data/dynamic.hpp"
 
 namespace cmd {
     enum class ArgType { number, integer, enumvalue, selector, string };
@@ -159,5 +158,3 @@ namespace cmd {
         }
     };
 }
-
-#endif  // LOGIC_COMMANDS_INTERPRETER_HPP_
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index 5d000a1ef..b68b476e9 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/EngineController.hpp b/src/logic/EngineController.hpp
index c548b94fc..96b8f0995 100644
--- a/src/logic/EngineController.hpp
+++ b/src/logic/EngineController.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_ENGINE_CONTROLLER_HPP_
-#define LOGIC_ENGINE_CONTROLLER_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -36,5 +35,3 @@ public:
 
     void reopenWorld(World* world);
 };
-
-#endif  // LOGIC_ENGINE_CONTROLLER_HPP_
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index 8c82cd70e..1badb0dc1 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/LevelController.hpp b/src/logic/LevelController.hpp
index 6251e58d9..fe16ed193 100644
--- a/src/logic/LevelController.hpp
+++ b/src/logic/LevelController.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_LEVEL_CONTROLLER_HPP_
-#define LOGIC_LEVEL_CONTROLLER_HPP_
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@ public:
     BlocksController* getBlocksController();
     PlayerController* getPlayerController();
 };
-
-#endif  // LOGIC_LEVEL_CONTROLLER_HPP_
diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 499ba7f9d..d567c3743 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 f8b133954..306e23361 100644
--- a/src/logic/PlayerController.hpp
+++ b/src/logic/PlayerController.hpp
@@ -1,11 +1,10 @@
-#ifndef PLAYER_CONTROL_HPP_
-#define PLAYER_CONTROL_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
 #include <vector>
 
-#include <objects/Player.hpp>
+#include "objects/Player.hpp"
 
 class Camera;
 class Level;
@@ -74,5 +73,3 @@ public:
     void postUpdate(float delta, bool input, bool pause);
     Player* getPlayer();
 };
-
-#endif /* PLAYER_CONTROL_HPP_ */
diff --git a/src/logic/scripting/lua/api_lua.hpp b/src/logic/scripting/lua/api_lua.hpp
index 3ef61650d..68a95cb86 100644
--- a/src/logic/scripting/lua/api_lua.hpp
+++ b/src/logic/scripting/lua/api_lua.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_SCRIPTING_API_LUA_HPP_
-#define LOGIC_SCRIPTING_API_LUA_HPP_
+#pragma once
 
 #include <exception>
 #include <string>
@@ -74,5 +73,3 @@ namespace lua {
 }
 
 void initialize_libs_extends(lua::State* L);
-
-#endif  // LOGIC_SCRIPTING_API_LUA_HPP_
diff --git a/src/logic/scripting/lua/lib__rigidbody.cpp b/src/logic/scripting/lua/lib__rigidbody.cpp
index b9f6f7826..bb58e448d 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 041183edd..9c6295d24 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 8c6a31777..03214e6e9 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 a07205392..af4cae481 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 b3eff98c6..9f3e1c8e8 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 3202bc1dd..abaf1cbdb 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 7a9547d3b..2e1034a04 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 a4e144766..f952a83dc 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 5325a6ef5..b7708f02f 100644
--- a/src/logic/scripting/lua/libentity.hpp
+++ b/src/logic/scripting/lua/libentity.hpp
@@ -1,12 +1,11 @@
-#ifndef LOGIC_SCRIPTING_LUA_LIBENTITY_HPP_
-#define LOGIC_SCRIPTING_LUA_LIBENTITY_HPP_
+#pragma once
 
 #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 {
@@ -18,5 +17,3 @@ inline std::optional<Entity> get_entity(lua::State* L, int idx) {
     auto level = scripting::controller->getLevel();
     return level->entities->get(id);
 }
-
-#endif  // LOGIC_SCRIPTING_LUA_LIBENTITY_HPP_
diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp
index 2066cb8ce..5da4358d4 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 690c37bb5..460b1cafd 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 55d3e073d..91edca3ef 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 dfe919529..bfa0af2df 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 1555ee387..bc5abd47f 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 5e203fa86..fc66b6ffb 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 ec9d13813..a0e394f5a 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 108ac1960..bc9bb2041 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 fa0b7609d..943e12da5 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 a4eeb0ab3..93708dda5 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 bc3e8b4bf..6aa2e1a75 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 0581f71a6..ab87ee1c3 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 64b6c1bbd..f9fb859a1 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 de7d641a4..d0b99f67f 100644
--- a/src/logic/scripting/lua/lua_commons.hpp
+++ b/src/logic/scripting/lua/lua_commons.hpp
@@ -1,8 +1,7 @@
-#ifndef LOGIC_SCRIPTING_LUA_HPP_
-#define LOGIC_SCRIPTING_LUA_HPP_
+#pragma once
 
-#include <delegates.hpp>
-#include <logic/scripting/scripting.hpp>
+#include "delegates.hpp"
+#include "logic/scripting/scripting.hpp"
 
 #ifdef __linux__
 #include <luajit-2.1/luaconf.h>
@@ -31,5 +30,3 @@ namespace lua {
     using Number = lua_Number;
     using Integer = lua_Integer;
 }
-
-#endif  // LOGIC_SCRIPTING_LUA_HPP_
diff --git a/src/logic/scripting/lua/lua_custom_types.hpp b/src/logic/scripting/lua/lua_custom_types.hpp
index a3f9427b4..4b603aca7 100644
--- a/src/logic/scripting/lua/lua_custom_types.hpp
+++ b/src/logic/scripting/lua/lua_custom_types.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_SCRIPTING_LUA_LUA_CUSTOM_TYPES_HPP_
-#define LOGIC_SCRIPTING_LUA_LUA_CUSTOM_TYPES_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
@@ -31,5 +30,3 @@ namespace lua {
         inline static std::string TYPENAME = "bytearray";
     };
 }
-
-#endif  // LOGIC_SCRIPTING_LUA_LUA_CUSTOM_TYPES_HPP_
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index 7ae59f102..01df4ea96 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 351123397..1a36fab5a 100644
--- a/src/logic/scripting/lua/lua_engine.hpp
+++ b/src/logic/scripting/lua/lua_engine.hpp
@@ -1,12 +1,11 @@
-#ifndef LOGIC_SCRIPTING_LUA_STATE_HPP_
-#define LOGIC_SCRIPTING_LUA_STATE_HPP_
+#pragma once
 
 #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 {
@@ -20,5 +19,3 @@ namespace lua {
     );
     lua::State* get_main_thread();
 }
-
-#endif  // LOGIC_SCRIPTING_LUA_STATE_HPP_
diff --git a/src/logic/scripting/lua/lua_extensions.cpp b/src/logic/scripting/lua/lua_extensions.cpp
index a1667e218..cb095e9f3 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 25c51caa4..a6b934aab 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/lua/lua_util.hpp b/src/logic/scripting/lua/lua_util.hpp
index aa111bb1b..0822e5bcf 100644
--- a/src/logic/scripting/lua/lua_util.hpp
+++ b/src/logic/scripting/lua/lua_util.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_SCRIPTING_LUA_UTIL_HPP_
-#define LOGIC_SCRIPTING_LUA_UTIL_HPP_
+#pragma once
 
 #include <typeindex>
 #include <typeinfo>
@@ -639,5 +638,3 @@ namespace lua {
         setglobal(L, name);
     }
 }
-
-#endif  // LOGIC_SCRIPTING_LUA_UTIL_HPP_
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index 27c665354..05beaa32e 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 45e6ecf9a..94723f057 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -1,5 +1,4 @@
-#ifndef LOGIC_SCRIPTING_SCRIPTING_HPP_
-#define LOGIC_SCRIPTING_SCRIPTING_HPP_
+#pragma once
 
 #include <filesystem>
 #include <glm/glm.hpp>
@@ -7,9 +6,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;
@@ -171,5 +170,3 @@ namespace scripting {
     /// @brief Finalize lua state. Using scripting after will lead to Lua panic
     void close();
 }
-
-#endif  // LOGIC_SCRIPTING_SCRIPTING_HPP_
diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp
index 9f7e294eb..30c31b548 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 19da0fa70..e1d400402 100644
--- a/src/logic/scripting/scripting_functional.hpp
+++ b/src/logic/scripting/scripting_functional.hpp
@@ -1,12 +1,11 @@
-#ifndef LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
-#define LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
+#pragma once
 
 #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 =
@@ -78,5 +77,3 @@ namespace scripting {
         const std::string& file = "<string>"
     );
 }
-
-#endif  // LOGIC_SCRIPTING_SCRIPTING_FUNCTIONAL_HPP_
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index 540f08df8..f48e42da7 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 1b8e9ae2f..c2d9b7f5a 100644
--- a/src/logic/scripting/scripting_hud.hpp
+++ b/src/logic/scripting/scripting_hud.hpp
@@ -1,10 +1,9 @@
-#ifndef LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
-#define LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
+#pragma once
 
 #include <filesystem>
 #include <string>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace fs = std::filesystem;
 
@@ -27,5 +26,3 @@ namespace scripting {
         const scriptenv &env, const std::string &packid, const fs::path &file
     );
 }
-
-#endif  // LOGIC_SCRIPTING_SCRIPTING_HUD_HPP_
diff --git a/src/maths/FrustumCulling.hpp b/src/maths/FrustumCulling.hpp
index 00cd9686f..27d62a52d 100644
--- a/src/maths/FrustumCulling.hpp
+++ b/src/maths/FrustumCulling.hpp
@@ -1,5 +1,4 @@
-#ifndef MATHS_FRUSTUM_CULLING_HPP_
-#define MATHS_FRUSTUM_CULLING_HPP_
+#pragma once
 
 #include <glm/matrix.hpp>
 
@@ -128,5 +127,3 @@ inline glm::vec3 Frustum::intersection(const glm::vec3* crosses) const {
                     glm::vec3(m_planes[a].w, m_planes[b].w, m_planes[c].w);
     return res * (-1.0f / D);
 }
-
-#endif  // MATHS_FRUSTUM_CULLING_HPP_
diff --git a/src/maths/LMPacker.hpp b/src/maths/LMPacker.hpp
index 5eb86ee71..b27b80592 100644
--- a/src/maths/LMPacker.hpp
+++ b/src/maths/LMPacker.hpp
@@ -1,7 +1,6 @@
 ///    C++ LMPacker port
 ///        https://github.com/MihailRis/LMPacker
-#ifndef LMPACKER_HPP_
-#define LMPACKER_HPP_
+#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -59,5 +58,3 @@ public:
         return rects;
     }
 };
-
-#endif  // LMPACKER_HPP_
diff --git a/src/maths/UVRegion.hpp b/src/maths/UVRegion.hpp
index 21f7694ea..ec58dfb5a 100644
--- a/src/maths/UVRegion.hpp
+++ b/src/maths/UVRegion.hpp
@@ -1,5 +1,4 @@
-#ifndef MATHS_UVREGION_HPP_
-#define MATHS_UVREGION_HPP_
+#pragma once
 
 #include <cmath>
 
@@ -24,5 +23,3 @@ struct UVRegion {
         return fabs(v2 - v1);
     }
 };
-
-#endif  // MATHS_UVREGION_HPP_
diff --git a/src/maths/aabb.hpp b/src/maths/aabb.hpp
index 34f97383b..6354d7a81 100644
--- a/src/maths/aabb.hpp
+++ b/src/maths/aabb.hpp
@@ -1,5 +1,4 @@
-#ifndef MATHS_AABB_HPP_
-#define MATHS_AABB_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 
@@ -103,5 +102,3 @@ struct AABB {
         );
     }
 };
-
-#endif  // MATHS_AABB_HPP_
diff --git a/src/maths/fastmaths.hpp b/src/maths/fastmaths.hpp
index 4c03fd61b..d0dcbb8e5 100644
--- a/src/maths/fastmaths.hpp
+++ b/src/maths/fastmaths.hpp
@@ -1,7 +1,6 @@
-#ifndef MATHS_FASTMATHS_HPP_
-#define MATHS_FASTMATHS_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class FastRandom {
     uint seed;
@@ -19,5 +18,3 @@ public:
         return rand() / float(0x7FFF);
     }
 };
-
-#endif  // MATHS_FASTMATHS_HPP_
diff --git a/src/maths/rays.cpp b/src/maths/rays.cpp
index d47850ee5..d332b181f 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 7d053267e..f7e916e34 100644
--- a/src/maths/rays.hpp
+++ b/src/maths/rays.hpp
@@ -1,12 +1,11 @@
-#ifndef MATHS_RAYS_HPP_
-#define MATHS_RAYS_HPP_
+#pragma once
 
 #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;
@@ -76,5 +75,3 @@ public:
         scalar_t& distance_ret
     );
 };
-
-#endif  // SRC_VOXNATHS_HPP_
diff --git a/src/maths/util.hpp b/src/maths/util.hpp
index d6a14f7e2..5e671082d 100644
--- a/src/maths/util.hpp
+++ b/src/maths/util.hpp
@@ -1,5 +1,4 @@
-#ifndef MATHS_UTIL_HPP_
-#define MATHS_UTIL_HPP_
+#pragma once
 
 #include <stdint.h>
 
@@ -51,5 +50,3 @@ public:
         rand();
     }
 };
-
-#endif  // MATHS_UTIL_HPP_
diff --git a/src/maths/voxmaths.hpp b/src/maths/voxmaths.hpp
index bd11e79bb..07b42e221 100644
--- a/src/maths/voxmaths.hpp
+++ b/src/maths/voxmaths.hpp
@@ -1,51 +1,17 @@
-#ifndef VOXNATHS_HPP_
-#define VOXNATHS_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
-inline int floordiv(int a, int b) {
+inline constexpr int floordiv(int a, int b) {
     if (a < 0 && a % b) {
         return (a / b) - 1;
     }
     return a / b;
 }
 
-inline int ceildiv(int a, int b) {
+inline constexpr int ceildiv(int a, int b) {
     if (a > 0 && a % b) {
         return a / b + 1;
     }
     return a / b;
 }
-
-inline int max(int a, int b) {
-    return (a > b) ? a : b;
-}
-
-inline int min(int a, int b) {
-    return (a < b) ? a : b;
-}
-
-inline int64_t max(int64_t a, int64_t b) {
-    return (a > b) ? a : b;
-}
-
-inline int64_t min(int64_t a, int64_t b) {
-    return (a < b) ? a : b;
-}
-
-static unsigned int g_seed;
-
-inline void fast_srand(int seed) {
-    g_seed = seed;
-}
-
-inline int fast_rand(void) {
-    g_seed = (214013 * g_seed + 2531011);
-    return (g_seed >> 16) & 0x7FFF;
-}
-
-inline light_t light_pack(ubyte r, ubyte g, ubyte b, ubyte s) {
-    return r | (g << 4) | (b << 8) | (s << 12);
-}
-
-#endif  // VOXNATHS_HPP_
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 231cc6858..cbb023ccc 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 4ab157c3c..adf36ce5e 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -1,15 +1,14 @@
-#ifndef OBJECTS_ENTITIES_HPP_
-#define OBJECTS_ENTITIES_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
 #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>
@@ -256,5 +255,3 @@ public:
         return nextID;
     }
 };
-
-#endif  // OBJECTS_ENTITIES_HPP_
diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp
index dfaced898..021c67f1a 100644
--- a/src/objects/EntityDef.hpp
+++ b/src/objects/EntityDef.hpp
@@ -1,13 +1,12 @@
-#ifndef OBJECTS_ENTITY_DEF_HPP_
-#define OBJECTS_ENTITY_DEF_HPP_
+#pragma once
 
 #include <string>
 #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;
@@ -58,5 +57,3 @@ struct EntityDef {
     EntityDef(const std::string& name) : name(name) {}
     EntityDef(const EntityDef&) = delete;
 };
-
-#endif // OBJECTS_ENTITY_DEF_HPP_
diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index b30f74cab..74fad257a 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 61c8ae7fc..94ce30968 100644
--- a/src/objects/Player.hpp
+++ b/src/objects/Player.hpp
@@ -1,15 +1,14 @@
-#ifndef SRC_OBJECTS_PLAYER_HPP_
-#define SRC_OBJECTS_PLAYER_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #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;
@@ -113,5 +112,3 @@ public:
         return objectUID;
     }
 };
-
-#endif  // SRC_OBJECTS_PLAYER_HPP_
diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp
index 2987a7400..3f36daf3f 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 0abf1fb14..ca9ec5deb 100644
--- a/src/objects/rigging.hpp
+++ b/src/objects/rigging.hpp
@@ -1,5 +1,4 @@
-#ifndef OBJECTS_RIGGING_HPP_
-#define OBJECTS_RIGGING_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
@@ -7,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class Assets;
 class ModelBatch;
@@ -141,5 +140,3 @@ namespace rigging {
         }
     };
 };
-
-#endif  // OBJECTS_RIGGING_HPP_
diff --git a/src/physics/Hitbox.hpp b/src/physics/Hitbox.hpp
index 37db8d743..2c5a4e787 100644
--- a/src/physics/Hitbox.hpp
+++ b/src/physics/Hitbox.hpp
@@ -1,8 +1,7 @@
-#ifndef PHYSICS_HITBOX_HPP_
-#define PHYSICS_HITBOX_HPP_
+#pragma once
 
-#include <maths/aabb.hpp>
-#include <typedefs.hpp>
+#include "maths/aabb.hpp"
+#include "typedefs.hpp"
 
 #include <set>
 #include <string>
@@ -62,5 +61,3 @@ struct Hitbox {
         return AABB(position-halfsize, position+halfsize);
     }
 };
-
-#endif // PHYSICS_HITBOX_HPP_
diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp
index f5e75269e..3fec4b1c9 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>
@@ -238,7 +238,7 @@ void PhysicsSolver::colisionCalc(
                     vel.y = 0.0f;
                     float newy = std::floor(y) + aabb->max().y + half.y;
                     if (std::abs(newy-pos.y) <= MAX_FIX+stepHeight) {
-                        pos.y = newy;	
+                        pos.y = newy;    
                     }
                     break;
                 }
diff --git a/src/physics/PhysicsSolver.hpp b/src/physics/PhysicsSolver.hpp
index b50a751a8..35f8158e4 100644
--- a/src/physics/PhysicsSolver.hpp
+++ b/src/physics/PhysicsSolver.hpp
@@ -1,10 +1,9 @@
-#ifndef PHYSICS_PHYSICSSOLVER_HPP_
-#define PHYSICS_PHYSICSSOLVER_HPP_
+#pragma once
 
 #include "Hitbox.hpp"
 
-#include <typedefs.hpp>
-#include <voxels/voxel.hpp>
+#include "typedefs.hpp"
+#include "voxels/voxel.hpp"
 
 #include <vector>
 #include <glm/glm.hpp>
@@ -42,5 +41,3 @@ public:
 
     void removeSensor(Sensor* sensor);
 };
-
-#endif // PHYSICS_PHYSICSSOLVER_HPP_
diff --git a/src/settings.hpp b/src/settings.hpp
index 486a3f2d8..dcf5086b2 100644
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -1,12 +1,11 @@
-#ifndef SETTINGS_HPP_
-#define SETTINGS_HPP_
+#pragma once
 
 #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
@@ -87,5 +86,3 @@ struct EngineSettings {
     DebugSettings debug;
     UiSettings ui;
 };
-
-#endif // SETTINGS_HPP_
diff --git a/src/typedefs.hpp b/src/typedefs.hpp
index 0d8b9b6e2..3925d277e 100644
--- a/src/typedefs.hpp
+++ b/src/typedefs.hpp
@@ -1,5 +1,4 @@
-#ifndef TYPEDEFS_HPP_
-#define TYPEDEFS_HPP_
+#pragma once
 
 #include <memory>
 #include <stdint.h>
@@ -25,5 +24,3 @@ using entityid_t = uint64_t;
 using itemcount_t = uint32_t;
 using blockstate_t = uint16_t;
 using light_t = uint16_t;
-
-#endif // TYPEDEFS_HPP_
diff --git a/src/util/BufferPool.hpp b/src/util/BufferPool.hpp
index cf7b0412c..0d775b901 100644
--- a/src/util/BufferPool.hpp
+++ b/src/util/BufferPool.hpp
@@ -1,12 +1,11 @@
-#ifndef UTIL_BUFFER_POOL_HPP_
-#define UTIL_BUFFER_POOL_HPP_
+#pragma once
 
 #include <memory>
 #include <mutex>
 #include <queue>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace util {
     /// @brief Thread-safe pool of same-sized buffers
@@ -38,5 +37,3 @@ namespace util {
         }
     };
 }
-
-#endif  // UTIL_BUFFER_POOL_HPP_
diff --git a/src/util/Clock.hpp b/src/util/Clock.hpp
index 8fb45cfb9..37c5f4ebf 100644
--- a/src/util/Clock.hpp
+++ b/src/util/Clock.hpp
@@ -1,5 +1,4 @@
-#ifndef UTIL_CLOCK_HPP_
-#define UTIL_CLOCK_HPP_
+#pragma once
 
 namespace util {
     class Clock {
@@ -20,5 +19,3 @@ namespace util {
         int getTickId() const;
     };
 }
-
-#endif  // UTIL_CLOCK_HPP_
diff --git a/src/util/ObjectsKeeper.hpp b/src/util/ObjectsKeeper.hpp
index 5a046408c..000c4fc10 100644
--- a/src/util/ObjectsKeeper.hpp
+++ b/src/util/ObjectsKeeper.hpp
@@ -1,5 +1,4 @@
-#ifndef UTIL_OBJECTS_KEEPER_HPP_
-#define UTIL_OBJECTS_KEEPER_HPP_
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -17,5 +16,3 @@ namespace util {
         }
     };
 }
-
-#endif  // UTIL_OBJECTS_KEEPER_HPP_
diff --git a/src/util/RunnablesList.hpp b/src/util/RunnablesList.hpp
index 7ae8af4f2..e655b42c5 100644
--- a/src/util/RunnablesList.hpp
+++ b/src/util/RunnablesList.hpp
@@ -1,12 +1,11 @@
-#ifndef UTIL_RUNNABLES_LIST_HPP_
-#define UTIL_RUNNABLES_LIST_HPP_
+#pragma once
 
 #include <memory>
 #include <unordered_map>
 #include <utility>
 
-#include <delegates.hpp>
-#include <typedefs.hpp>
+#include "delegates.hpp"
+#include "typedefs.hpp"
 
 namespace util {
     class RunnablesList {
@@ -29,5 +28,3 @@ namespace util {
         }
     };
 }
-
-#endif  // UTIL_RUNNABLES_LIST_HPP_
diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp
index 13ead840f..c375b4458 100644
--- a/src/util/ThreadPool.hpp
+++ b/src/util/ThreadPool.hpp
@@ -1,5 +1,4 @@
-#ifndef UTIL_THREAD_POOL_HPP_
-#define UTIL_THREAD_POOL_HPP_
+#pragma once
 
 #include <atomic>
 #include <chrono>
@@ -10,9 +9,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 {
 
@@ -255,5 +254,3 @@ namespace util {
     };
 
 }  // namespace util
-
-#endif  // UTIL_THREAD_POOL_HPP_
diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp
index f64789a4c..99501c12f 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/command_line.hpp b/src/util/command_line.hpp
index 0dd157d7f..9715c52df 100644
--- a/src/util/command_line.hpp
+++ b/src/util/command_line.hpp
@@ -1,9 +1,6 @@
-#ifndef UTIL_COMMAND_LINE_HPP_
-#define UTIL_COMMAND_LINE_HPP_
+#pragma once
 
 class EnginePaths;
 
 /// @return false if engine start can
 bool parse_cmdline(int argc, char** argv, EnginePaths& paths);
-
-#endif  // UTIL_COMMAND_LINE_HPP_
diff --git a/src/util/data_io.hpp b/src/util/data_io.hpp
index 9aa1248cd..c36007b5b 100644
--- a/src/util/data_io.hpp
+++ b/src/util/data_io.hpp
@@ -1,7 +1,6 @@
-#ifndef UTIL_DATA_IO_HPP_
-#define UTIL_DATA_IO_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace dataio {
     /* Read big-endian 16 bit signed integer from bytes */
@@ -47,5 +46,3 @@ namespace dataio {
         dest[offset + 7] = (char)(value >> 0 & 255);
     }
 }
-
-#endif  // UTIL_DATA_IO_HPP_
diff --git a/src/util/listutil.hpp b/src/util/listutil.hpp
index dc96b9452..dec9499b9 100644
--- a/src/util/listutil.hpp
+++ b/src/util/listutil.hpp
@@ -1,5 +1,4 @@
-#ifndef UTIL_LISTUTIL_HPP_
-#define UTIL_LISTUTIL_HPP_
+#pragma once
 
 #include <algorithm>
 #include <queue>
@@ -14,5 +13,3 @@ namespace util {
 
     std::string to_string(const std::vector<std::string>& vec);
 }
-
-#endif  // UTIL_LISTUTIL_HPP_
diff --git a/src/util/platform.cpp b/src/util/platform.cpp
index 9f50d97d7..b749718d2 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/platform.hpp b/src/util/platform.hpp
index 8b04ed5fb..a620acad2 100644
--- a/src/util/platform.hpp
+++ b/src/util/platform.hpp
@@ -1,5 +1,4 @@
-#ifndef UTIL_PLATFORM_HPP_
-#define UTIL_PLATFORM_HPP_
+#pragma once
 
 #include <string>
 
@@ -8,5 +7,3 @@ namespace platform {
     // @return environment locale in ISO format ll_CC
     std::string detect_locale();
 }
-
-#endif  // UTIL_PLATFORM_HPP_
diff --git a/src/util/stringutil.hpp b/src/util/stringutil.hpp
index 04de47a87..54a0a5e27 100644
--- a/src/util/stringutil.hpp
+++ b/src/util/stringutil.hpp
@@ -1,10 +1,9 @@
-#ifndef UTIL_STRINGUTIL_HPP_
-#define UTIL_STRINGUTIL_HPP_
+#pragma once
 
 #include <string>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace util {
     /// @brief Function used for string serialization in text formats
@@ -62,5 +61,3 @@ namespace util {
 
     std::pair<std::string, std::string> split_at(std::string_view view, char c);
 }
-
-#endif  // UTIL_STRINGUTIL_HPP_
diff --git a/src/util/timeutil.hpp b/src/util/timeutil.hpp
index b92d84d45..514e745c1 100644
--- a/src/util/timeutil.hpp
+++ b/src/util/timeutil.hpp
@@ -1,9 +1,8 @@
-#ifndef UTIL_TIMEUTIL_HPP_
-#define UTIL_TIMEUTIL_HPP_
+#pragma once
 
 #include <chrono>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 namespace timeutil {
     class Timer {
@@ -34,5 +33,3 @@ namespace timeutil {
 
     void from_value(float value, int& hour, int& minute, int& second);
 }
-
-#endif  // UTIL_TIMEUTIL_HPP_
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index 584f6214b..c6a2ec7ed 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 0586ac1c4..aee744a12 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 feb7f5cf6..a32ddd1cd 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -1,14 +1,13 @@
-#ifndef VOXELS_BLOCK_HPP_
-#define VOXELS_BLOCK_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <optional>
 #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";
 
@@ -217,5 +216,3 @@ public:
 inline glm::ivec3 get_ground_direction(const Block& def, int rotation) {
     return -def.rotations.variants[rotation].axisY;
 }
-
-#endif  // VOXELS_BLOCK_HPP_
diff --git a/src/voxels/Chunk.cpp b/src/voxels/Chunk.cpp
index 5e35d61fb..789326596 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 206542bc0..14ead9641 100644
--- a/src/voxels/Chunk.hpp
+++ b/src/voxels/Chunk.hpp
@@ -1,13 +1,12 @@
-#ifndef VOXELS_CHUNK_HPP_
-#define VOXELS_CHUNK_HPP_
+#pragma once
 
 #include <stdlib.h>
 
 #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;
@@ -74,5 +73,3 @@ public:
 
     static void convert(ubyte* data, const ContentLUT* lut);
 };
-
-#endif /* VOXELS_CHUNK_HPP_ */
diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp
index 2725cc9b5..417ba7860 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"
@@ -656,7 +656,7 @@ void Chunks::translate(int32_t dx, int32_t dz) {
     }
     for (uint32_t z = 0; z < d; z++) {
         for (uint32_t x = 0; x < w; x++) {
-            auto chunk = chunks[z * w + x];
+            auto& chunk = chunks[z * w + x];
             int nx = x - dx;
             int nz = z - dz;
             if (chunk == nullptr) continue;
diff --git a/src/voxels/Chunks.hpp b/src/voxels/Chunks.hpp
index 73fea7ab0..d17cf9b95 100644
--- a/src/voxels/Chunks.hpp
+++ b/src/voxels/Chunks.hpp
@@ -1,5 +1,4 @@
-#ifndef VOXELS_CHUNKS_HPP_
-#define VOXELS_CHUNKS_HPP_
+#pragma once
 
 #include <stdlib.h>
 
@@ -7,7 +6,7 @@
 #include <memory>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "voxel.hpp"
 
 class VoxelRenderer;
@@ -115,5 +114,3 @@ public:
     void save(Chunk* chunk);
     void saveAll();
 };
-
-#endif  // VOXELS_CHUNKS_HPP_
diff --git a/src/voxels/ChunksStorage.cpp b/src/voxels/ChunksStorage.cpp
index 19989e52f..9bc0a4f69 100644
--- a/src/voxels/ChunksStorage.cpp
+++ b/src/voxels/ChunksStorage.cpp
@@ -1,15 +1,17 @@
 #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 <algorithm>
+
+#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"
@@ -115,12 +117,12 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
             if (found == chunksMap.end()) {
                 // no chunk loaded -> filling with BLOCK_VOID
                 for (int ly = y; ly < y + h; ly++) {
-                    for (int lz = max(z, cz * CHUNK_D);
-                         lz < min(z + d, (cz + 1) * CHUNK_D);
-                         lz++) {
-                        for (int lx = max(x, cx * CHUNK_W);
-                             lx < min(x + w, (cx + 1) * CHUNK_W);
-                             lx++) {
+                    for (int lz = std::max(z, cz * CHUNK_D);
+                             lz < std::min(z + d, (cz + 1) * CHUNK_D);
+                             lz++) {
+                        for (int lx = std::max(x, cx * CHUNK_W);
+                                 lx < std::min(x + w, (cx + 1) * CHUNK_W);
+                                 lx++) {
                             uint idx = vox_index(lx - x, ly - y, lz - z, w, d);
                             voxels[idx].id = BLOCK_VOID;
                             lights[idx] = 0;
@@ -132,12 +134,12 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
                 const voxel* cvoxels = chunk->voxels;
                 const light_t* clights = chunk->lightmap.getLights();
                 for (int ly = y; ly < y + h; ly++) {
-                    for (int lz = max(z, cz * CHUNK_D);
-                         lz < min(z + d, (cz + 1) * CHUNK_D);
-                         lz++) {
-                        for (int lx = max(x, cx * CHUNK_W);
-                             lx < min(x + w, (cx + 1) * CHUNK_W);
-                             lx++) {
+                    for (int lz = std::max(z, cz * CHUNK_D);
+                             lz < std::min(z + d, (cz + 1) * CHUNK_D);
+                             lz++) {
+                        for (int lx = std::max(x, cx * CHUNK_W);
+                                 lx < std::min(x + w, (cx + 1) * CHUNK_W);
+                                 lx++) {
                             uint vidx = vox_index(lx - x, ly - y, lz - z, w, d);
                             uint cidx = vox_index(
                                 lx - cx * CHUNK_W,
@@ -149,17 +151,18 @@ void ChunksStorage::getVoxels(VoxelsVolume* volume, bool backlight) const {
                             voxels[vidx] = cvoxels[cidx];
                             light_t light = clights[cidx];
                             if (backlight) {
-                                const auto& block =
-                                    indices->blocks.require(voxels[vidx].id);
-                                if (block.lightPassing) { //-V522
+                                const auto block =
+                                    indices->blocks.get(voxels[vidx].id);
+                                if (block && block->lightPassing) {
                                     light = Lightmap::combine(
-                                        min(15,
+                                        std::min(15,
                                             Lightmap::extract(light, 0) + 1),
-                                        min(15,
+                                        std::min(15,
                                             Lightmap::extract(light, 1) + 1),
-                                        min(15,
+                                        std::min(15,
                                             Lightmap::extract(light, 2) + 1),
-                                        min(15, Lightmap::extract(light, 3))
+                                        std::min(15, 
+                                            static_cast<int>(Lightmap::extract(light, 3)))
                                     );
                                 }
                             }
diff --git a/src/voxels/ChunksStorage.hpp b/src/voxels/ChunksStorage.hpp
index 8b4253501..887af1ca2 100644
--- a/src/voxels/ChunksStorage.hpp
+++ b/src/voxels/ChunksStorage.hpp
@@ -1,14 +1,13 @@
-#ifndef VOXELS_CHUNKSSTORAGE_HPP_
-#define VOXELS_CHUNKSSTORAGE_HPP_
+#pragma once
 
 #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;
@@ -27,5 +26,3 @@ public:
     void getVoxels(VoxelsVolume* volume, bool backlight = false) const;
     std::shared_ptr<Chunk> create(int x, int z);
 };
-
-#endif  // VOXELS_CHUNKSSTORAGE_HPP_
diff --git a/src/voxels/DefaultWorldGenerator.cpp b/src/voxels/DefaultWorldGenerator.cpp
index ed76d0f2a..dc5361e83 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 2e1070f98..a53770c8d 100644
--- a/src/voxels/DefaultWorldGenerator.hpp
+++ b/src/voxels/DefaultWorldGenerator.hpp
@@ -1,7 +1,6 @@
-#ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
-#define VOXELS_DEFAULTWORLDGENERATOR_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "WorldGenerator.hpp"
 
 struct voxel;
@@ -14,5 +13,3 @@ public:
 
     void generate(voxel* voxels, int x, int z, int seed);
 };
-
-#endif  // VOXELS_DEFAULTWORLDGENERATOR_HPP_
diff --git a/src/voxels/FlatWorldGenerator.cpp b/src/voxels/FlatWorldGenerator.cpp
index 61884fee4..d97ab5456 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 33b9edaea..8d10ae4b0 100644
--- a/src/voxels/FlatWorldGenerator.hpp
+++ b/src/voxels/FlatWorldGenerator.hpp
@@ -1,7 +1,6 @@
-#ifndef VOXELS_FLATWORLDGENERATOR_HPP_
-#define VOXELS_FLATWORLDGENERATOR_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "WorldGenerator.hpp"
 
 struct voxel;
@@ -14,5 +13,3 @@ public:
 
     void generate(voxel* voxels, int x, int z, int seed);
 };
-
-#endif  // VOXELS_FLATWORLDGENERATOR_HPP_
diff --git a/src/voxels/VoxelsVolume.hpp b/src/voxels/VoxelsVolume.hpp
index 8bf0016f6..1a7e2b50a 100644
--- a/src/voxels/VoxelsVolume.hpp
+++ b/src/voxels/VoxelsVolume.hpp
@@ -1,8 +1,7 @@
-#ifndef VOXELS_VOXELSVOLUME_HPP_
-#define VOXELS_VOXELSVOLUME_HPP_
+#pragma once
 
-#include <constants.hpp>
-#include <typedefs.hpp>
+#include "constants.hpp"
+#include "typedefs.hpp"
 #include "voxel.hpp"
 
 class VoxelsVolume {
@@ -65,5 +64,3 @@ public:
         return lights[vox_index(bx - x, by - y, bz - z, w, d)];
     }
 };
-
-#endif  // VOXELS_VOXELSVOLUME_HPP_
diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp
index bb4af8702..525a04ca9 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 b404dd589..7a8c98f3f 100644
--- a/src/voxels/WorldGenerator.hpp
+++ b/src/voxels/WorldGenerator.hpp
@@ -1,9 +1,8 @@
-#ifndef VOXELS_WORLDGENERATOR_HPP_
-#define VOXELS_WORLDGENERATOR_HPP_
+#pragma once
 
 #include <string>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 struct voxel;
 class Content;
@@ -26,5 +25,3 @@ public:
 
     virtual void generate(voxel* voxels, int x, int z, int seed) = 0;
 };
-
-#endif  // VOXELS_WORLDGENERATOR_HPP_
diff --git a/src/voxels/voxel.hpp b/src/voxels/voxel.hpp
index 9243dc89b..dcff106f1 100644
--- a/src/voxels/voxel.hpp
+++ b/src/voxels/voxel.hpp
@@ -1,7 +1,6 @@
-#ifndef VOXELS_VOXEL_HPP_
-#define VOXELS_VOXEL_HPP_
+#pragma once
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 inline constexpr int BLOCK_DIR_NORTH = 0x0;
 inline constexpr int BLOCK_DIR_WEST = 0x1;
@@ -40,5 +39,3 @@ struct voxel {
     blockstate state;
 };
 static_assert(sizeof(voxel) == 4);
-
-#endif  // VOXELS_VOXEL_HPP_
diff --git a/src/window/Camera.hpp b/src/window/Camera.hpp
index 2c2cccfeb..639a27df4 100644
--- a/src/window/Camera.hpp
+++ b/src/window/Camera.hpp
@@ -1,5 +1,4 @@
-#ifndef WINDOW_CAMERA_HPP_
-#define WINDOW_CAMERA_HPP_
+#pragma once
 
 #define GLM_FORCE_RADIANS
 #include <glm/glm.hpp>
@@ -35,5 +34,3 @@ public:
     void setFov(float fov);
     float getFov() const;
 };
-
-#endif  // WINDOW_CAMERA_HPP_
diff --git a/src/window/Events.cpp b/src/window/Events.cpp
index 2cb13087a..a88adcc5b 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 aa5b64e5a..230145a93 100644
--- a/src/window/Events.hpp
+++ b/src/window/Events.hpp
@@ -1,11 +1,10 @@
-#ifndef WINDOW_EVENTS_HPP_
-#define WINDOW_EVENTS_HPP_
+#pragma once
 
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 #include "input.hpp"
 
 inline constexpr short KEYS_BUFFER_SIZE = 1036;
@@ -56,5 +55,3 @@ public:
         const std::string& filename, const std::string& source
     );
 };
-
-#endif  // WINDOW_EVENTS_HPP_
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index 984a23e86..3c66451c3 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 e5214725c..78d63ebe5 100644
--- a/src/window/Window.hpp
+++ b/src/window/Window.hpp
@@ -1,12 +1,11 @@
-#ifndef WINDOW_WINDOW_HPP_
-#define WINDOW_WINDOW_HPP_
+#pragma once
 
 #include <glm/glm.hpp>
 #include <memory>
 #include <stack>
 #include <vector>
 
-#include <typedefs.hpp>
+#include "typedefs.hpp"
 
 class ImageData;
 struct DisplaySettings;
@@ -63,5 +62,3 @@ public:
 
     static std::unique_ptr<ImageData> takeScreenshot();
 };
-
-#endif  // WINDOW_WINDOW_HPP_
diff --git a/src/window/input.hpp b/src/window/input.hpp
index e9150b3fa..a90c8fe05 100644
--- a/src/window/input.hpp
+++ b/src/window/input.hpp
@@ -1,9 +1,8 @@
-#ifndef WINDOW_INPUT_HPP_
-#define WINDOW_INPUT_HPP_
+#pragma once
 
 #include <string>
 
-#include <util/RunnablesList.hpp>
+#include "util/RunnablesList.hpp"
 
 /// @brief Represents glfw3 keycode values.
 enum class keycode : int {
@@ -167,5 +166,3 @@ struct Binding {
         return "<unknown input type>";
     }
 };
-
-#endif  // WINDOW_INPUT_HPP_
diff --git a/src/world/Level.cpp b/src/world/Level.cpp
index 90e828a3a..3c8e9dba3 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 f7ea1e235..240dd808e 100644
--- a/src/world/Level.hpp
+++ b/src/world/Level.hpp
@@ -1,10 +1,9 @@
-#ifndef WORLD_LEVEL_HPP_
-#define WORLD_LEVEL_HPP_
+#pragma once
 
 #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;
@@ -85,5 +84,3 @@ public:
 
     std::shared_ptr<Camera> getCamera(const std::string& name);
 };
-
-#endif /* WORLD_LEVEL_HPP_ */
diff --git a/src/world/LevelEvents.cpp b/src/world/LevelEvents.cpp
index 9139dc373..00017cc66 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/LevelEvents.hpp b/src/world/LevelEvents.hpp
index 7e3247ed5..d0518b5ca 100644
--- a/src/world/LevelEvents.hpp
+++ b/src/world/LevelEvents.hpp
@@ -1,5 +1,4 @@
-#ifndef WORLD_LEVEL_EVENTS_HPP_
-#define WORLD_LEVEL_EVENTS_HPP_
+#pragma once
 
 #include <functional>
 #include <unordered_map>
@@ -20,5 +19,3 @@ public:
     void listen(lvl_event_type type, const chunk_event_func& func);
     void trigger(lvl_event_type type, Chunk* chunk);
 };
-
-#endif  // WORLD_LEVEL_EVENTS_HPP_
diff --git a/src/world/World.cpp b/src/world/World.cpp
index 8945d4944..e15837b88 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 e7e38a793..7f30e52c7 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -1,16 +1,15 @@
-#ifndef WORLD_WORLD_HPP_
-#define WORLD_WORLD_HPP_
+#pragma once
 
 #include <filesystem>
 #include <memory>
 #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;
@@ -152,5 +151,3 @@ public:
     std::unique_ptr<dynamic::Map> serialize() const override;
     void deserialize(dynamic::Map* src) override;
 };
-
-#endif  // WORLD_WORLD_HPP_
diff --git a/src/world/WorldGenerators.cpp b/src/world/WorldGenerators.cpp
index caa0174bd..c64ab7566 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 49afce15b..91c3a121f 100644
--- a/src/world/WorldGenerators.hpp
+++ b/src/world/WorldGenerators.hpp
@@ -1,11 +1,10 @@
-#ifndef WORLD_WORLDGENERATORS_HPP_
-#define WORLD_WORLDGENERATORS_HPP_
+#pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include <voxels/WorldGenerator.hpp>
+#include "voxels/WorldGenerator.hpp"
 
 class Content;
 
@@ -32,5 +31,3 @@ void WorldGenerators::addGenerator(std::string id) {
         return (WorldGenerator*)new T(content);
     };
 }
-
-#endif /* WORLD_WORLDGENERATORS_HPP_ */