11 files changed, 7 insertions, 17 deletions
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 33ab2954e..c803b7746 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -67,6 +67,7 @@
 #define RENDER_GRAPHICS_H
 
 #include "sdlshared.h"
+#include "main.h"
 
 #include "enums/render/rendertype.h"
 
diff --git a/src/render/mgl.h b/src/render/mgl.h
index 8ae0d9f67..d8de629a5 100644
--- a/src/render/mgl.h
+++ b/src/render/mgl.h
@@ -22,6 +22,7 @@
 #define RENDER_MGL_H
 
 #include "main.h"
+
 #ifdef USE_OPENGL
 
 #include "render/mgldefines.h"
diff --git a/src/render/mgltypes.h b/src/render/mgltypes.h
index 510e77354..330524232 100644
--- a/src/render/mgltypes.h
+++ b/src/render/mgltypes.h
@@ -22,6 +22,7 @@
 #define RENDER_MGLTYPES_H
 
 #include "main.h"
+
 #ifdef USE_OPENGL
 
 #include "render/mgldefines.h"
diff --git a/src/render/mglx.h b/src/render/mglx.h
index 094520e76..575041a94 100644
--- a/src/render/mglx.h
+++ b/src/render/mglx.h
@@ -22,6 +22,7 @@
 #define RENDER_MGLX_H
 
 #include "main.h"
+
 #if defined(USE_OPENGL) && defined(USE_X11)
 
 #include "render/mglxtypes.h"
diff --git a/src/render/mglxtypes.h b/src/render/mglxtypes.h
index 427c0f202..c639a7d80 100644
--- a/src/render/mglxtypes.h
+++ b/src/render/mglxtypes.h
@@ -22,6 +22,7 @@
 #define RENDER_MGLXTYPES_H
 
 #include "main.h"
+
 #if defined(USE_OPENGL) && defined(USE_X11)
 
 #include <X11/Xlib.h>
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 304481a39..16442bbc3 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -23,7 +23,6 @@
 #ifndef RENDER_MOBILEOPENGLGRAPHICS_H
 #define RENDER_MOBILEOPENGLGRAPHICS_H
 
-#include "main.h"
 #ifdef USE_OPENGL
 
 #include "localconsts.h"
@@ -43,8 +42,6 @@
 #include <GL/glext.h>
 #endif
 
-#include <set>
-
 class OpenGLGraphicsVertexes;
 
 class MobileOpenGLGraphics final : public Graphics
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index e395afb9c..db20aa2fb 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -23,7 +23,6 @@
 #ifndef RENDER_MODERNOPENGLGRAPHICS_H
 #define RENDER_MODERNOPENGLGRAPHICS_H
 
-#include "main.h"
 #if defined USE_OPENGL && !defined ANDROID
 
 #include "localconsts.h"
@@ -43,8 +42,6 @@
 #include <GL/glext.h>
 #endif
 
-#include <set>
-
 class OpenGLGraphicsVertexes;
 class ShaderProgram;
 
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 29145115d..a3fbdc1fb 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -23,7 +23,6 @@
 #ifndef RENDER_NORMALOPENGLGRAPHICS_H
 #define RENDER_NORMALOPENGLGRAPHICS_H
 
-#include "main.h"
 #if defined USE_OPENGL && !defined ANDROID
 
 #include "localconsts.h"
@@ -43,8 +42,6 @@
 #include <GL/glext.h>
 #endif
 
-#include <set>
-
 class OpenGLGraphicsVertexes;
 
 class NormalOpenGLGraphics final : public Graphics
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index 5a5137f3d..f159fc7de 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -23,7 +23,6 @@
 #ifndef RENDER_NULLOPENGLGRAPHICS_H
 #define RENDER_NULLOPENGLGRAPHICS_H
 
-#include "main.h"
 #if defined USE_OPENGL
 
 #include "localconsts.h"
@@ -43,8 +42,6 @@
 #include <GL/glext.h>
 #endif
 
-#include <set>
-
 class OpenGLGraphicsVertexes;
 
 class NullOpenGLGraphics final : public Graphics
diff --git a/src/render/rendererslistsdl2.h b/src/render/rendererslistsdl2.h
index 15e307dba..f97228856 100644
--- a/src/render/rendererslistsdl2.h
+++ b/src/render/rendererslistsdl2.h
@@ -21,12 +21,10 @@
 #ifndef RENDER_RENDERERSLISTSDL2_H
 #define RENDER_RENDERERSLISTSDL2_H
 
-#include "utils/gettext.h"
-
-#include "render/renderers.h"
-
 #ifdef USE_SDL2
 
+#include "utils/gettext.h"
+
 #ifdef USE_OPENGL
 #ifdef ANDROID
 // defined OPENGL ANDROID
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 04bf478a3..440ba7a39 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -23,7 +23,6 @@
 #ifndef RENDER_SAFEOPENGLGRAPHICS_H
 #define RENDER_SAFEOPENGLGRAPHICS_H
 
-#include "main.h"
 #if defined USE_OPENGL && !defined ANDROID
 
 #include "render/graphics.h"