7 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp
index 341513852..0b220594a 100644
--- a/src/gui/widgets/tabs/chat/guildtab.cpp
+++ b/src/gui/widgets/tabs/chat/guildtab.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/tabs/chat/guildtab.h"
 
 #include "configuration.h"
-#include "guild.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp
index 7c5adcd66..faccf9b2e 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.cpp
+++ b/src/gui/widgets/tabs/debugwindowtabs.cpp
@@ -32,10 +32,11 @@
 
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/layouthelper.h"
 
+#ifdef USE_OPENGL
 #include "resources/imagehelper.h"
+#endif
 
 #include "resources/map/map.h"
 
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index cf278b76e..e913f611c 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/tabs/setup_audio.h"
 
-#include "main.h"
-
 #include "resources/map/map.h"
 
 #include "configuration.h"
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index b93cf3ed5..28d52db0b 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -40,7 +40,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <string>
 #include <cmath>
 
 #include "debug.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 47d985a3e..de4990e5c 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -43,7 +43,6 @@
 #include "configuration.h"
 
 #include "utils/delete2.h"
-#include "utils/gettext.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index bd0f17411..0a0b97728 100644
--- a/src/gui/widgets/tabs/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -20,7 +20,6 @@
 
 #include "gui/widgets/tabs/setup_touch.h"
 
-#include "gui/models/namesmodel.h"
 #include "gui/models/touchactionmodel.h"
 
 #include "gui/widgets/containerplacer.h"
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 696927b6b..3f88316c8 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -24,8 +24,6 @@
 
 #include "configuration.h"
 
-#include "graphicsmanager.h"
-
 #include "enums/gui/dialogtype.h"
 
 #include "gui/windowmanager.h"
@@ -43,12 +41,13 @@
 #include "gui/widgets/slider.h"
 #include "gui/widgets/dropdown.h"
 
-#include "render/rendererslistsdl.h"
-
 #include "utils/delete2.h"
-#include "utils/gettext.h"
+
+#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__)
+#include "graphicsmanager.h"
 
 #include "test/testmain.h"
+#endif
 
 #include "gui/models/modelistmodel.h"
 #include "gui/models/opengllistmodel.h"