diff --git a/src/coders/rle.cpp b/src/coders/rle.cpp
index 06cd1828..8acb5b8b 100644
--- a/src/coders/rle.cpp
+++ b/src/coders/rle.cpp
@@ -1,4 +1,4 @@
-#include "rle.h"
+#include "rle.hpp"
 
 size_t rle::decode(const ubyte* src, size_t srclen, ubyte* dst) {
     size_t offset = 0;
diff --git a/src/coders/rle.h b/src/coders/rle.hpp
similarity index 83%
rename from src/coders/rle.h
rename to src/coders/rle.hpp
index 79d8601e..60d75a04 100644
--- a/src/coders/rle.h
+++ b/src/coders/rle.hpp
@@ -1,5 +1,5 @@
-#ifndef CODERS_RLE_H_
-#define CODERS_RLE_H_
+#ifndef CODERS_RLE_HPP_
+#define CODERS_RLE_HPP_
 
 #include "../typedefs.h"
 
@@ -14,4 +14,4 @@ namespace extrle {
     size_t decode(const ubyte* src, size_t length, ubyte* dst);
 }
 
-#endif // CODERS_RLE_H_
+#endif // CODERS_RLE_HPP_
diff --git a/src/coders/toml.cpp b/src/coders/toml.cpp
index 96ce407f..544a8b9b 100644
--- a/src/coders/toml.cpp
+++ b/src/coders/toml.cpp
@@ -8,6 +8,8 @@
 #include <sstream>
 #include <assert.h>
 
+// FIXME: refactor this monster
+
 using namespace toml;
 
 Section::Section(std::string name) : name(name) {
diff --git a/src/files/WorldRegions.cpp b/src/files/WorldRegions.cpp
index 29ffcd5f..23f92d9c 100644
--- a/src/files/WorldRegions.cpp
+++ b/src/files/WorldRegions.cpp
@@ -1,6 +1,6 @@
 #include "WorldRegions.hpp"
 
-#include "../coders/rle.h"
+#include "../coders/rle.hpp"
 #include "../util/data_io.h"
 #include "../coders/byte_utils.h"
 #include "../maths/voxmaths.h"
diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp
index fb2ca206..b07a62f3 100644
--- a/src/frontend/InventoryView.cpp
+++ b/src/frontend/InventoryView.cpp
@@ -10,7 +10,7 @@
 #include "../graphics/core/Font.hpp"
 #include "../graphics/core/GfxContext.hpp"
 #include "../graphics/core/Shader.hpp"
-#include "../graphics/render/BlocksPreview.h"
+#include "../graphics/render/BlocksPreview.hpp"
 #include "../items/Inventories.h"
 #include "../items/Inventory.h"
 #include "../items/ItemDef.h"
diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp
index 65de979b..fe549d3a 100644
--- a/src/frontend/LevelFrontend.cpp
+++ b/src/frontend/LevelFrontend.cpp
@@ -4,7 +4,7 @@
 #include "../audio/audio.h"
 #include "../content/Content.h"
 #include "../graphics/core/Atlas.hpp"
-#include "../graphics/render/BlocksPreview.h"
+#include "../graphics/render/BlocksPreview.hpp"
 #include "../logic/LevelController.h"
 #include "../logic/PlayerController.h"
 #include "../voxels/Block.h"
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 57c090b9..37597a95 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -10,7 +10,7 @@
 #include "../graphics/ui/elements/TextBox.hpp"
 #include "../graphics/ui/elements/TrackBar.hpp"
 #include "../graphics/ui/elements/InputBindBox.hpp"
-#include "../graphics/render/WorldRenderer.h"
+#include "../graphics/render/WorldRenderer.hpp"
 #include "../objects/Player.h"
 #include "../physics/Hitbox.h"
 #include "../util/stringutil.h"
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 73ea45b9..3065184f 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -13,8 +13,8 @@
 #include "../graphics/core/Mesh.hpp"
 #include "../graphics/core/Shader.hpp"
 #include "../graphics/core/Texture.hpp"
-#include "../graphics/render/BlocksPreview.h"
-#include "../graphics/render/WorldRenderer.h"
+#include "../graphics/render/BlocksPreview.hpp"
+#include "../graphics/render/WorldRenderer.hpp"
 #include "../graphics/ui/elements/UINode.hpp"
 #include "../graphics/ui/elements/Menu.hpp"
 #include "../graphics/ui/elements/Panel.hpp"
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index 652e0c8e..62bc4e01 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -11,7 +11,7 @@
 #include "../../graphics/core/ImageData.hpp"
 #include "../../graphics/ui/GUI.hpp"
 #include "../../graphics/ui/elements/Menu.hpp"
-#include "../../graphics/render/WorldRenderer.h"
+#include "../../graphics/render/WorldRenderer.hpp"
 #include "../../logic/LevelController.h"
 #include "../../logic/scripting/scripting_hud.h"
 #include "../../physics/Hitbox.h"
diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp
index 8eaa69c2..12ffe158 100644
--- a/src/graphics/render/BlocksPreview.cpp
+++ b/src/graphics/render/BlocksPreview.cpp
@@ -1,7 +1,4 @@
-#include "BlocksPreview.h"
-
-#include <glm/ext.hpp>
-
+#include "BlocksPreview.hpp"
 #include "../../assets/Assets.h"
 #include "../../constants.h"
 #include "../../content/Content.h"
@@ -17,6 +14,8 @@
 #include "../core/Texture.hpp"
 #include "../core/Viewport.hpp"
 
+#include <glm/ext.hpp>
+
 std::unique_ptr<ImageData> BlocksPreview::draw(
     const ContentGfxCache* cache,
     Shader* shader,
diff --git a/src/graphics/render/BlocksPreview.h b/src/graphics/render/BlocksPreview.hpp
similarity index 78%
rename from src/graphics/render/BlocksPreview.h
rename to src/graphics/render/BlocksPreview.hpp
index c80d006a..263beee4 100644
--- a/src/graphics/render/BlocksPreview.h
+++ b/src/graphics/render/BlocksPreview.hpp
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
-#define GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
+#ifndef GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
+#define GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
 
 #include "../../typedefs.h"
 
@@ -33,4 +33,4 @@ public:
     );
 };
 
-#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_H_
+#endif // GRAPHICS_RENDER_BLOCKS_PREVIEW_HPP_
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 23102a80..171e456a 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,7 +1,4 @@
-#include "BlocksRenderer.h"
-
-#include <glm/glm.hpp>
-
+#include "BlocksRenderer.hpp"
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.h"
 #include "../../constants.h"
@@ -13,6 +10,8 @@
 #include "../../lighting/Lightmap.h"
 #include "../../frontend/ContentGfxCache.h"
 
+#include <glm/glm.hpp>
+
 using glm::ivec3;
 using glm::vec3;
 using glm::vec4;
diff --git a/src/graphics/render/BlocksRenderer.h b/src/graphics/render/BlocksRenderer.hpp
similarity index 93%
rename from src/graphics/render/BlocksRenderer.h
rename to src/graphics/render/BlocksRenderer.hpp
index ea2c6fba..e90ee815 100644
--- a/src/graphics/render/BlocksRenderer.h
+++ b/src/graphics/render/BlocksRenderer.hpp
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_H
-#define GRAPHICS_RENDER_BLOCKS_RENDERER_H
+#ifndef GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
+#define GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
 
 #include <stdlib.h>
 #include <vector>
@@ -99,4 +99,4 @@ public:
     VoxelsVolume* getVoxelsBuffer() const;
 };
 
-#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_H
+#endif // GRAPHICS_RENDER_BLOCKS_RENDERER_HPP_
diff --git a/src/graphics/render/ChunksRenderer.cpp b/src/graphics/render/ChunksRenderer.cpp
index f0099b62..2098eb7d 100644
--- a/src/graphics/render/ChunksRenderer.cpp
+++ b/src/graphics/render/ChunksRenderer.cpp
@@ -1,10 +1,9 @@
-#include "ChunksRenderer.h"
-
+#include "ChunksRenderer.hpp"
+#include "BlocksRenderer.hpp"
 #include "../../debug/Logger.hpp"
 #include "../../graphics/core/Mesh.hpp"
 #include "../../voxels/Chunk.h"
 #include "../../world/Level.h"
-#include "BlocksRenderer.h"
 
 #include <iostream>
 #include <glm/glm.hpp>
diff --git a/src/graphics/render/ChunksRenderer.h b/src/graphics/render/ChunksRenderer.hpp
similarity index 89%
rename from src/graphics/render/ChunksRenderer.h
rename to src/graphics/render/ChunksRenderer.hpp
index 86fb8c84..8b7860fa 100644
--- a/src/graphics/render/ChunksRenderer.h
+++ b/src/graphics/render/ChunksRenderer.hpp
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_H_
-#define GRAPHICS_RENDER_CHUNKSRENDERER_H_
+#ifndef GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
+#define GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
 
 #include <queue>
 #include <memory>
@@ -47,4 +47,4 @@ public:
     void update();
 };
 
-#endif // GRAPHICS_RENDER_CHUNKSRENDERER_H_
+#endif // GRAPHICS_RENDER_CHUNKSRENDERER_HPP_
diff --git a/src/graphics/render/Skybox.cpp b/src/graphics/render/Skybox.cpp
index d9d891b2..9e2cf4aa 100644
--- a/src/graphics/render/Skybox.cpp
+++ b/src/graphics/render/Skybox.cpp
@@ -1,9 +1,4 @@
-#include "Skybox.h"
-
-#include <iostream>
-#include <GL/glew.h>
-#include <glm/glm.hpp>
-
+#include "Skybox.hpp"
 #include "../../assets/Assets.h"
 #include "../../graphics/core/Shader.hpp"
 #include "../../graphics/core/Mesh.hpp"
@@ -15,6 +10,10 @@
 #include "../../window/Window.h"
 #include "../../window/Camera.h"
 
+#include <iostream>
+#include <GL/glew.h>
+#include <glm/glm.hpp>
+
 #ifndef M_PI
 #define M_PI 3.141592
 #endif // M_PI
diff --git a/src/graphics/render/Skybox.h b/src/graphics/render/Skybox.hpp
similarity index 86%
rename from src/graphics/render/Skybox.h
rename to src/graphics/render/Skybox.hpp
index 371c9105..e4ec1cda 100644
--- a/src/graphics/render/Skybox.h
+++ b/src/graphics/render/Skybox.hpp
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_RENDER_SKYBOX_H_
-#define GRAPHICS_RENDER_SKYBOX_H_
+#ifndef GRAPHICS_RENDER_SKYBOX_HPP_
+#define GRAPHICS_RENDER_SKYBOX_HPP_
 
 #include <memory>
 #include <string>
@@ -55,4 +55,4 @@ public:
     }
 };
 
-#endif // GRAPHICS_RENDER_SKYBOX_H_
+#endif // GRAPHICS_RENDER_SKYBOX_HPP_
diff --git a/src/graphics/render/WorldRenderer.cpp b/src/graphics/render/WorldRenderer.cpp
index d7d8f27b..90f7dcfb 100644
--- a/src/graphics/render/WorldRenderer.cpp
+++ b/src/graphics/render/WorldRenderer.cpp
@@ -1,6 +1,6 @@
-#include "WorldRenderer.h"
-
-
+#include "WorldRenderer.hpp"
+#include "ChunksRenderer.hpp"
+#include "Skybox.hpp"
 #include "../../assets/Assets.h"
 #include "../../content/Content.h"
 #include "../../engine.h"
@@ -29,8 +29,6 @@
 #include "../core/PostProcessing.h"
 #include "../core/Shader.hpp"
 #include "../core/Texture.hpp"
-#include "ChunksRenderer.h"
-#include "Skybox.h"
 
 #include <assert.h>
 #include <GL/glew.h>
diff --git a/src/graphics/render/WorldRenderer.h b/src/graphics/render/WorldRenderer.hpp
similarity index 94%
rename from src/graphics/render/WorldRenderer.h
rename to src/graphics/render/WorldRenderer.hpp
index 5223eeb7..bae0bfea 100644
--- a/src/graphics/render/WorldRenderer.h
+++ b/src/graphics/render/WorldRenderer.hpp
@@ -1,5 +1,5 @@
-#ifndef GRAPHICS_RENDER_WORLD_RENDERER_H_
-#define GRAPHICS_RENDER_WORLD_RENDERER_H_
+#ifndef GRAPHICS_RENDER_WORLD_RENDERER_HPP_
+#define GRAPHICS_RENDER_WORLD_RENDERER_HPP_
 
 #include <vector>
 #include <memory>
@@ -81,4 +81,4 @@ public:
 };
 
 
-#endif // GRAPHICS_RENDER_WORLD_RENDERER_H_
+#endif // GRAPHICS_RENDER_WORLD_RENDERER_HPP_