Fix includes and update deheader ci script.

18 files changed, 8 insertions, 27 deletions

diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h
index ae0c0d206..d6037f056 100644
--- a/src/resources/atlas/atlasitem.h
+++ b/src/resources/atlas/atlasitem.h
@@ -23,8 +23,6 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/memorycounter.h"
-
 #include "resources/image/image.h"
 
 #include <string>
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 353818d68..bc1bf8224 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -33,10 +33,8 @@
 #include "utils/physfsrwops.h"
 #include "utils/sdlcheckutils.h"
 
-#include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
 
-#include "resources/atlas/atlasitem.h"
 #include "resources/atlas/atlasresource.h"
 #include "resources/atlas/textureatlas.h"
 
@@ -44,6 +42,8 @@
 
 #include "resources/resourcemanager/resourcemanager.h"
 
+#include <SDL_endian.h>
+
 #include "debug.h"
 
 #ifndef SDL_BYTEORDER
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index 76fca7223..fdee09ecf 100644
--- a/src/resources/atlas/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -27,8 +27,6 @@
 
 #include "utils/stringvector.h"
 
-#include <SDL.h>
-
 class AtlasResource;
 
 struct AtlasItem;
diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp
index 5f2e24160..915d33f33 100644
--- a/src/resources/atlas/atlasresource.cpp
+++ b/src/resources/atlas/atlasresource.cpp
@@ -22,7 +22,6 @@
 
 #include "resources/atlas/atlasresource.h"
 
-#include "resources/atlas/atlasitem.h"
 #include "resources/atlas/atlasmanager.h"
 #include "resources/atlas/textureatlas.h"
 
diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h
index 78819fa00..98665d5a2 100644
--- a/src/resources/atlas/textureatlas.h
+++ b/src/resources/atlas/textureatlas.h
@@ -25,13 +25,8 @@
 
 #include "utils/stringvector.h"
 
-#include "resources/memorycounter.h"
-
 #include "resources/atlas/atlasitem.h"
 
-#include <vector>
-#include <SDL.h>
-
 #include "localconsts.h"
 
 class AtlasResource;
diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h
index f86aba06b..d9de6b783 100644
--- a/src/resources/beingcommon.h
+++ b/src/resources/beingcommon.h
@@ -24,8 +24,6 @@
 #include "utils/files.h"
 #include "utils/xml.h"
 
-#include "utils/stringvector.h"
-
 #include "localconsts.h"
 
 class BeingInfo;
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index c97e4eee8..612077188 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -23,8 +23,6 @@
 
 #ifdef USE_OPENGL
 
-#include "render/graphics.h"
-
 #ifdef ANDROID
 #include <GLES/gl.h>
 #include <GLES/glext.h>
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 05fee875a..d538f9a3a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -27,6 +27,7 @@
 #include "graphicsmanager.h"
 #endif
 #include "logger.h"
+#include "main.h"
 
 #include "const/resources/map/map.h"
 
diff --git a/src/resources/mobileopenglscreenshothelper.cpp b/src/resources/mobileopenglscreenshothelper.cpp
index 2614c6a38..e6da43e95 100644
--- a/src/resources/mobileopenglscreenshothelper.cpp
+++ b/src/resources/mobileopenglscreenshothelper.cpp
@@ -27,6 +27,8 @@
 #include "configuration.h"
 #include "graphicsmanager.h"
 
+#include "render/graphics.h"
+
 #include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index b29e3b3b9..e63295c8c 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -25,7 +25,6 @@
 #ifdef USE_OPENGL
 
 #include "graphicsmanager.h"
-#include "logger.h"
 
 #include "render/mobileopengl2graphics.h"
 #include "render/mobileopenglgraphics.h"
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 889b76abf..99929bb02 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -24,7 +24,6 @@
 #define RESOURCES_OPENGLIMAGEHELPER_H
 
 #include "localconsts.h"
-#include "main.h"
 
 #ifdef USE_OPENGL
 
diff --git a/src/resources/openglscreenshothelper.cpp b/src/resources/openglscreenshothelper.cpp
index a3446d86d..d9ba241a3 100644
--- a/src/resources/openglscreenshothelper.cpp
+++ b/src/resources/openglscreenshothelper.cpp
@@ -27,6 +27,7 @@
 #include "configuration.h"
 #include "graphicsmanager.h"
 
+#include "render/graphics.h"
 #include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 5fcc35477..9d915e30e 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -39,12 +39,6 @@
 #include "utils/delete2.h"
 #include "utils/physfsrwops.h"
 
-#ifdef USE_OPENGL
-#include "render/shaders/shader.h"
-#include "render/shaders/shaderprogram.h"
-#include "render/shaders/shadersmanager.h"
-#endif
-
 #include <SDL_image.h>
 #include <sstream>
 
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 60c71d12e..8376ae0c8 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -25,7 +25,6 @@
 #if defined(USE_OPENGL) && !defined(ANDROID)
 
 #include "graphicsmanager.h"
-#include "logger.h"
 
 #include "render/mobileopengl2graphics.h"
 #include "render/mobileopenglgraphics.h"
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index 2a26c2400..691924cfe 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -24,7 +24,6 @@
 #define RESOURCES_SAFEOPENGLIMAGEHELPER_H
 
 #include "localconsts.h"
-#include "main.h"
 
 #if defined(USE_OPENGL) && !defined(ANDROID)
 
diff --git a/src/resources/screenshothelper.h b/src/resources/screenshothelper.h
index 6982c681a..bccce863e 100644
--- a/src/resources/screenshothelper.h
+++ b/src/resources/screenshothelper.h
@@ -31,6 +31,7 @@
 #ifdef USE_SDL2
 #pragma GCC diagnostic pop
 #endif
+_SDL_stdinc_h
 #include <SDL_video.h>
 
 #include "localconsts.h"
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index f8b8fb96d..4a8c4eb62 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -25,7 +25,6 @@
 #include "resources/sdlimagehelper.h"
 
 #include "logger.h"
-#include "main.h"
 
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 9b3692946..6100b3437 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -25,6 +25,7 @@
 
 #ifndef USE_SDL2
 #include "resources/sdlimagehelper.h"
+RESOURCES_SDLIMAGEHELPER_H
 
 #else