17 files changed, 1 insertions, 49 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 825e5756a..cb2a49249 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -38,7 +38,6 @@
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
 #include "gui/sdlinput.h"
-#include "gui/viewport.h"
 
 #include "gui/popups/popupmenu.h"
 
diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp
index 58de94b97..58383ef75 100644
--- a/src/gui/popups/skillpopup.cpp
+++ b/src/gui/popups/skillpopup.cpp
@@ -23,10 +23,6 @@
 
 #include "gui/popups/skillpopup.h"
 
-#include "configuration.h"
-#include "item.h"
-#include "units.h"
-
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -36,8 +32,6 @@
 #include "gui/widgets/skillinfo.h"
 #include "gui/widgets/textbox.h"
 
-#include "utils/gettext.h"
-
 #include "debug.h"
 
 extern int serverVersion;
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 48d3a86fc..0ea6a0666 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -71,7 +71,6 @@
 
 #include "gui/gui.h"
 #include "gui/skin.h"
-#include "gui/viewport.h"
 #ifdef ANDROID
 #include "gui/windowmanager.h"
 #endif
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index c71eb4055..2b5210775 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -23,7 +23,6 @@
 #include "gui/windows/whoisonline.h"
 
 #include "actormanager.h"
-#include "client.h"
 #include "configuration.h"
 #include "guild.h"
 #include "party.h"
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index d43d5dc50..554cbf730 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/ea/beinghandler.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "actormanager.h"
 #include "configuration.h"
 #include "effectmanager.h"
@@ -36,19 +34,10 @@
 
 #include "particle/particle.h"
 
-#include "input/keyboardconfig.h"
-
 #include "gui/windows/botcheckerwindow.h"
-#include "gui/windows/outfitwindow.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/killstats.h"
 
-#include "utils/timer.h"
-
-#include "resources/iteminfo.h"
-
-#include "resources/db/itemdb.h"
-
 #include "resources/map/map.h"
 
 #include "debug.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 10f10860e..36ac3d012 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -23,8 +23,6 @@
 #include "net/ea/charserverhandler.h"
 
 #include "client.h"
-#include "configuration.h"
-#include "settings.h"
 
 #include "gui/dialogtype.h"
 
@@ -33,8 +31,6 @@
 
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
-#include "net/ea/gamehandler.h"
-#include "net/ea/network.h"
 
 #include "net/character.h"
 #include "net/messagein.h"
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 42e9b73fe..fec1d1781 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -25,8 +25,6 @@
 
 #include "net/charserverhandler.h"
 
-class ServerInfo;
-
 namespace Net
 {
     class MessageIn;
@@ -35,8 +33,6 @@ namespace Net
 namespace Ea
 {
 
-class Network;
-
 /**
  * Deals with incoming messages from the character server.
  */
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 9f307f545..4bec39513 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -27,7 +27,7 @@
 #include "guildmanager.h"
 #include "notifymanager.h"
 
-#include "being/localplayer.h"
+#include "being/being.h"
 #include "being/playerrelations.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index e8e114c30..64e952680 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -26,8 +26,6 @@
 #include "game.h"
 #include "notifymanager.h"
 
-#include "being/localplayer.h"
-
 #include "gui/dialogtype.h"
 
 #include "gui/windows/okdialog.h"
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 488863a0d..d0017fd03 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -26,7 +26,6 @@
 
 #include "being/attributes.h"
 #include "being/localplayer.h"
-#include "being/pickup.h"
 
 #include "net/messagein.h"
 
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index a20663ea7..d4f7dfbaa 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -29,8 +29,6 @@
 
 #include "gui/windows/buydialog.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "net/eathena/protocol.h"
 
 #include "resources/notifytypes.h"
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 28f3f59d4..2f6898303 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -28,8 +28,6 @@
 
 #include "being/attributes.h"
 
-#include "gui/windows/editdialog.h"
-
 #include "net/character.h"
 #include "net/logindata.h"
 #include "net/net.h"
@@ -47,9 +45,6 @@
 #include "resources/db/itemdb.h"
 
 #include "utils/dtor.h"
-#include "utils/gettext.h"
-
-#include "listeners/pincodelistener.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 6748666c0..b955101d1 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -22,7 +22,6 @@
 #include "net/eathena/partyhandler.h"
 
 #include "actormanager.h"
-#include "configuration.h"
 #include "notifymanager.h"
 #include "party.h"
 
@@ -36,8 +35,6 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
-#include "net/eathena/gui/partytab.h"
-
 #include "resources/notifytypes.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index a11558a86..77ad01e19 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/eathena/playerhandler.h"
 
-#include "actormanager.h"
-
 #include "being/attributes.h"
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index fdb8f86ba..2c8414a1c 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -29,8 +29,6 @@
 
 #include "gui/windows/buydialog.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "resources/notifytypes.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 813726b6d..da8070fd2 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,7 +22,6 @@
 #include "net/tmwa/partyhandler.h"
 
 #include "actormanager.h"
-#include "configuration.h"
 #include "notifymanager.h"
 #include "party.h"
 
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 416183e3f..4942912a5 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -20,8 +20,6 @@
 
 #include "net/tmwa/serverfeatures.h"
 
-#include "net/net.h"
-
 #include "debug.h"
 
 extern int serverVersion;