8 files changed, 6 insertions, 10 deletions
diff --git a/src/gui/widgets/attrs/attrdisplay.h b/src/gui/widgets/attrs/attrdisplay.h
index 7659ff0cd..3eb7fc089 100644
--- a/src/gui/widgets/attrs/attrdisplay.h
+++ b/src/gui/widgets/attrs/attrdisplay.h
@@ -31,7 +31,6 @@
 
 #include "localconsts.h"
 
-class AttrDisplay;
 class LayoutHelper;
 
 class AttrDisplay notfinal : public Container
diff --git a/src/gui/widgets/attrs/changedisplay.h b/src/gui/widgets/attrs/changedisplay.h
index 92e5cb203..ad327bd2c 100644
--- a/src/gui/widgets/attrs/changedisplay.h
+++ b/src/gui/widgets/attrs/changedisplay.h
@@ -30,7 +30,6 @@
 #include "localconsts.h"
 
 class Button;
-class LayoutHelper;
 
 class ChangeDisplay final : public AttrDisplay,
                             public ActionListener
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index d03f1d623..a6d83f4d5 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -27,6 +27,8 @@
 #include "main.h"
 #include "settings.h"
 
+#include "const/resources/item/cards.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
@@ -45,8 +47,6 @@
 
 #include "resources/image/image.h"
 
-#include "resources/item/cardslist.h"
-
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 
diff --git a/src/gui/widgets/statspagebasic.cpp b/src/gui/widgets/statspagebasic.cpp
index c73837582..1e2ff3cac 100644
--- a/src/gui/widgets/statspagebasic.cpp
+++ b/src/gui/widgets/statspagebasic.cpp
@@ -37,6 +37,7 @@
 StatsPageBasic::StatsPageBasic(const Widget2 *const widget) :
     Container(widget),
     WidgetListener(),
+    AttributeListener(),
     StatListener(),
     mAttrs(),
     mAttrCont(new VertContainer(this, 32)),
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index f3ebbdaa4..dfc3c616e 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -201,7 +201,8 @@ void KillStats::resetTimes()
 
 void KillStats::gainXp(int xp)
 {
-    const int expNeed = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED);
+    const int expNeed = PlayerInfo::getAttribute(
+        Attributes::PLAYER_EXP_NEEDED);
     if (xp == expNeed)
         xp = 0;
     else if (!xp)
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index c322c6c0a..5e53c7362 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -35,7 +35,6 @@
 
 #include "utils/xml.h"
 
-class Being;
 class Button;
 class Label;
 class SkillModel;
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index b6a6e9ceb..16e00fed7 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -37,7 +37,7 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/createwidget.h"
-#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/layout.h"
 #include "gui/widgets/layouttype.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/statspage.h"
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index ce9685689..414e9a265 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -29,15 +29,12 @@
 #include "listeners/attributelistener.h"
 #include "listeners/statlistener.h"
 
-class AttrDisplay;
 class Button;
 class Label;
 class ProgressBar;
-class ScrollArea;
 class StatsPage;
 class StatsPageBasic;
 class TabbedArea;
-class VertContainer;
 
 /**
  * The player status dialog.