diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index 544dcb10..33f48cf7 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -10,8 +10,8 @@
 
 #include "../constants.h"
 #include "../data/dynamic.h"
-#include "../debug/Logger.h"
-#include "../coders/imageio.h"
+#include "../debug/Logger.hpp"
+#include "../coders/imageio.hpp"
 #include "../files/files.h"
 #include "../files/engine_paths.h"
 #include "../content/Content.h"
diff --git a/src/assets/AssetsLoader.h b/src/assets/AssetsLoader.h
index 0ce278c2..89dfd559 100644
--- a/src/assets/AssetsLoader.h
+++ b/src/assets/AssetsLoader.h
@@ -2,7 +2,7 @@
 #define ASSETS_ASSETS_LOADER_H
 
 #include "Assets.h"
-#include "../interfaces/Task.h"
+#include "../interfaces/Task.hpp"
 #include "../typedefs.h"
 #include "../delegates.h"
 
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index f77de6e5..81514603 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -8,7 +8,7 @@
 #include "../audio/audio.h"
 #include "../files/files.h"
 #include "../files/engine_paths.h"
-#include "../coders/imageio.h"
+#include "../coders/imageio.hpp"
 #include "../coders/json.h"
 #include "../coders/GLSLExtension.h"
 #include "../graphics/core/Shader.hpp"
diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp
index b33aebf4..adca0023 100644
--- a/src/audio/AL/ALAudio.cpp
+++ b/src/audio/AL/ALAudio.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <iostream>
 
-#include "../../debug/Logger.h"
+#include "../../debug/Logger.hpp"
 
 static debug::Logger logger("al-audio");
 
diff --git a/src/coders/imageio.cpp b/src/coders/imageio.cpp
index 9700b6c0..89fb2518 100644
--- a/src/coders/imageio.cpp
+++ b/src/coders/imageio.cpp
@@ -1,4 +1,4 @@
-#include "imageio.h"
+#include "imageio.hpp"
 
 #include "png.h"
 #include "../graphics/core/ImageData.hpp"
diff --git a/src/coders/imageio.h b/src/coders/imageio.hpp
similarity index 81%
rename from src/coders/imageio.h
rename to src/coders/imageio.hpp
index afe75d4a..a05cfadc 100644
--- a/src/coders/imageio.h
+++ b/src/coders/imageio.hpp
@@ -1,5 +1,5 @@
-#ifndef CODERS_IMAGEIO_H_
-#define CODERS_IMAGEIO_H_
+#ifndef CODERS_IMAGEIO_HPP_
+#define CODERS_IMAGEIO_HPP_
 
 #include <string>
 #include <memory>
@@ -16,4 +16,4 @@ namespace imageio {
     void write(const std::string& filename, const ImageData* image);
 }
 
-#endif // CODERS_IMAGEIO_H_
+#endif // CODERS_IMAGEIO_HPP_
diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 20043c76..a4aee3d6 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -7,7 +7,7 @@
 #include <glm/glm.hpp>
 
 #include "Content.h"
-#include "../debug/Logger.h"
+#include "../debug/Logger.hpp"
 #include "../items/ItemDef.h"
 #include "../util/listutil.h"
 #include "../voxels/Block.h"
diff --git a/src/debug/Logger.cpp b/src/debug/Logger.cpp
index 03b50e21..c0f8ef38 100644
--- a/src/debug/Logger.cpp
+++ b/src/debug/Logger.cpp
@@ -1,4 +1,4 @@
-#include "Logger.h"
+#include "Logger.hpp"
  
 #include <ctime>
 #include <iomanip>
diff --git a/src/debug/Logger.h b/src/debug/Logger.hpp
similarity index 94%
rename from src/debug/Logger.h
rename to src/debug/Logger.hpp
index 60221a22..6bb2ff5c 100644
--- a/src/debug/Logger.h
+++ b/src/debug/Logger.hpp
@@ -1,5 +1,5 @@
-#ifndef DEBUG_LOGGER_H_
-#define DEBUG_LOGGER_H_
+#ifndef DEBUG_LOGGER_HPP_
+#define DEBUG_LOGGER_HPP_
 
 #include <sstream>
 #include <fstream>
@@ -63,4 +63,4 @@ namespace debug {
     };
 }
 
-#endif // DEBUG_LOGGER_H_
+#endif // DEBUG_LOGGER_HPP_
diff --git a/src/engine.cpp b/src/engine.cpp
index b29e2af1..3f717c98 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -2,10 +2,11 @@
 
 #define GLEW_STATIC
 
+#include "debug/Logger.hpp"
 #include "assets/AssetsLoader.h"
 #include "audio/audio.h"
 #include "coders/GLSLExtension.h"
-#include "coders/imageio.h"
+#include "coders/imageio.hpp"
 #include "coders/json.h"
 #include "content/ContentLoader.h"
 #include "core_defs.h"
@@ -18,7 +19,7 @@
 #include "graphics/core/GfxContext.hpp"
 #include "graphics/core/ImageData.hpp"
 #include "graphics/core/Shader.hpp"
-#include "graphics/ui/GUI.h"
+#include "graphics/ui/GUI.hpp"
 #include "logic/EngineController.hpp"
 #include "logic/scripting/scripting.h"
 #include "util/listutil.h"
@@ -37,8 +38,6 @@
 #include <unordered_set>
 #include <functional>
 
-#include "debug/Logger.h"
-
 static debug::Logger logger("engine");
 
 namespace fs = std::filesystem;
diff --git a/src/files/WorldConverter.cpp b/src/files/WorldConverter.cpp
index 7db2b917..b2e769a3 100644
--- a/src/files/WorldConverter.cpp
+++ b/src/files/WorldConverter.cpp
@@ -10,7 +10,7 @@
 #include "../voxels/Chunk.h"
 #include "../content/ContentLUT.h"
 #include "../objects/Player.h"
-#include "../debug/Logger.h"
+#include "../debug/Logger.hpp"
 #include "../util/ThreadPool.hpp"
 
 namespace fs = std::filesystem;
diff --git a/src/files/WorldConverter.h b/src/files/WorldConverter.h
index 9bc3f52a..b341fba4 100644
--- a/src/files/WorldConverter.h
+++ b/src/files/WorldConverter.h
@@ -7,7 +7,7 @@
 
 #include "../typedefs.h"
 #include "../delegates.h"
-#include "../interfaces/Task.h"
+#include "../interfaces/Task.hpp"
 
 namespace fs = std::filesystem;
 
diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp
index 94b24016..fb2ca206 100644
--- a/src/frontend/InventoryView.cpp
+++ b/src/frontend/InventoryView.cpp
@@ -367,7 +367,7 @@ void InventoryView::setInventory(std::shared_ptr<Inventory> inventory) {
 }
 
 #include "../coders/xml.h"
-#include "../graphics/ui/gui_xml.h"
+#include "../graphics/ui/gui_xml.hpp"
 
 static slotcallback readSlotFunc(InventoryView* view, gui::UiXmlReader& reader, xml::xmlelement& element, const std::string& attr) {
     auto consumer = scripting::create_int_array_consumer(
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index e241ebcf..a535961d 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -2,7 +2,7 @@
 
 #include "../files/files.h"
 #include "../graphics/ui/elements/UINode.hpp"
-#include "../graphics/ui/gui_xml.h"
+#include "../graphics/ui/gui_xml.hpp"
 #include "../logic/scripting/scripting.h"
 #include "InventoryView.h"
 
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index e6d53eb7..73ea45b9 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -19,7 +19,7 @@
 #include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/elements/Panel.hpp"
 #include "../graphics/ui/elements/Plotter.hpp"
-#include "../graphics/ui/GUI.h"
+#include "../graphics/ui/GUI.hpp"
 #include "../items/Inventories.h"
 #include "../items/Inventory.h"
 #include "../items/ItemDef.h"
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 40fdfb04..84ab5c44 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -6,11 +6,11 @@
 #include "../delegates.h"
 #include "../engine.h"
 #include "../data/dynamic.h"
-#include "../interfaces/Task.h"
+#include "../interfaces/Task.hpp"
 #include "../files/engine_paths.h"
 #include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/gui_util.h"
-#include "../graphics/ui/GUI.h"
+#include "../graphics/ui/gui_util.hpp"
+#include "../graphics/ui/GUI.hpp"
 #include "../logic/scripting/scripting.h"
 #include "../settings.h"
 #include "../util/stringutil.h"
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index 27493f58..652e0c8e 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -2,14 +2,14 @@
 
 #include "../hud.h"
 #include "../LevelFrontend.h"
-#include "../../debug/Logger.h"
+#include "../../debug/Logger.hpp"
 #include "../../audio/audio.h"
-#include "../../coders/imageio.h"
+#include "../../coders/imageio.hpp"
 #include "../../graphics/core/PostProcessing.h"
 #include "../../graphics/core/GfxContext.hpp"
 #include "../../graphics/core/Viewport.hpp"
 #include "../../graphics/core/ImageData.hpp"
-#include "../../graphics/ui/GUI.h"
+#include "../../graphics/ui/GUI.hpp"
 #include "../../graphics/ui/elements/Menu.hpp"
 #include "../../graphics/render/WorldRenderer.h"
 #include "../../logic/LevelController.h"
diff --git a/src/frontend/screens/MenuScreen.cpp b/src/frontend/screens/MenuScreen.cpp
index a3c88144..8d4ca80b 100644
--- a/src/frontend/screens/MenuScreen.cpp
+++ b/src/frontend/screens/MenuScreen.cpp
@@ -1,6 +1,6 @@
 #include "MenuScreen.hpp"
 
-#include "../../graphics/ui/GUI.h"
+#include "../../graphics/ui/GUI.hpp"
 #include "../../graphics/ui/elements/Menu.hpp"
 #include "../../graphics/core/Batch2D.hpp"
 #include "../../graphics/core/Shader.hpp"
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index fd4ffeb5..f0099b62 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -1,10 +1,10 @@
 #include "ChunksRenderer.h"
 
-#include "../../debug/Logger.h"
+#include "../../debug/Logger.hpp"
 #include "../../graphics/core/Mesh.hpp"
-#include "BlocksRenderer.h"
 #include "../../voxels/Chunk.h"
 #include "../../world/Level.h"
+#include "BlocksRenderer.h"
 
 #include <iostream>
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp
index d2f2c28f..60350a1f 100644
--- a/src/graphics/ui/GUI.cpp
+++ b/src/graphics/ui/GUI.cpp
@@ -1,4 +1,4 @@
-#include "GUI.h"
+#include "GUI.hpp"
 #include "elements/UINode.hpp"
 #include "elements/Menu.hpp"
 
diff --git a/src/graphics/ui/GUI.h b/src/graphics/ui/GUI.hpp
similarity index 95%
rename from src/graphics/ui/GUI.h
rename to src/graphics/ui/GUI.hpp
index 3dddfda9..85bdcdd8 100644
--- a/src/graphics/ui/GUI.h
+++ b/src/graphics/ui/GUI.hpp
@@ -1,5 +1,5 @@
-#ifndef FRONTEND_GUI_GUI_H_
-#define FRONTEND_GUI_GUI_H_
+#ifndef FRONTEND_GUI_GUI_HPP_
+#define FRONTEND_GUI_GUI_HPP_
 
 #include <queue>
 #include <memory>
@@ -128,4 +128,4 @@ namespace gui {
     };
 }
 
-#endif // FRONTEND_GUI_GUI_H_
+#endif // FRONTEND_GUI_GUI_HPP_
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 9748d572..af950907 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -1,8 +1,8 @@
-#include "gui_util.h"
+#include "gui_util.hpp"
 #include "elements/Label.hpp"
 #include "elements/Menu.hpp"
 #include "elements/Button.hpp"
-#include "gui_xml.h"
+#include "gui_xml.hpp"
 
 #include <glm/glm.hpp>
 
diff --git a/src/graphics/ui/gui_util.h b/src/graphics/ui/gui_util.hpp
similarity index 83%
rename from src/graphics/ui/gui_util.h
rename to src/graphics/ui/gui_util.hpp
index 6dfe75db..2862bea1 100644
--- a/src/graphics/ui/gui_util.h
+++ b/src/graphics/ui/gui_util.hpp
@@ -1,9 +1,9 @@
-#ifndef FRONTEND_GUI_GUI_UTIL_H_
-#define FRONTEND_GUI_GUI_UTIL_H_
+#ifndef FRONTEND_GUI_GUI_UTIL_HPP_
+#define FRONTEND_GUI_GUI_UTIL_HPP_
 
 #include <memory>
 #include <string>
-#include "GUI.h"
+#include "GUI.hpp"
 #include "../../typedefs.h"
 #include "../../delegates.h"
 
@@ -40,4 +40,4 @@ namespace guiutil {
         std::wstring notext=L"");
 }
 
-#endif // FRONTEND_GUI_GUI_UTIL_H_
+#endif // FRONTEND_GUI_GUI_UTIL_HPP_
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 3b762569..5e5e2dc8 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -1,4 +1,4 @@
-#include "gui_xml.h"
+#include "gui_xml.hpp"
 
 #include <charconv>
 #include <stdexcept>
diff --git a/src/graphics/ui/gui_xml.h b/src/graphics/ui/gui_xml.hpp
similarity index 92%
rename from src/graphics/ui/gui_xml.h
rename to src/graphics/ui/gui_xml.hpp
index 5d666f20..b7c42284 100644
--- a/src/graphics/ui/gui_xml.h
+++ b/src/graphics/ui/gui_xml.hpp
@@ -1,12 +1,12 @@
-#ifndef FRONTEND_GUI_GUI_XML_H_
-#define FRONTEND_GUI_GUI_XML_H_
+#ifndef FRONTEND_GUI_GUI_XML_HPP_
+#define FRONTEND_GUI_GUI_XML_HPP_
 
 #include <memory>
 #include <stack>
 #include <unordered_set>
 #include <unordered_map>
 
-#include "GUI.h"
+#include "GUI.hpp"
 #include "../../coders/xml.h"
 
 namespace gui {
@@ -57,4 +57,4 @@ namespace gui {
     };
 }
 
-#endif // FRONTEND_GUI_GUI_XML_H_
+#endif // FRONTEND_GUI_GUI_XML_HPP_
diff --git a/src/interfaces/Task.h b/src/interfaces/Task.hpp
similarity index 82%
rename from src/interfaces/Task.h
rename to src/interfaces/Task.hpp
index df8b3499..ca17f3ca 100644
--- a/src/interfaces/Task.h
+++ b/src/interfaces/Task.hpp
@@ -1,5 +1,5 @@
-#ifndef INTERFACES_TASK_H_
-#define INTERFACES_TASK_H_
+#ifndef INTERFACES_TASK_HPP_
+#define INTERFACES_TASK_HPP_
 
 #include "../typedefs.h"
 
@@ -17,5 +17,5 @@ public:
     virtual void terminate() = 0;
 };
 
-#endif // INTERFACES_TASK_H_
+#endif // INTERFACES_TASK_HPP_
 
diff --git a/src/logic/EngineController.cpp b/src/logic/EngineController.cpp
index 69fbfc33..914dff00 100644
--- a/src/logic/EngineController.cpp
+++ b/src/logic/EngineController.cpp
@@ -1,7 +1,7 @@
 #include "EngineController.hpp"
 
 #include "../content/ContentLUT.h"
-#include "../debug/Logger.h"
+#include "../debug/Logger.hpp"
 #include "../engine.h"
 #include "../files/WorldFiles.h"
 #include "../files/WorldConverter.h"
@@ -10,8 +10,8 @@
 #include "../frontend/screens/LevelScreen.hpp"
 #include "../frontend/menu.hpp"
 #include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/gui_util.h"
-#include "../interfaces/Task.h"
+#include "../graphics/ui/gui_util.hpp"
+#include "../interfaces/Task.hpp"
 #include "../util/stringutil.h"
 #include "../world/World.h"
 #include "../world/Level.h"
diff --git a/src/logic/LevelController.cpp b/src/logic/LevelController.cpp
index 733742ad..27b8e225 100644
--- a/src/logic/LevelController.cpp
+++ b/src/logic/LevelController.cpp
@@ -1,6 +1,6 @@
 #include "LevelController.h"
 #include "../files/WorldFiles.h"
-#include "../debug/Logger.h"
+#include "../debug/Logger.hpp"
 #include "../world/Level.h"
 #include "../world/World.h"
 #include "../physics/Hitbox.h"
diff --git a/src/logic/scripting/lua/LuaState.cpp b/src/logic/scripting/lua/LuaState.cpp
index 21a64dbc..9014e89b 100644
--- a/src/logic/scripting/lua/LuaState.cpp
+++ b/src/logic/scripting/lua/LuaState.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include "lua_util.h"
 #include "api_lua.h"
-#include "../../../debug/Logger.h"
+#include "../../../debug/Logger.hpp"
 #include "../../../util/stringutil.h"
 
 static debug::Logger logger("lua-state");
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index f063a33e..56960a97 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -8,7 +8,7 @@
 
 #include "../../../engine.h"
 #include "../../../assets/Assets.h"
-#include "../../../graphics/ui/gui_util.h"
+#include "../../../graphics/ui/gui_util.hpp"
 #include "../../../graphics/ui/elements/UINode.hpp"
 #include "../../../graphics/ui/elements/Button.hpp"
 #include "../../../graphics/ui/elements/CheckBox.hpp"
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index c520d93c..85ff3020 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "../../debug/Logger.h"
+#include "../../debug/Logger.hpp"
 #include "../../content/ContentPack.h"
 #include "../../files/engine_paths.h"
 #include "../../files/files.h"
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index e583b00e..b7c766a7 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -4,7 +4,7 @@
 #include "lua/api_lua.h"
 #include "lua/LuaState.h"
 
-#include "../../debug/Logger.h"
+#include "../../debug/Logger.hpp"
 #include "../../frontend/hud.h"
 #include "../../objects/Player.h"
 #include "../../files/files.h"
diff --git a/src/util/ThreadPool.hpp b/src/util/ThreadPool.hpp
index fd01e9c7..aa9545a8 100644
--- a/src/util/ThreadPool.hpp
+++ b/src/util/ThreadPool.hpp
@@ -10,8 +10,8 @@
 #include <condition_variable>
 
 #include "../delegates.h"
-#include "../debug/Logger.h"
-#include "../interfaces/Task.h"
+#include "../debug/Logger.hpp"
+#include "../interfaces/Task.hpp"
 
 namespace util {
     
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index a04dc838..02486fb5 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -13,7 +13,7 @@
 #include "files/engine_paths.h"
 #include "util/platform.h"
 #include "util/command_line.h"
-#include "debug/Logger.h"
+#include "debug/Logger.hpp"
 
 #define SETTINGS_FILE "settings.toml"
 #define CONTROLS_FILE "controls.json"
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index 316f3a5b..059520e2 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include "Window.h"
 #include "Events.h"
-#include "../debug/Logger.h"
+#include "../debug/Logger.hpp"
 #include "../graphics/core/ImageData.hpp"
 #include "../graphics/core/Texture.hpp"