14 files changed, 1 insertions, 61 deletions
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index d95773cc7..33a55ef2b 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -24,7 +24,6 @@
 
 #include "client.h"
 
-#include "gui/windows/registerdialog.h"
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index ccad64b69..d809c5efc 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -24,7 +24,6 @@
 
 #include "client.h"
 
-#include "gui/windows/registerdialog.h"
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 5c12c5441..66460f4e7 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -34,7 +34,6 @@
 
 #include "gui/windows/charcreatedialog.h"
 #include "gui/windows/chardeleteconfirm.h"
-#include "gui/windows/confirmdialog.h"
 #include "gui/windows/logindialog.h"
 #include "gui/windows/okdialog.h"
 #include "gui/windows/textdialog.h"
@@ -44,7 +43,6 @@
 #include "gui/widgets/characterviewnormal.h"
 #include "gui/widgets/characterviewsmall.h"
 #include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layoutcell.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index bcfcf65f7..423aa556a 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -60,7 +60,6 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textfield.h"
 
 #include "gui/widgets/tabs/langtab.h"
 #include "gui/widgets/tabs/tradetab.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 523b72237..8dc915604 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -22,35 +22,16 @@
 
 #include "gui/windows/debugwindow.h"
 
-#include "game.h"
-#include "main.h"
-
 #include "being/localplayer.h"
 
-#include "particle/particle.h"
-
-#include "gui/viewport.h"
-
 #include "gui/windows/setupwindow.h"
 
-#include "gui/widgets/containerplacer.h"
-#include "gui/widgets/label.h"
-#include "gui/widgets/layoutcell.h"
-#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/tabbedarea.h"
 
 #include "gui/widgets/tabs/debugwindowtabs.h"
 
-#include "resources/imagehelper.h"
-
-#include "resources/map/map.h"
-
-#include "net/packetcounters.h"
-
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
-#include "utils/timer.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 79f0f30e6..c52ed6b05 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -23,10 +23,8 @@
 #ifndef GUI_WINDOWS_DEBUGWINDOW_H
 #define GUI_WINDOWS_DEBUGWINDOW_H
 
-#include "gui/widgets/container.h"
 #include "gui/widgets/window.h"
 
-class Label;
 class MapDebugTab;
 class NetDebugTab;
 class TabbedArea;
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index b8d1cb606..c2b00e87e 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -45,7 +45,6 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/icon.h"
 #include "gui/widgets/inttextfield.h"
-#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 9979bf8b1..01d1bcd61 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -50,7 +50,6 @@
 
 #include "utils/gettext.h"
 #include "utils/paths.h"
-#include "utils/process.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index ccb3e469c..e3276fae6 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -35,7 +35,6 @@
 #include "gui/viewport.h"
 
 #include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/radiobutton.h"
 
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 34c3d8f90..cac23c361 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -31,7 +31,6 @@
 #include "gui/widgets/shortcutcontainer.h"
 
 #include "gui/widgets/tabs/shortcuttab.h"
-#include "gui/widgets/tabs/tab.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f9351f29a..64bcdf137 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -23,20 +23,12 @@
 #include "gui/windows/skilldialog.h"
 
 #include "configuration.h"
-#include "dragdrop.h"
 #include "effectmanager.h"
 #include "itemshortcut.h"
 
 #include "being/attributes.h"
 #include "being/localplayer.h"
 
-#include "gui/skin.h"
-#include "gui/viewport.h"
-
-#include "gui/fonts/font.h"
-
-#include "gui/popups/textpopup.h"
-
 #include "gui/models/skillmodel.h"
 
 #include "gui/windows/setupwindow.h"
@@ -45,22 +37,20 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/skilllistbox.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 
 #include "gui/widgets/tabs/skilltab.h"
-#include "gui/widgets/tabs/tab.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
 #include "net/skillhandler.h"
 
-#include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "resources/beingcommon.h"
+#include "resources/skillconsts.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 3bf64df9b..e0ed1f1b2 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -27,9 +27,6 @@
 
 #include "listeners/actionlistener.h"
 
-const int SKILL_MIN_ID = 200000;
-const unsigned int SKILL_VAR_MIN_ID = 1000000;
-
 class Button;
 class Label;
 class SkillModel;
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 23869e5ea..2a858d964 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -21,36 +21,20 @@
 
 #include "gui/windows/socialwindow.h"
 
-#include "actormanager.h"
 #include "configuration.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "party.h"
-
-#include "resources/map/map.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/speciallayer.h"
 
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
-#include "input/keyboardconfig.h"
-
-#include "gui/models/beingslistmodel.h"
-
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/okdialog.h"
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/textdialog.h"
-#include "gui/windows/whoisonline.h"
-
-#include "gui/windows/outfitwindow.h"
 
-#include "gui/widgets/avatarlistbox.h"
 #include "gui/widgets/button.h"
-#include "gui/widgets/browserbox.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index 99336405c..ad0b98e0e 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -25,7 +25,6 @@
 #include "client.h"
 
 #include "gui/windows/okdialog.h"
-#include "gui/windows/registerdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"