includes refactor

src/frontend/locale.hpp

@@ -1,14 +1,14 @@
 #ifndef FRONTEND_LOCALES_HPP_
 #define FRONTEND_LOCALES_HPP_
 
-#include "../content/ContentPack.hpp"
-
 #include <string>
 #include <vector>
 #include <memory>
 #include <filesystem>
 #include <unordered_map>
 
+struct ContentPack;
+
 namespace langs {
     const char LANG_FILE_EXT[] = ".txt";
     const char TEXTS_FOLDER[] = "texts";

src/frontend/screens/LevelScreen.cpp

@@ -20,6 +20,7 @@
 #include "../../world/World.hpp"
 #include "../../window/Camera.hpp"
 #include "../../window/Events.hpp"
+#include "../../window/Window.hpp"
 #include "../../engine.hpp"
 
 static debug::Logger logger("level-screen");

src/graphics/core/Batch2D.cpp

@@ -2,6 +2,7 @@
 #include "Mesh.hpp"
 #include "Texture.hpp"
 #include "gl_util.hpp"
+#include "../../maths/UVRegion.hpp"
 
 #include <GL/glew.h>
 

src/graphics/core/Batch2D.hpp

@@ -6,10 +6,10 @@
 #include <glm/glm.hpp>
 
 #include "commons.hpp"
-#include "../../maths/UVRegion.hpp"
 
 class Mesh;
 class Texture;
+struct UVRegion;
 
 class Batch2D {
     float* buffer;

src/graphics/core/DrawContext.cpp

@@ -4,6 +4,7 @@
 
 #include "Batch2D.hpp"
 #include "Framebuffer.hpp"
+#include "../../window/Window.hpp"
 
 static void set_blend_mode(BlendMode mode) {
     switch (mode) {

src/graphics/core/DrawContext.hpp

@@ -3,7 +3,6 @@
 
 #include "commons.hpp"
 #include "Viewport.hpp"
-#include "../../window/Window.hpp"
 #include "../../typedefs.hpp"
 
 class Batch2D;

src/graphics/core/PostProcessing.cpp

@@ -3,6 +3,8 @@
 #include "Shader.hpp"
 #include "Texture.hpp"
 #include "Framebuffer.hpp"
+#include "Viewport.hpp"
+#include "DrawContext.hpp"
 
 #include <stdexcept>
 

src/graphics/core/PostProcessing.hpp

@@ -1,14 +1,13 @@
 #ifndef GRAPHICS_CORE_POST_PROCESSING_HPP_
 #define GRAPHICS_CORE_POST_PROCESSING_HPP_
 
-#include "Viewport.hpp"
-#include "DrawContext.hpp"
-
 #include <memory>
 
 class Mesh;
 class Shader;
 class Framebuffer;
+class DrawContext;
+class ImageData;
 
 /// @brief Framebuffer with blitting with shaders.
 /// @attention Current implementation does not support multiple render passes 

src/graphics/core/Texture.cpp

@@ -1,5 +1,4 @@
 #include "Texture.hpp"
-#include "ImageData.hpp"
 #include "gl_util.hpp"
 
 #include <GL/glew.h>

src/graphics/core/Texture.hpp

@@ -1,11 +1,12 @@
 #ifndef GRAPHICS_CORE_TEXTURE_HPP_
 #define GRAPHICS_CORE_TEXTURE_HPP_
 
-#include <string>
-#include <memory>
 #include "../../typedefs.hpp"
 #include "ImageData.hpp"
 
+#include <string>
+#include <memory>
+
 class Texture {
 protected:
     uint id;

src/graphics/ui/GUI.cpp

@@ -8,6 +8,7 @@
 #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"
 

src/graphics/ui/elements/TextBox.cpp

@@ -7,6 +7,7 @@
 #include "../../../assets/Assets.hpp"
 #include "../../../util/stringutil.hpp"
 #include "../../../window/Events.hpp"
+#include "../../../window/Window.hpp"
 
 using namespace gui;
 

src/typedefs.hpp

@@ -2,9 +2,7 @@
 #define TYPEDEFS_HPP_
 
 #include <memory>
-#include <stdlib.h>
 #include <stdint.h>
-#include <variant>
 
 using scriptenv = std::shared_ptr<int>;
 using observer_handler = std::shared_ptr<int>;