Remove useless includes from .h files.

43 files changed, 35 insertions, 67 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index a508897d3..33d1b9331 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -40,6 +40,9 @@
 
 #include "gui/windows/chatwindow.h"
 
+#include "render/renderers.h"
+
+#include "resources/image.h"
 #include "resources/mapitemtype.h"
 
 #include "resources/map/map.h"
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 418b57a23..ad70e19dc 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -22,12 +22,8 @@
 #ifndef GUI_WIDGETS_AVATARLISTBOX_H
 #define GUI_WIDGETS_AVATARLISTBOX_H
 
-#include "listeners/configlistener.h"
-
 #include "gui/widgets/listbox.h"
 
-#include <string>
-
 class AvatarListModel;
 class Image;
 
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index fcbf7f6dd..eaa354f6e 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -64,9 +64,6 @@
 #ifndef GUI_WIDGETS_BASICCONTAINER_H
 #define GUI_WIDGETS_BASICCONTAINER_H
 
-#include <set>
-#include <vector>
-
 #include "gui/widgets/widget.h"
 
 #include "listeners/widgetdeathlistener.h"
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 0251a9895..d8e0f0748 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -29,9 +29,6 @@
 #include "gui/widgets/linepart.h"
 #include "gui/widgets/widget.h"
 
-#include <list>
-#include <vector>
-
 #include "localconsts.h"
 
 class LinkHandler;
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 39b09ae0b..1d3d4427b 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -79,6 +79,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index e771a677b..ef46e9abe 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/container.h"
 
-#include "listeners/actionlistener.h"
-
 #include "localconsts.h"
 
 class CharacterViewBase notfinal : public Container,
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index ef8d222dd..d167f8bd9 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -25,6 +25,8 @@
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 5cdd28ab1..8c58b793d 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -24,8 +24,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include <vector>
-
 struct EmoteSprite;
 
 /**
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 3b9e19a65..2257a8cb0 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -31,8 +31,6 @@
 
 #include "gui/widgets/widget.h"
 
-#include <vector>
-
 class GuiTableActionListener;
 class TableModel;
 
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index e506f68cc..302eeaea7 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -29,8 +29,6 @@
 
 #include "gui/widgets/widget.h"
 
-#include <list>
-
 #include "localconsts.h"
 
 class Image;
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 0c39066a5..105f569cf 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -66,8 +66,6 @@
 #ifndef GUI_WIDGETS_LISTBOX_H
 #define GUI_WIDGETS_LISTBOX_H
 
-#include "gui/color.h"
-
 #include "gui/widgets/widget.h"
 
 #include "listeners/keylistener.h"
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 2d07460c4..4775e266f 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -29,6 +29,8 @@
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "resources/image.h"
+
 #include "debug.h"
 
 PlayerBox::PlayerBox(Widget2 *const widget,
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index d887d75cf..a2c441225 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -30,6 +30,8 @@
 
 #include "gui/widgets/windowcontainer.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 850748eee..2692363f4 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -30,6 +30,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 99f920ab6..2a379a998 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -29,8 +29,6 @@
 
 #include "resources/imagerect.h"
 
-#include <string>
-
 #include "localconsts.h"
 
 class ImageCollection;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index ddf0fd21f..924546329 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -74,6 +74,8 @@
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 5e2696411..a16547cd1 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -23,10 +23,6 @@
 #ifndef GUI_WIDGETS_SERVERSLISTBOX_H
 #define GUI_WIDGETS_SERVERSLISTBOX_H
 
-#include "gui/fonts/font.h"
-
-#include "gui/theme.h"
-
 #include "gui/widgets/listbox.h"
 
 #include "gui/models/serverslistmodel.h"
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index f5657c48e..4fbb81e23 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -26,7 +26,6 @@
 #include "listeners/actionlistener.h"
 
 #include <list>
-#include <vector>
 
 class Button;
 class CheckBox;
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 5ac740eb2..1ac9a9d69 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -27,6 +27,8 @@
 
 #include "gui/gui.h"
 
+#include "render/renderers.h"
+
 #include "resources/image.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
index a90ef926a..943aa929c 100644
--- a/src/gui/widgets/skilldata.h
+++ b/src/gui/widgets/skilldata.h
@@ -25,6 +25,8 @@
 
 #include "resources/soundinfo.h"
 
+#include <string>
+
 class Image;
 
 struct SkillData final
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index 26b82ce25..4ab0331af 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -28,9 +28,9 @@
 #include "resources/skillowner.h"
 #include "resources/skilltype.h"
 
+#include <string>
 #include <vector>
 #include <map>
-#include <string>
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index 387bde055..344bffa59 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -23,17 +23,16 @@
 #ifndef GUI_WIDGETS_SKILLLISTBOX_H
 #define GUI_WIDGETS_SKILLLISTBOX_H
 
-#include "gui/widgets/listbox.h"
-
 #include "dragdrop.h"
 
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
-#include "gui/fonts/font.h"
-
+#include "gui/widgets/listbox.h"
 #include "gui/widgets/skilldata.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/skillmodel.h"
 
 #include "gui/popups/skillpopup.h"
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 4ea34209c..e867c9528 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -72,6 +72,8 @@
 
 #include "gui/gui.h"
 
+#include "render/renderers.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index b28c1cfba..ee336c616 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -27,8 +27,6 @@
 
 #include "gui/widgets/label.h"
 
-#include "events/actionevent.h"
-
 #include "listeners/actionlistener.h"
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 727d12de2..eef6cfd5d 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -53,6 +53,10 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
+#ifdef WIN32
+#include <sys/time.h>
+#endif
+
 #include "debug.h"
 
 ChatTab *localChatTab = nullptr;
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index f6cfd7828..569c21e2b 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -26,8 +26,6 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <string>
-
 class Button;
 class ListBox;
 class KeyListModel;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 5a023be9f..2d446452e 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WIDGETS_TABS_SETUP_RELATIONS_H
 #define GUI_WIDGETS_TABS_SETUP_RELATIONS_H
 
-#include "being/playerrelations.h"
-
 #include "gui/widgets/tabs/setuptab.h"
 
 #include "listeners/playerrelationslistener.h"
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 3f88316c8..caf12e4cd 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -41,6 +41,8 @@
 #include "gui/widgets/slider.h"
 #include "gui/widgets/dropdown.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 7c46ea66c..a9fd785ef 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -28,8 +28,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/widgetlistener.h"
 
-#include <string>
-
 #include "localconsts.h"
 
 /**
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 8c2c2f590..f701ea6ed 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -23,9 +23,6 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <map>
-#include <set>
-
 #include "localconsts.h"
 
 class SetupItem;
diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h
index fdc3c9df7..3cacb5ca9 100644
--- a/src/gui/widgets/tabs/skilltab.h
+++ b/src/gui/widgets/tabs/skilltab.h
@@ -29,8 +29,6 @@
 
 #include "gui/widgets/tabs/tab.h"
 
-#include "utils/delete2.h"
-
 #include "localconsts.h"
 
 class SkillTab final : public Tab
diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index 6ef13cfb7..e3311c5ba 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/tabs/socialtab.h"
 
-#include "actormanager.h"
-
 #include "being/localplayer.h"
 
 #include "gui/models/beingslistmodel.h"
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index b14bac2b2..229591096 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -36,8 +36,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include <algorithm>
-
 #include "localconsts.h"
 
 class SocialFriendsTab final : public SocialTab
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 4c966b2ca..88354bb50 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -30,7 +30,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include "net/net.h"
 #include "net/guildhandler.h"
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index f5e2d7ae0..1274bdcfa 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/tabs/socialtab.h"
 
-#include "actormanager.h"
-
 #include "being/localplayer.h"
 
 #include "gui/models/beingslistmodel.h"
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
index bcc02b449..24d11eaf1 100644
--- a/src/gui/widgets/tabs/socialtabbase.h
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -25,8 +25,6 @@
 
 #include "resources/mapitemtype.h"
 
-#include "resources/map/mapitem.h"
-
 #define addAvatars(mob, str, type) \
 {\
     ava = new Avatar(str);\
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 174478eb1..2f300fb5f 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -74,6 +74,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "render/renderers.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 6a0192a32..bb7e49633 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -26,8 +26,6 @@
 
 #include "listeners/widgetlistener.h"
 
-#include <vector>
-
 #include "localconsts.h"
 
 /**
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index a66fcc030..8191754e5 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -65,11 +65,6 @@
 #define GUI_WIDGETS_WIDGET_H
 
 #include <list>
-#include <set>
-#include <string>
-
-#include "gui/color.h"
-#include "gui/rect.h"
 
 #include "gui/widgets/widget2.h"
 
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index 31e47034d..c8ee90406 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -23,8 +23,6 @@
 
 #include "gui/theme.h"
 
-#include "render/renderers.h"
-
 class Widget2 notfinal
 {
     public:
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 82cd77a0d..f29027566 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -87,6 +87,8 @@
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/layout.h"
 
+#include "render/renderers.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 17db9778f..dd59242e8 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -66,8 +66,6 @@
 #ifndef GUI_WIDGETS_WINDOW_H
 #define GUI_WIDGETS_WINDOW_H
 
-#include "render/graphics.h"
-
 #include "listeners/mouselistener.h"
 #include "listeners/widgetlistener.h"
 
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index 299624d93..9ca92c9f6 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/container.h"
 
-#include <vector>
-
 /**
  * A window container. This container adds functionality for more convenient
  * widget (windows in particular) destruction.