6 files changed, 11 insertions, 6 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 61817053a..26f665052 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -44,6 +44,7 @@
 
 #include "gui/windows/emotewindow.h"
 #include "gui/windows/setupwindow.h"
+#include "gui/widgets/tabbedarea.h"
 #include "gui/windows/whoisonline.h"
 
 #include "gui/widgets/tabs/battletab.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index b4d14e404..30d202054 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -36,6 +36,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/tabbedarea.h"
 
 #include "resources/imagehelper.h"
 
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index e17b8f432..0780865aa 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -45,6 +45,7 @@
 #include "gui/widgets/tabs/setup_visual.h"
 
 #include "gui/widgets/label.h"
+#include "gui/widgets/tabbedarea.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 65dcf23e5..f5406e8ac 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -20,10 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WINDOWS_SETUP_H
-#define GUI_WINDOWS_SETUP_H
-
-#include "gui/widgets/tabbedarea.h"
+#ifndef GUI_WINDOWS_SETUPWINDOW_H
+#define GUI_WINDOWS_SETUPWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -31,8 +29,10 @@
 
 #include <list>
 
+class Button;
 class Label;
 class SetupTab;
+class TabbedArea;
 
 /**
  * The setup dialog. Displays several tabs for configuring different aspects
@@ -87,4 +87,4 @@ class SetupWindow final : public Window,
 
 extern SetupWindow* setupWindow;
 
-#endif  // GUI_WINDOWS_SETUP_H
+#endif  // GUI_WINDOWS_SETUPWINDOW_H
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 6a7a176a2..96ec8c93c 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -23,6 +23,7 @@
 #include "gui/windows/shortcutwindow.h"
 
 #include "gui/windows/setupwindow.h"
+#include "gui/widgets/tabbedarea.h"
 
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 8e5f4c312..2385066be 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -46,6 +46,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/scrollarea.h"
+#include "gui/widgets/tabbedarea.h"
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -1896,7 +1897,7 @@ void SocialWindow::updateGuildCounter(const int online, const int total)
     }
 }
 
-void SocialWindow::updatedPlayer(const std::string &name)
+void SocialWindow::updatedPlayer(const std::string &name A_UNUSED)
 {
     mNeedUpdate = true;
 }