remove useless includes from some files.

54 files changed, 46 insertions, 104 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index ecc3ddc58..87f6642a9 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -66,8 +66,6 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/actionlistener.hpp>
-
 #ifdef ANDROID
 #include <SDL_screenkeyboard.h>
 #endif
diff --git a/src/actionmanager.h b/src/actionmanager.h
index bc0335b07..8f15e4442 100644
--- a/src/actionmanager.h
+++ b/src/actionmanager.h
@@ -21,13 +21,9 @@
 #ifndef ACTIONMANAGER_H
 #define ACTIONMANAGER_H
 
-#include <string>
-#include <map>
-
 #define decHandler(name) bool name(const InputEvent &event)
 
 struct InputEvent;
-class Window;
 
 namespace ActionManager
 {
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 62557d74c..bd3cd498c 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -38,7 +38,6 @@
 #include "gui/widgets/chattab.h"
 
 #include "utils/checkutils.h"
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "net/net.h"
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index b31ca92bf..99900dbab 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -23,7 +23,6 @@
 #include "animatedsprite.h"
 
 #include "animationdelayload.h"
-#include "logger.h"
 
 #include "render/graphics.h"
 
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 60df2f6e4..eadab73f4 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -25,7 +25,6 @@
 
 #include "sprite.h"
 
-#include <map>
 #include <string>
 
 class Animation;
diff --git a/src/auctionmanager.h b/src/auctionmanager.h
index 55fd9efde..682903317 100644
--- a/src/auctionmanager.h
+++ b/src/auctionmanager.h
@@ -21,11 +21,7 @@
 #ifndef AUCTIONMANAGER_H
 #define AUCTIONMANAGER_H
 
-#include "utils/dtor.h"
-
-#include <map>
 #include <string>
-#include <vector>
 
 #include "localconsts.h"
 
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 0343a7190..a0067690b 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -23,13 +23,8 @@
 #include "chatlogger.h"
 
 #include <iostream>
-#include <sstream>
 #include <dirent.h>
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
 #ifdef WIN32
 #include <windows.h>
 #elif defined __APPLE__
diff --git a/src/client.cpp b/src/client.cpp
index 0f9af3d8a..e434f23e9 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -27,14 +27,12 @@
 #include "auctionmanager.h"
 #include "chatlogger.h"
 #include "configuration.h"
-#include "depricatedevent.h"
 #include "dropshortcut.h"
 #include "emoteshortcut.h"
 #include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "itemshortcut.h"
 #include "party.h"
 #include "soundconsts.h"
@@ -64,7 +62,6 @@
 #include "gui/quitdialog.h"
 #include "gui/registerdialog.h"
 #include "gui/npcdialog.h"
-#include "gui/sdlinput.h"
 #include "gui/selldialog.h"
 #include "gui/serverdialog.h"
 #include "gui/setup.h"
@@ -81,7 +78,6 @@
 #include "net/inventoryhandler.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
-#include "net/npchandler.h"
 #include "net/partyhandler.h"
 
 #include "resources/avatardb.h"
@@ -128,8 +124,6 @@
 #ifdef WIN32
 #include <SDL_syswm.h>
 #include "utils/specialfolder.h"
-#else
-#include <cerrno>
 #endif
 
 #ifdef ANDROID
@@ -139,7 +133,6 @@
 #include <sys/stat.h>
 
 #include <climits>
-#include <iostream>
 #include <fstream>
 
 #include "mumblemanager.h"
@@ -2361,7 +2354,7 @@ void Client::storeSafeParameters() const
 #if defined USE_OPENGL
     tmpOpengl = intToRenderType(config.getIntValue("opengl"));
 #else
-    tmpOpengl = 0;
+    tmpOpengl = RENDER_SOFTWARE;
 #endif
 
     width = config.getIntValue("screenwidth");
diff --git a/src/commands.cpp b/src/commands.cpp
index ff8df5faa..ac7b7278d 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "commandhandler.h"
+#include "commands.h"
 
 #include "auctionmanager.h"
 #include "actorspritemanager.h"
@@ -41,14 +41,16 @@
 #include "gui/shopwindow.h"
 #include "gui/socialwindow.h"
 #include "gui/tradewindow.h"
-#include "gui/sdlfont.h"
 
 #include "gui/widgets/whispertab.h"
 
 #if defined USE_OPENGL
 #include "render/normalopenglgraphics.h"
 #endif
+
+#if defined USE_OPENGL && defined DEBUG_SDLFONT
 #include "render/nullopenglgraphics.h"
+#endif
 
 #include "net/adminhandler.h"
 #include "net/beinghandler.h"
@@ -57,7 +59,6 @@
 #include "net/guildhandler.h"
 #include "net/net.h"
 #include "net/partyhandler.h"
-#include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
 #ifdef DEBUG_DUMP_LEAKS1
diff --git a/src/configuration.h b/src/configuration.h
index d14171dbb..38bee5d8d 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -29,7 +29,7 @@
 #include "defaults.h"
 #include "localconsts.h"
 
-#include <cassert>
+//#include <cassert>
 #include <list>
 #include <map>
 #include <string>
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 4c8183f39..bba066954 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -30,10 +30,6 @@
 
 #include "render/graphics.h"
 
-#include "utils/stringutils.h"
-
-#include <stdlib.h>
-
 #include "debug.h"
 
 VariableData* createData(const int defData)
diff --git a/src/depricatedlistener.h b/src/depricatedlistener.h
index 06d957eb5..4316056d2 100644
--- a/src/depricatedlistener.h
+++ b/src/depricatedlistener.h
@@ -24,8 +24,6 @@
 
 #include "depricatedevent.h"
 
-#include <string>
-
 class DepricatedListener
 {
     public:
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 585add656..6f0bb5ec4 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -30,8 +30,6 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
diff --git a/src/effectmanager.h b/src/effectmanager.h
index fd600e3b2..c972b760f 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -23,7 +23,6 @@
 #ifndef EFFECTMANAGER_H
 #define EFFECTMANAGER_H
 
-#include <list>
 #include <string>
 #include <vector>
 
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 5037f2346..75fa30fdb 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -23,7 +23,6 @@
 #include "flooritem.h"
 
 #include "client.h"
-#include "item.h"
 #include "configuration.h"
 
 #include "render/graphics.h"
@@ -32,6 +31,7 @@
 #include "gui/sdlfont.h"
 #include "gui/userpalette.h"
 
+#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
 #include "debug.h"
diff --git a/src/game.cpp b/src/game.cpp
index 03f26c981..4eaa09a66 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -68,7 +68,6 @@
 #endif
 #include "gui/skilldialog.h"
 #include "gui/statuswindow.h"
-#include "gui/textdialog.h"
 #include "gui/tradewindow.h"
 #include "gui/viewport.h"
 #include "gui/questswindow.h"
@@ -87,7 +86,6 @@
 #include "net/generalhandler.h"
 #include "net/gamehandler.h"
 #include "net/packetcounters.h"
-#include "net/playerhandler.h"
 
 #include "resources/imagewriter.h"
 #include "resources/mapdb.h"
@@ -101,10 +99,6 @@
 #include "utils/process.h"
 #include "utils/sdlcheckutils.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
-
-#include <fstream>
 #include <sstream>
 #include <string>
 
@@ -397,7 +391,9 @@ Game::Game():
     spellManager = new SpellManager;
     spellShortcut = new SpellShortcut;
 
-    assert(!mInstance);
+//    assert(!mInstance);
+    if (mInstance)
+        logger->log("error: double game creation");
     mInstance = this;
 
     config.incValue("gamecount");
diff --git a/src/game.h b/src/game.h
index fcef8b161..7fdaa8388 100644
--- a/src/game.h
+++ b/src/game.h
@@ -27,14 +27,14 @@
 
 #include "localconsts.h"
 
-#include <SDL.h>
+#include <SDL_events.h>
 
 static const int MAX_LASTKEYS = 10;
 
 extern volatile int cur_time;
 
 class Map;
-class WindowMenu;
+//class WindowMenu;
 
 struct LastKey final
 {
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index cda6f801f..ecc05cd4f 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -37,23 +37,28 @@
 #endif
 
 #include "configuration.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 #include "mgl.h"
 
 #include "render/graphics.h"
+#include "render/mobileopenglgraphics.h"
+#include "render/normalopenglgraphics.h"
 #include "render/renderers.h"
-#include "render/sdl2softwaregraphics.h"
+#include "render/safeopenglgraphics.h"
 #include "render/sdlgraphics.h"
 
 #include "resources/fboinfo.h"
 #include "resources/imagehelper.h"
 #include "resources/openglimagehelper.h"
-#include "resources/sdl2softwareimagehelper.h"
 #include "resources/sdlimagehelper.h"
+
+#ifdef USE_SDL2
+#include "render/sdl2softwaregraphics.h"
+
+#include "resources/sdl2softwareimagehelper.h"
 #include "resources/surfaceimagehelper.h"
+#endif
 
-#include "utils/paths.h"
 #include "utils/sdlhelper.h"
 #include "utils/stringutils.h"
 
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index ac91d7bd8..f1a7c7c4a 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -43,18 +43,17 @@
 
 #include "utils/stringvector.h"
 
-#include <SDL_stdinc.h>
-
 #include <set>
 #include <string>
 
 #include "localconsts.h"
 
-class Graphics;
 class TestMain;
 
 struct FBOInfo;
+#ifdef USE_SDL2
 struct SDL_Renderer;
+#endif
 struct SDL_Window;
 
 enum ScreenDensity
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 3b0e48fe2..9fa822ffd 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -36,17 +36,10 @@
 #include <SDL_opengl.h>
 #endif
 
-#include <SDL.h>
-
-#include "render/mobileopenglgraphics.h"
-#include "render/normalopenglgraphics.h"
-#include "render/safeopenglgraphics.h"
 #endif
 
 #include "resources/image.h"
 
-#include <string>
-#include <list>
 #include <vector>
 
 struct DoubleRect final
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 5d83a9fd7..bd6fe9f59 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -24,6 +24,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "guild.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/guildmanager.h b/src/guildmanager.h
index 2ceee2c71..b96580567 100644
--- a/src/guildmanager.h
+++ b/src/guildmanager.h
@@ -23,8 +23,6 @@
 
 #include "utils/stringvector.h"
 
-#include <map>
-
 #include "localconsts.h"
 
 class ChatTab;
diff --git a/src/logger.cpp b/src/logger.cpp
index e58e8f9eb..d070e7a42 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -23,9 +23,6 @@
 #include "logger.h"
 
 #include <iostream>
-#include <sstream>
-
-#include "configuration.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/main.cpp b/src/main.cpp
index 79b435faa..5141951ed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,6 @@
 #include "main.h"
 
 #include "client.h"
-#include "logger.h"
 
 #include <getopt.h>
 #include <iostream>
@@ -47,8 +46,6 @@
 #include <windows.h>
 #endif
 
-#include <SDL_version.h>
-
 #include "debug.h"
 
 char *selfName = nullptr;
diff --git a/src/map.cpp b/src/map.cpp
index c28f45b71..21c527f2c 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -24,7 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
+#include "render/graphics.h"
 #include "maplayer.h"
+#include "notifications.h"
 #include "notifymanager.h"
 #include "simpleanimation.h"
 #include "tileset.h"
@@ -39,8 +41,6 @@
 #include "resources/resourcemanager.h"
 #include "resources/subimage.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "utils/dtor.h"
 #include "utils/mkdir.h"
 #include "utils/physfstools.h"
diff --git a/src/maplayer.cpp b/src/maplayer.cpp
index 332bf3547..a6f726c90 100644
--- a/src/maplayer.cpp
+++ b/src/maplayer.cpp
@@ -31,6 +31,8 @@
 
 #include "being/localplayer.h"
 
+#include "render/graphics.h"
+
 #include "resources/resourcemanager.h"
 
 #include "gui/gui.h"
diff --git a/src/maplayer.h b/src/maplayer.h
index d20531e98..9c5a70cd2 100644
--- a/src/maplayer.h
+++ b/src/maplayer.h
@@ -33,7 +33,6 @@
 #include <vector>
 
 class MapItem;
-class MapLayer;
 class SpecialLayer;
 class ImageVertexes;
 
diff --git a/src/mouseinput.h b/src/mouseinput.h
index 5753a2abf..9fe1c73eb 100644
--- a/src/mouseinput.h
+++ b/src/mouseinput.h
@@ -25,8 +25,6 @@
 
 #include "localconsts.h"
 
-#include <string>
-
 class MouseInput final : public gcn::MouseInput
 {
     public:
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 892422f76..053f54db8 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -26,6 +26,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "inventory.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index a7879f6fc..d40f351c1 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -25,6 +25,7 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "guildmanager.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 1909cd6df..0f0192dfa 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -24,6 +24,7 @@
 
 #include "client.h"
 #include "game.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 4dc0f7f6e..47205f2f4 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -23,6 +23,7 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index d2bcd6a23..69e1d7587 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -22,6 +22,7 @@
 
 #include "net/ea/inventoryhandler.h"
 
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 0a87bf370..cd0c3cdfc 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -23,6 +23,7 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 5106e0ecc..b0d2f1f95 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -24,6 +24,7 @@
 
 #include "game.h"
 #include "party.h"
+#include "notifications.h"
 #include "notifymanager.h"
 #include "units.h"
 
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index e363385e1..9ec815c53 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -23,6 +23,7 @@
 #include "net/ea/skillhandler.h"
 
 #include "logger.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index d22bf71ea..6fa76eca5 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -25,6 +25,7 @@
 #include "inventory.h"
 #include "item.h"
 #include "logger.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index e52945a98..69f03cc61 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -24,6 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "game.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/playerrelations.h"
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 8b44ac409..76f465872 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -25,6 +25,7 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "inventory.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index e00fd4119..27b228a7b 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -22,6 +22,7 @@
 #include "net/eathena/partyhandler.h"
 
 #include "actorspritemanager.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 1c48284b7..c43f608eb 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -24,6 +24,7 @@
 
 #include "actorspritemanager.h"
 #include "game.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/playerrelations.h"
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 46a95b44d..d0a7b67b7 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -25,6 +25,7 @@
 #include "actorspritemanager.h"
 #include "configuration.h"
 #include "inventory.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 1b29cde46..2124679e9 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,6 +22,7 @@
 #include "net/tmwa/partyhandler.h"
 
 #include "actorspritemanager.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp
index 6c99532f7..91e059ed5 100644
--- a/src/notifymanager.cpp
+++ b/src/notifymanager.cpp
@@ -21,6 +21,7 @@
 #include "notifymanager.h"
 
 #include "guildmanager.h"
+#include "notifications.h"
 #include "soundmanager.h"
 
 #include "being/localplayer.h"
diff --git a/src/notifymanager.h b/src/notifymanager.h
index 3290613ab..58dfc556b 100644
--- a/src/notifymanager.h
+++ b/src/notifymanager.h
@@ -21,8 +21,6 @@
 #ifndef NOTIFYMANAGER_H
 #define NOTIFYMANAGER_H
 
-#include "notifications.h"
-
 #include <string>
 
 namespace NotifyManager
diff --git a/src/resources/sounddb.cpp b/src/resources/sounddb.cpp
index beda71b88..6dcf20b17 100644
--- a/src/resources/sounddb.cpp
+++ b/src/resources/sounddb.cpp
@@ -23,6 +23,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "logger.h"
+#include "notifications.h"
 #include "notifymanager.h"
 
 #include "utils/xml.h"
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 46052febc..de0050fa4 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -26,11 +26,8 @@
 
 #include "render/graphics.h"
 
-#include "utils/stringutils.h"
-
 #include "resources/animation.h"
 #include "resources/dye.h"
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp
index fa76d2fd1..acac04e19 100644
--- a/src/spellshortcut.cpp
+++ b/src/spellshortcut.cpp
@@ -22,17 +22,6 @@
 
 #include "spellshortcut.h"
 
-#include "configuration.h"
-#include "inventory.h"
-#include "item.h"
-
-#include "being/localplayer.h"
-
-#include "gui/widgets/chattab.h"
-
-#include "net/inventoryhandler.h"
-#include "net/net.h"
-
 #include "debug.h"
 
 SpellShortcut *spellShortcut;
diff --git a/src/spellshortcut.h b/src/spellshortcut.h
index c2f6b87ff..82c269925 100644
--- a/src/spellshortcut.h
+++ b/src/spellshortcut.h
@@ -25,8 +25,6 @@
 
 #include "spellmanager.h"
 
-class TextCommand;
-
 const unsigned int SPELLS_SIZE = SPELL_SHORTCUT_ITEMS * SPELL_SHORTCUT_TABS;
 
 /**
diff --git a/src/statuseffect.h b/src/statuseffect.h
index 0a38e54f6..32450ac4a 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -27,7 +27,7 @@
 
 #include "particle/particle.h"
 
-#include "resources/animation.h"
+#include "localconsts.h"
 
 class StatusEffect final
 {
diff --git a/src/text.cpp b/src/text.cpp
index 687700193..a2cd492c2 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -30,7 +30,6 @@
 #include "gui/sdlfont.h"
 #include "gui/theme.h"
 
-#include "resources/resourcemanager.h"
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index 5115ec6c2..7fe51ae44 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -20,10 +20,6 @@
 
 #include "touchactions.h"
 
-#include "actionmanager.h"
-#include "configuration.h"
-#include "game.h"
-#include "logger.h"
 #include "mouseinput.h"
 #include "touchmanager.h"
 
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 8bd2d6159..2a7962065 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -27,10 +27,8 @@
 
 #include "input/keydata.h"
 
-#include <guichan/mouseinput.hpp>
 #include <guichan/rectangle.hpp>
 
-#include <map>
 #include <string>
 #include <vector>
 
@@ -39,7 +37,6 @@
 class ImageCollection;
 class ImageRect;
 class MouseInput;
-class Skin;
 
 typedef void (*TouchFuncPtr) (const MouseInput &mouseInput);
 
diff --git a/src/units.cpp b/src/units.cpp
index efccca11c..a5cc75213 100644
--- a/src/units.cpp
+++ b/src/units.cpp
@@ -28,7 +28,6 @@
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
-#include <cmath>
 #include <climits>
 #include <vector>