13 files changed, 4 insertions, 47 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 107573d1b..3cad42a3b 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -26,14 +26,12 @@
 
 #include "configuration.h"
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
-
 #ifdef USE_OPENGL
 #ifdef __APPLE__
 #include <OpenGL/OpenGL.h>
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 16cce7ae6..aad3c2bed 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -23,7 +23,7 @@
 #ifndef RENDER_GRAPHICS_H
 #define RENDER_GRAPHICS_H
 
-#include "SDL.h"
+#include "SDL_video.h"
 
 #include "sdlshared.h"
 
@@ -37,9 +37,7 @@
 class Image;
 class ImageCollection;
 class ImageVertexes;
-class MapLayer;
 
-struct SDL_Surface;
 struct SDL_Window;
 
 static const int defaultScreenWidth = 800;
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index d8ed1bc3a..18f036f48 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -35,9 +35,6 @@
 #include "resources/openglimagehelper.h"
 
 #include "utils/sdlcheckutils.h"
-#include "utils/stringutils.h"
-
-#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 56393d0da..f6bbf4311 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -34,9 +34,6 @@
 #include "resources/openglimagehelper.h"
 
 #include "utils/sdlcheckutils.h"
-#include "utils/stringutils.h"
-
-#include <SDL.h>
 
 #include "debug.h"
 
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index b3027a5c2..f7909b7bf 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -25,18 +25,12 @@
 
 #include "render/nullopenglgraphics.h"
 
-#include "configuration.h"
 #include "graphicsmanager.h"
 #include "graphicsvertexes.h"
-#include "logger.h"
 
 #include "resources/image.h"
 #include "resources/openglimagehelper.h"
 
-#include "utils/stringutils.h"
-
-#include <SDL.h>
-
 #include "debug.h"
 
 GLuint NullOpenGLGraphics::mLastImage = 0;
diff --git a/src/render/renderers.h b/src/render/renderers.h
index 2a6af27d2..3ce1fdb81 100644
--- a/src/render/renderers.h
+++ b/src/render/renderers.h
@@ -21,8 +21,6 @@
 #ifndef RENDER_RENDERERS_H
 #define RENDER_RENDERERS_H
 
-#include "utils/gettext.h"
-
 enum RenderType
 {
     RENDER_SOFTWARE = 0,
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 9f9d0cd13..7f0e375b6 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -27,16 +27,12 @@
 
 #include "configuration.h"
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
-#include "logger.h"
 
 #include "resources/image.h"
 #include "resources/openglimagehelper.h"
 
 #include "utils/sdlcheckutils.h"
 
-#include <SDL.h>
-
 #include "debug.h"
 
 GLuint SafeOpenGLGraphics::mLastImage = 0;
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index c8974df29..76cde005a 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -34,11 +34,9 @@
 #include "resources/imagehelper.h"
 #include "resources/sdl2imagehelper.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
-
 #include "utils/sdlcheckutils.h"
 
-#include <SDL.h>
+#include <guichan/sdl/sdlpixel.hpp>
 
 #include "debug.h"
 
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index c1df5b3d0..c60961a40 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -34,12 +34,8 @@
 #include "resources/imagehelper.h"
 #include "resources/sdl2softwareimagehelper.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
-
 #include "utils/sdlcheckutils.h"
 
-#include <SDL.h>
-
 #include "debug.h"
 
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index e194c51f8..4df797762 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -26,12 +26,8 @@
 
 #include "main.h"
 
-#include "configuration.h"
 #include "graphicsmanager.h"
 #include "graphicsvertexes.h"
-#include "logger.h"
-
-#include "resources/imagehelper.h"
 
 #include "utils/sdlcheckutils.h"
 
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index 28393d251..79c2c1c5a 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -35,9 +35,6 @@
 class Image;
 class ImageCollection;
 class ImageVertexes;
-class MapLayer;
-
-struct SDL_Surface;
 
 /**
  * A central point of control for graphics.
diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp
index 6075a9891..879d44f60 100644
--- a/src/render/surfacegraphics.cpp
+++ b/src/render/surfacegraphics.cpp
@@ -24,16 +24,9 @@
 
 #include "main.h"
 
-#include "configuration.h"
-#include "graphicsmanager.h"
-#include "graphicsvertexes.h"
-#include "logger.h"
-
-#include "resources/imagehelper.h"
+#include "resources/image.h"
 #include "resources/surfaceimagehelper.h"
 
-#include <guichan/sdl/sdlpixel.hpp>
-
 #include "debug.h"
 
 SurfaceGraphics::SurfaceGraphics() :
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index 06dffd4ed..cda29cc05 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -30,7 +30,6 @@
 class Image;
 class ImageCollection;
 class ImageVertexes;
-class MapLayer;
 
 struct SDL_Surface;