12 files changed, 12 insertions, 23 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index bd882e4fd..f7afab0f6 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "main.h"
-
 #ifdef USE_OPENGL
 
 #include "resources/atlasmanager.h"
diff --git a/src/resources/atlasresource.cpp b/src/resources/atlasresource.cpp
index 0b244b049..0ec211979 100644
--- a/src/resources/atlasresource.cpp
+++ b/src/resources/atlasresource.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "main.h"
-
 #ifdef USE_OPENGL
 
 #include "resources/atlasresource.h"
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 77024d290..bf8c06986 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -24,8 +24,6 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "utils/xml.h"
-
 #include "resources/beingcommon.h"
 
 #include "debug.h"
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 943f5b55f..cd615c030 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -26,8 +26,9 @@
 
 #include "logger.h"
 
-#include "resources/imagehelper.h"
+#ifdef USE_OPENGL
 #include "resources/openglimagehelper.h"
+#endif
 #include "resources/sdlimagehelper.h"
 #include "resources/subimage.h"
 
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 2ac5d8819..20697cfd6 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -23,7 +23,6 @@
 #include "resources/imagehelper.h"
 
 #include "logger.h"
-#include "main.h"
 
 #include "resources/dye.h"
 #include "resources/dyepalette.h"
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 210688843..f73c91857 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -24,10 +24,8 @@
 
 #include "logger.h"
 
-#include <cstdlib>
 #include <png.h>
 #include <SDL_video.h>
-#include <string>
 
 #include "debug.h"
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index c115320cb..c68762728 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -34,8 +34,6 @@
 
 #include "utils/dtor.h"
 
-#include <map>
-
 #include "debug.h"
 
 ItemInfo::ItemInfo() :
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 0152daff5..a1a9d446b 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -40,7 +40,6 @@
 #include "particle/particle.h"
 
 #include "resources/ambientlayer.h"
-#include "resources/image.h"
 #include "resources/mapitemtype.h"
 #include "resources/notifytypes.h"
 #include "resources/resourcemanager.h"
@@ -50,7 +49,9 @@
 #include "resources/map/mapobjectlist.h"
 #include "resources/map/tileanimation.h"
 
+#ifdef USE_OPENGL
 #include "render/renderers.h"
+#endif
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
@@ -58,7 +59,6 @@
 #include "utils/physfstools.h"
 #include "utils/timer.h"
 
-#include <climits>
 #include <queue>
 
 #include <sys/stat.h>
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index ed9c1a766..2c0f050b5 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -23,7 +23,6 @@
 #include "resources/map/maplayer.h"
 
 #include "configuration.h"
-#include "graphicsvertexes.h"
 
 #ifndef USE_OPENGL
 #include "render/graphics.h"
@@ -33,7 +32,6 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/mapitemtype.h"
 
 #include "resources/map/mapitem.h"
@@ -41,8 +39,6 @@
 #include "resources/map/maptype.h"
 #include "resources/map/speciallayer.h"
 
-#include "utils/dtor.h"
-
 #include "debug.h"
 
 MapLayer::MapLayer(const int x, const int y,
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 5f95565ec..49e3ced2d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -23,11 +23,11 @@
 #include "resources/mapreader.h"
 
 #include "configuration.h"
+#ifdef USE_OPENGL
 #include "graphicsmanager.h"
+#endif
 #include "logger.h"
-#include "main.h"
 
-#include "resources/map/blocktype.h"
 #include "resources/map/map.h"
 #include "resources/map/mapconsts.h"
 #include "resources/map/mapheights.h"
@@ -39,7 +39,9 @@
 #include "resources/mapitemtype.h"
 #include "resources/resourcemanager.h"
 
+#ifdef USE_OPENGL
 #include "resources/db/mapdb.h"
+#endif
 
 #include "resources/map/tileanimation.h"
 
@@ -47,7 +49,6 @@
 #include "utils/delete2.h"
 #include "utils/stringmap.h"
 
-#include <iostream>
 #include <zlib.h>
 
 #include "debug.h"
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 786242485..f667569ce 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -28,8 +28,10 @@
 
 #include "resources/map/walklayer.h"
 
+#ifdef USE_OPENGL
 #include "resources/atlasmanager.h"
 #include "resources/atlasresource.h"
+#endif
 #include "resources/dye.h"
 #include "resources/image.h"
 #include "resources/imagehelper.h"
@@ -43,9 +45,11 @@
 #include "utils/physfsrwops.h"
 #include "utils/sdlcheckutils.h"
 
+#ifdef USE_OPENGL
 #include "render/shaders/shader.h"
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
+#endif
 
 #include <SDL_image.h>
 
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index cbce0a534..dc251f013 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -29,8 +29,6 @@
 #include "utils/physfstools.h"
 
 #include <algorithm>
-#include <cstring>
-#include <ctime>
 
 #include "debug.h"