13 files changed, 8 insertions, 20 deletions
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"