Fix other include issues.

7 files changed, 15 insertions, 15 deletions

diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index e589058c5..78965afc9 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -84,15 +84,19 @@
 #include "render/nacl/naclgles.h"
 #endif  // __native_client__
 #else  // USE_OPENGL
+#ifndef USE_SDL2
 #include "resources/imagehelper.h"
+#endif  // USE_SDL2
 #endif  // USE_OPENGL
 
 #ifdef USE_OPENGL
 #ifdef __APPLE__
 #include <OpenGL/OpenGL.h>
-#endif
+#endif  // __APPLE__
+#ifndef USE_SDL2
 #include "render/opengl/mgldefines.h"
-#endif
+#endif  // USE_SDL2
+#endif  // USE_OPENGL
 
 #include "debug.h"
 
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 8fb13c804..016f2c4ab 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -75,11 +75,11 @@
 
 #include "resources/mstack.h"
 
-#include <SDL_video.h>
-
 #ifdef USE_SDL2
 #include <SDL_render.h>
-#endif
+#else  // USE_SDL2
+#include <SDL_video.h>
+#endif  // USE_SDL2
 
 #include "localconsts.h"
 
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 50d6c5073..dcd1290d1 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -50,11 +50,13 @@
 #include "render/opengl/mgldefines.h"
 RENDER_OPENGL_MGLDEFINES_H
 
+#ifndef USE_SDL2
 #if defined(__GXX_EXPERIMENTAL_CXX0X__)
 #include <cstdint>
-#else
+#else  // defined(__GXX_EXPERIMENTAL_CXX0X__)
 #include <stdint.h>
-#endif
+#endif  // defined(__GXX_EXPERIMENTAL_CXX0X__)
+#endif  // USE_SDL2
 
 typedef void (APIENTRY *glGenRenderbuffers_t)(GLsizei, GLuint *);
 typedef void (APIENTRY *glBindRenderbuffer_t)(GLenum target,
diff --git a/src/render/rendererslistsdl.h b/src/render/rendererslistsdl.h
index 8bd0c5dcb..1f3297dbe 100644
--- a/src/render/rendererslistsdl.h
+++ b/src/render/rendererslistsdl.h
@@ -23,6 +23,7 @@
 
 #ifdef USE_SDL2
 #include "render/rendererslistsdl2.h"
+RENDER_RENDERERSLISTSDL2_H
 
 #else  // USE_SDL2
 
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 130d34b12..2d0ade4d9 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -24,15 +24,10 @@
 
 #include "render/sdl2softwaregraphics.h"
 
-#include "main.h"
-
-#include "configuration.h"
 #include "graphicsmanager.h"
-#include "logger.h"
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/imagehelper.h"
 #include "resources/imagerect.h"
 #include "resources/sdl2softwareimagehelper.h"
 
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index 1dd885628..b335f6e19 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -25,6 +25,7 @@
 
 #ifdef USE_SDL2
 #include "render/sdl2graphics.h"
+RENDER_SDL2GRAPHICS_H
 
 #else
 
diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h
index 6df146e2c..853161b87 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -32,13 +32,10 @@
 #include <SDL_opengl.h>
 #endif
 
-#endif
-
 #include <vector>
 
 #include "localconsts.h"
 
-#ifdef USE_OPENGL
 class OpenGLGraphicsVertexes final
 {
     public: