12 files changed, 13 insertions, 14 deletions
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index e2424cb7b..a79a9b842 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -27,8 +27,6 @@
 
 #include "net/serverinfo.h"
 
-#include "utils/stringvector.h"
-
 #include "localconsts.h"
 
 class UpdateListModel final : public ListModel
diff --git a/src/gui/palette.h b/src/gui/palette.h
index ebcc2936f..66dba9905 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -28,12 +28,6 @@
 
 #include "gui/color.h"
 
-#if defined __native_client__
-#include <stdlib.h>
-#else
-#include <cstdlib>
-#endif
-
 #include <map>
 #include <set>
 #include <string>
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 5edc9384e..a6d83f4d5 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -24,6 +24,7 @@
 #include "gui/widgets/browserbox.h"
 
 #include "itemcolormanager.h"
+#include "main.h"
 #include "settings.h"
 
 #include "const/resources/item/cards.h"
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index d1a7822a1..253dd58ab 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -22,6 +22,7 @@
 #include "gui/widgets/desktop.h"
 
 #include "configuration.h"
+#include "main.h"
 
 #include "gui/skin.h"
 
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 63d956cf2..a6abf6b3b 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -46,14 +46,11 @@
 #include "test/testmain.h"
 #endif  // defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
 
-
-#ifndef USE_OPENGL
-#include "render/renderers.h"
-#endif
-
 #if defined(ANDROID) || defined(__APPLE__) || !defined(USE_OPENGL)
 #include "configuration.h"
+#endif
 
+#if defined(ANDROID) || defined(__APPLE__)
 #include "utils/stringutils.h"
 #endif
 
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 79e7b93d5..d38328728 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -28,7 +28,6 @@
 
 #include "being/localplayer.h"
 
-#include "net/net.h"
 #include "net/partyhandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
index 81b4f8172..cc99dc4b9 100644
--- a/src/gui/widgets/tabs/socialtabbase.h
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -23,8 +23,12 @@
 
 #include "actormanager.h"
 
+ACTORMANAGER_H
+
 #include "enums/resources/map/mapitemtype.h"
 
+ENUMS_RESOURCES_MAP_MAPITEMTYPE_H
+
 #define addAvatars(mob, str, type) \
 {\
     ava = new Avatar(str);\
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 9176c448a..8da30d648 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -25,6 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "game.h"
+#include "main.h"
 #include "settings.h"
 #include "spellmanager.h"
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 93512e053..ea6511e37 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -25,6 +25,7 @@
 #include "chatlogger.h"
 #include "client.h"
 #include "configuration.h"
+#include "main.h"
 #include "settings.h"
 
 #include "net/download.h"
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index 19c1e6c52..17211c1cd 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -24,6 +24,7 @@
 
 #include "configuration.h"
 #include "game.h"
+#include "main.h"
 
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/statuswindow.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 3d7e23fb3..8dd88f9c6 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -24,6 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
+#include "main.h"
 #include "settings.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 0bc7e3703..c644dc149 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -25,6 +25,7 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "guild.h"
+#include "main.h"
 #include "party.h"
 #ifdef TMWA_SUPPORT
 #include "settings.h"