Remove useless includes from .h files.

94 files changed, 59 insertions, 154 deletions

diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp
index 5081ed124..599d8b815 100644
--- a/src/gui/dialogsmanager.cpp
+++ b/src/gui/dialogsmanager.cpp
@@ -29,6 +29,8 @@
 
 #include "enums/gui/dialogtype.h"
 
+#include "being/playerinfo.h"
+
 #include "gui/widgets/selldialog.h"
 
 #include "gui/windows/confirmdialog.h"
diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h
index 91128c6cd..2e0dfad7f 100644
--- a/src/gui/fonts/font.h
+++ b/src/gui/fonts/font.h
@@ -71,8 +71,6 @@
 
 #include <SDL_ttf.h>
 
-#include <string>
-
 #include "localconsts.h"
 
 class Graphics;
diff --git a/src/gui/fonts/textchunklist.h b/src/gui/fonts/textchunklist.h
index d85efe75d..d89a8ab3b 100644
--- a/src/gui/fonts/textchunklist.h
+++ b/src/gui/fonts/textchunklist.h
@@ -24,7 +24,6 @@
 #include "gui/fonts/textchunksmall.h"
 
 #include <map>
-#include <string>
 
 #include "localconsts.h"
 
diff --git a/src/gui/models/avatarlistmodel.h b/src/gui/models/avatarlistmodel.h
index bda7b686e..ec11b40ad 100644
--- a/src/gui/models/avatarlistmodel.h
+++ b/src/gui/models/avatarlistmodel.h
@@ -26,8 +26,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include <string>
-
 class AvatarListModel notfinal : public ListModel
 {
     public:
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index 5bedc9756..7e8caced2 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -26,8 +26,6 @@
 
 #include "utils/dtor.h"
 
-#include <vector>
-
 class BeingsListModel final : public AvatarListModel
 {
     public:
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index eb230b4ce..c6dea9603 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -23,8 +23,6 @@
 #ifndef GUI_MODELS_IGNORECHOICESLISTMODEL_H
 #define GUI_MODELS_IGNORECHOICESLISTMODEL_H
 
-#include "being/playerrelations.h"
-
 #include "gui/models/playerrelationlistmodel.h"
 
 #include "being/playerignorestrategy.h"
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index eb026febe..1f88efe9f 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -29,8 +29,6 @@
 
 #include "resources/db/itemdb.h"
 
-#include "utils/gettext.h"
-
 #include <list>
 
 #include "localconsts.h"
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 743e8da07..864cc70c6 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -23,8 +23,6 @@
 #ifndef GUI_MODELS_SERVERSLISTMODEL_H
 #define GUI_MODELS_SERVERSLISTMODEL_H
 
-#include "net/serverinfo.h"
-
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -33,9 +31,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include <string>
-#include <vector>
-
 /**
  * Server and Port List Model
  */
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index d3d4a44fc..880bc4f71 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -25,7 +25,6 @@
 
 #include "gui/models/listmodel.h"
 
-#include <string>
 #include <vector>
 
 #include "localconsts.h"
diff --git a/src/gui/models/skillmodel.h b/src/gui/models/skillmodel.h
index e4a4949a5..cf5a4fb6d 100644
--- a/src/gui/models/skillmodel.h
+++ b/src/gui/models/skillmodel.h
@@ -26,8 +26,6 @@
 #include "gui/widgets/skillinfo.h"
 #include "gui/models/listmodel.h"
 
-#include <string>
-
 #include "localconsts.h"
 
 class SkillModel final : public ListModel
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
index d29ff201c..4711d4607 100644
--- a/src/gui/models/sortlistmodelinv.h
+++ b/src/gui/models/sortlistmodelinv.h
@@ -26,8 +26,6 @@
 
 #include "utils/gettext.h"
 
-#include <string>
-
 static const char *const SORT_NAME_INVENTORY[6] =
 {
     // TRANSLATORS: inventory sort mode
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index 1a109f62e..08e00bf63 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -27,8 +27,6 @@
 
 #include "net/logindata.h"
 
-#include "utils/gettext.h"
-
 #include "localconsts.h"
 
 class UpdateListModel final : public ListModel
diff --git a/src/gui/models/userstablemodel.h b/src/gui/models/userstablemodel.h
index 2f6201024..788fcd2d0 100644
--- a/src/gui/models/userstablemodel.h
+++ b/src/gui/models/userstablemodel.h
@@ -24,7 +24,6 @@
 
 #include "gui/windows/botcheckerwindow.h"
 
-#include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 
 #include "gui/models/tablemodel.h"
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 5f9a5dae9..c8bf5de47 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -35,9 +35,7 @@
 #endif
 
 #include <map>
-#include <string>
 #include <set>
-#include <vector>
 
 // Default Gradient Delay
 #define GRADIENT_DELAY 40
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
index ad44928e7..bd5899726 100644
--- a/src/gui/popups/createpartypopup.h
+++ b/src/gui/popups/createpartypopup.h
@@ -27,7 +27,6 @@
 #include "gui/widgets/popup.h"
 #include "gui/windows/socialwindow.h"
 
-#include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index 3e6cf8747..4d6d86aed 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -24,8 +24,6 @@
 #ifndef GUI_POPUPS_SPEECHBUBBLE_H
 #define GUI_POPUPS_SPEECHBUBBLE_H
 
-#include "gui/theme.h"
-
 #include "gui/widgets/popup.h"
 
 class Label;
diff --git a/src/gui/skin.h b/src/gui/skin.h
index 150c04eeb..c3e4e01b2 100644
--- a/src/gui/skin.h
+++ b/src/gui/skin.h
@@ -27,9 +27,6 @@
 
 #include "utils/stringmap.h"
 
-#include <map>
-#include <string>
-
 #include "localconsts.h"
 
 class Image;
diff --git a/src/gui/theme.h b/src/gui/theme.h
index de995e2ef..7bb1006b3 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -33,8 +33,6 @@
 
 #include "utils/stringvector.h"
 
-#include <map>
-
 #include "localconsts.h"
 
 class DyePalette;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 7d0f38501..691e02318 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -25,8 +25,6 @@
 
 #include "position.h"
 
-#include "listeners/configlistener.h"
-
 #include "gui/widgets/windowcontainer.h"
 
 #include "listeners/mouselistener.h"
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.
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index cc101aff8..e68665aac 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WINDOWMENU_H
 #define GUI_WINDOWMENU_H
 
-#include "listeners/configlistener.h"
-
 #include "gui/widgets/container.h"
 
 #include "listeners/actionlistener.h"
@@ -33,9 +31,6 @@
 
 #include "localconsts.h"
 
-#include <map>
-#include <vector>
-
 class Button;
 
 struct ButtonInfo;
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp
index a7fd4ea44..9f1973426 100644
--- a/src/gui/windows/botcheckerwindow.cpp
+++ b/src/gui/windows/botcheckerwindow.cpp
@@ -24,6 +24,7 @@
 
 #include "gui/windows/setupwindow.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/guitable.h"
 
diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h
index 64aab4bca..76f06af4c 100644
--- a/src/gui/windows/botcheckerwindow.h
+++ b/src/gui/windows/botcheckerwindow.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WINDOWS_BOTCHECKERWINDOW_H
 #define GUI_WINDOWS_BOTCHECKERWINDOW_H
 
-#include "listeners/configlistener.h"
-
 #include "gui/widgets/window.h"
 
 #include "listeners/actionlistener.h"
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index 822947c22..80ffea7ae 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -34,6 +34,7 @@
 
 #include "listeners/wrongdatanoticelistener.h"
 
+#include "net/logindata.h"
 #include "net/loginhandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 049f00a5e..9fe950211 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -35,6 +35,7 @@
 
 #include "listeners/wrongdatanoticelistener.h"
 
+#include "net/logindata.h"
 #include "net/loginhandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 85a23ed64..9468fa29a 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -51,6 +51,7 @@
 #include "gui/widgets/containerplacer.h"
 
 #include "net/character.h"
+#include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/registrationoptions.h"
 #include "net/serverfeatures.h"
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index ca7d6111c..9e9871c5a 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WINDOWS_CHARSELECTDIALOG_H
 #define GUI_WINDOWS_CHARSELECTDIALOG_H
 
-#include "main.h"
-
 #include "gui/widgets/window.h"
 
 #include "net/charserverhandler.h"
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 7dbe104c6..3bbb40e5e 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -35,10 +35,6 @@
 #include "listeners/keylistener.h"
 #include "listeners/statlistener.h"
 
-#include <list>
-#include <map>
-#include <set>
-
 class Button;
 class ChannelTab;
 class ChatTab;
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 0b5fe10f1..3320f9e1e 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -42,6 +42,8 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/tabstrip.h"
 
+#include "render/renderers.h"
+
 #include "resources/equipmentslots.h"
 #include "resources/imageset.h"
 
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 27526486a..a8073b3c4 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -33,8 +33,6 @@
 
 #include "listeners/actionlistener.h"
 
-#include <vector>
-
 class Being;
 class Button;
 class Image;
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index 661c7013c..b1f09b60f 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -30,9 +30,6 @@
 
 #include "localconsts.h"
 
-#include <map>
-#include <set>
-
 class Button;
 class BrowserBox;
 class ScrollArea;
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index bf3077c1d..568da1cc1 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -23,6 +23,7 @@
 #include "gui/windows/inventorywindow.h"
 
 #include "configuration.h"
+#include "item.h"
 #include "units.h"
 
 #include "being/playerinfo.h"
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 01289a4c3..7198d087a 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/windows/itemamountwindow.h"
 
+#include "item.h"
+
 #include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
@@ -44,6 +46,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
+#include "utils/gettext.h"
+
 #include <cmath>
 
 #include "debug.h"
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 89626598e..cd40d5d41 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -41,6 +41,10 @@
 
 #include "utils/gettext.h"
 
+#ifdef WIN32
+#include <sys/time.h>
+#endif
+
 #include "debug.h"
 
 KillStats *killStats = nullptr;
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index 593bca63d..6e53304ce 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -28,8 +28,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include <string>
-
 class Button;
 class CheckBox;
 class DropDown;
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 965f1d71c..8fcb175ef 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -37,6 +37,7 @@
 
 #include "gui/windows/setupwindow.h"
 
+#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 7051465c6..ec2cf05b2 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -27,6 +27,7 @@
 #include "inventory.h"
 
 #include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "enums/being/attributes.h"
 
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 548344728..923e74696 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -31,8 +31,6 @@
 
 #include "gui/widgets/window.h"
 
-#include <vector>
-
 class AnimatedSprite;
 class Graphics;
 class Inventory;
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 72a42701b..c74721b87 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -23,18 +23,12 @@
 #ifndef GUI_WINDOWS_NPCDIALOG_H
 #define GUI_WINDOWS_NPCDIALOG_H
 
-#include "listeners/configlistener.h"
-
 #include "gui/models/extendedlistmodel.h"
 
 #include "gui/widgets/window.h"
 
-#include "utils/stringvector.h"
-
 #include "listeners/actionlistener.h"
 
-#include <list>
-
 class Being;
 class Button;
 class BrowserBox;
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index f06e2a2ef..927b32540 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -29,9 +29,6 @@
 
 #include "listeners/actionlistener.h"
 
-#include <map>
-#include <vector>
-
 class Being;
 class Button;
 class BrowserBox;
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index 9ff6dd763..96614401f 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -28,8 +28,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include <vector>
-
 class Button;
 class RadioButton;
 
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index 8d7d84480..fdddfec6f 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -39,6 +39,7 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/radiobutton.h"
 
+#include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/registrationoptions.h"
 #include "net/serverfeatures.h"
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index f59ff4ab7..e64177591 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -35,8 +35,6 @@
 #include "listeners/keylistener.h"
 #include "listeners/selectionlistener.h"
 
-#include <string>
-
 class Button;
 class CheckBox;
 class Label;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 53bfae9cc..d890f3f02 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -27,8 +27,6 @@
 
 #include "listeners/actionlistener.h"
 
-#include <list>
-
 class Button;
 class Label;
 class SetupTab;
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 48ab6bba4..65134aac1 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -28,6 +28,7 @@
 #include "spellmanager.h"
 
 #include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "enums/being/attributes.h"
 
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index d5f015e5d..a3a10101e 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -27,9 +27,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/playerrelationslistener.h"
 
-#include <string>
-#include <map>
-
 class Button;
 class ConfirmDialog;
 class CreatePartyPopup;
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 2c66884ae..14a81b003 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -24,12 +24,14 @@
 
 #include "configuration.h"
 #include "gamemodifiers.h"
+#include "item.h"
 #include "settings.h"
 #include "units.h"
 
 #include "gui/windows/chatwindow.h"
 
 #include "being/localplayer.h"
+#include "being/playerinfo.h"
 
 #include "enums/being/attributes.h"
 
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index 34462498b..bde444fe5 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -29,8 +29,6 @@
 #include "listeners/attributelistener.h"
 #include "listeners/statlistener.h"
 
-#include <map>
-
 class AttrDisplay;
 class Button;
 class Label;
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index f08d88963..b93c53507 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -30,8 +30,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/selectionlistener.h"
 
-#include <memory>
-
 class Button;
 class Inventory;
 class Item;
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index 5dc99f720..24ce90108 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -34,6 +34,7 @@
 
 #include "listeners/wrongdatanoticelistener.h"
 
+#include "net/logindata.h"
 #include "net/loginhandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 6d3d7f49b..93922a7a9 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -35,9 +35,6 @@
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include <string>
-#include <vector>
-
 class BrowserBox;
 class Button;
 class Label;
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 1a8f1c1c9..8ec7d3c2d 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -23,13 +23,9 @@
 #ifndef GUI_WINDOWS_WHOISONLINE_H
 #define GUI_WINDOWS_WHOISONLINE_H
 
-#include "listeners/configlistener.h"
-
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include <set>
-
 #include "listeners/actionlistener.h"
 
 class BrowserBox;