Removed unused includes in various files

20 files changed, 7 insertions, 41 deletions

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 6a77e229..fe72a29c 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -23,9 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "log.h"
-
-#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 194e6afe..1aab931a 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -39,8 +39,6 @@
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
-#include "utils/xml.h"
 
 #include "localplayer.h"
 
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index c945fd4b..4ed4db3e 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -21,8 +21,6 @@
 #ifndef SPECIALSWINDOW_H
 #define SPECIALSWINDOW_H
 
-#include <vector>
-
 #include "playerinfo.h"
 
 #include "gui/widgets/window.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index b2a395e9..0c5fca68 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -24,7 +24,6 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/palette.h"
 #include "gui/textpopup.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 81a0ea46..234d6676 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,7 +24,6 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/palette.h"
 #include "gui/sdlinput.h"
 
 #include "gui/widgets/listbox.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 0d63ddf2..4379b4d9 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -21,7 +21,6 @@
 
 #include "gui/widgets/playerbox.h"
 
-#include "animatedsprite.h"
 #include "being.h"
 #include "configuration.h"
 #include "graphics.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 9397d59e..4190c0e4 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -26,7 +26,6 @@
 #include "textrenderer.h"
 
 #include "gui/gui.h"
-#include "gui/palette.h"
 
 #include "resources/image.h"
 #include "resources/theme.h"
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 15a10d33..223d91ec 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -24,8 +24,6 @@
 #include "configuration.h"
 #include "graphics.h"
 
-#include "gui/palette.h"
-
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 818a7966..42ef9440 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -23,12 +23,13 @@
 #include "configuration.h"
 #include "keyboardconfig.h"
 
-#include "gui/sdlinput.h"
 #include "gui/setup_keyboard.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include <SDL.h>
+
 struct KeyData
 {
     const char *configField;
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 6be90d51..ac432e41 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -23,17 +23,13 @@
 
 #include "actorspritemanager.h"
 #include "being.h"
-#include "client.h"
-#include "game.h"
 #include "localplayer.h"
-#include "log.h"
-#include "particle.h"
 
 #include "gui/okdialog.h"
 
 #include "net/net.h"
 
-#include "net/manaserv/inventoryhandler.h"
+#include "net/inventoryhandler.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/playerhandler.h"
 #include "net/manaserv/manaserv_protocol.h"
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index c8c23c7f..4665a70d 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -28,14 +28,13 @@
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
 
-#include "net/logindata.h"
+#include "net/inventoryhandler.h"
 #include "net/loginhandler.h"
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/gamehandler.h"
 #include "net/manaserv/beinghandler.h"
-#include "net/manaserv/inventoryhandler.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/manaserv_protocol.h"
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index cf673a4d..1102bb08 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -23,7 +23,6 @@
 #define NET_TA_CHARSERVERHANDLER_H
 
 #include "net/charhandler.h"
-#include "net/serverinfo.h"
 
 #include "net/tmwa/messagehandler.h"
 #include "net/tmwa/token.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 7b08d83c..0bc1f9c0 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
-#include "configuration.h"
 #include "equipment.h"
 #include "event.h"
 #include "game.h"
@@ -32,7 +31,6 @@
 #include "log.h"
 
 #include "gui/equipmentwindow.h"
-#include "gui/widgets/chattab.h"
 
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/messageout.h"
@@ -41,7 +39,6 @@
 #include "resources/iteminfo.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 extern Net::InventoryHandler *inventoryHandler;
 
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index a3e83c42..708dfc9a 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -27,8 +27,6 @@
 #include "eventlistener.h"
 #include "log.h"
 
-#include "resources/iteminfo.h"
-
 namespace PlayerInfo {
 
 class PlayerLogic;
diff --git a/src/playerinfo.h b/src/playerinfo.h
index 69434d5b..925c5078 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -22,7 +22,6 @@
 #define PLAYERINFO_H
 
 #include <map>
-#include <string>
 
 /**
  * Standard attributes for players.
diff --git a/src/resources/hairdb.cpp b/src/resources/hairdb.cpp
index 310ba0c4..ff301a23 100644
--- a/src/resources/hairdb.cpp
+++ b/src/resources/hairdb.cpp
@@ -23,8 +23,6 @@
 
 #include "log.h"
 
-#include <cassert>
-
 #define COLOR_WHITE "#ffffff"
 
 
diff --git a/src/resources/hairdb.h b/src/resources/hairdb.h
index 80c1bb7b..65cca496 100644
--- a/src/resources/hairdb.h
+++ b/src/resources/hairdb.h
@@ -22,10 +22,10 @@
 #ifndef HAIR_MANAGER_H
 #define HAIR_MANAGER_H
 
-#include "iteminfo.h"
-
 #include <map>
+#include <set>
 #include <string>
+#include <vector>
 #include "utils/xml.h"
 
 /**
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 7297041f..cd027763 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -23,10 +23,8 @@
 
 #include "log.h"
 
-#include "net/net.h"
-
 #include "resources/hairdb.h"
-#include "resources/resourcemanager.h"
+#include "resources/iteminfo.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp
index f4ea1902..8c758280 100644
--- a/src/resources/theme.cpp
+++ b/src/resources/theme.cpp
@@ -23,7 +23,6 @@
 
 #include "resources/theme.h"
 
-#include "client.h"
 #include "configuration.h"
 #include "log.h"
 
diff --git a/src/resources/userpalette.cpp b/src/resources/userpalette.cpp
index 4ce9db66..16a19d19 100644
--- a/src/resources/userpalette.cpp
+++ b/src/resources/userpalette.cpp
@@ -23,15 +23,10 @@
 #include "resources/userpalette.h"
 
 #include "configuration.h"
-#include "client.h"
-
-#include "gui/gui.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <cmath>
-
 static const std::string ColorTypeNames[] = {
     "ColorBeing",
     "ColorPlayer",