15 files changed, 8 insertions, 40 deletions
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 144eddae3..85bb758f9 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -34,7 +34,6 @@
 
 #include "localconsts.h"
 
-class Image;
 class LinkHandler;
 
 struct BrowserLink final
diff --git a/src/gui/widgets/containerplacer.cpp b/src/gui/widgets/containerplacer.cpp
index 1e9ac98ff..91b4e45ff 100644
--- a/src/gui/widgets/containerplacer.cpp
+++ b/src/gui/widgets/containerplacer.cpp
@@ -23,7 +23,7 @@
 #include "gui/widgets/containerplacer.h"
 
 #include "gui/widgets/basiccontainer2.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 298348f78..400365a84 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -30,7 +30,6 @@
 
 #include "input/keydata.h"
 
-#include "listeners/actionlistener.h"
 #include "listeners/guitableactionlistener.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 1f67da953..463837cdd 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -22,14 +22,6 @@
 
 #include "gui/widgets/layout.h"
 
-#include "logger.h"
-
-#include "gui/widgets/basiccontainer2.h"
-
-#include "utils/delete2.h"
-
-#include <cassert>
-
 #include "debug.h"
 
 Layout::Layout() :
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 86b5dddcb..9c0154ff6 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -25,13 +25,8 @@
 
 #include "gui/widgets/layoutcell.h"
 
-#include <vector>
-
 #include "localconsts.h"
 
-class BasicContainer2;
-class Widget;
-
 /**
  * This class is an helper for setting the position of widgets. They are
  * positioned along the cells of some rectangular tables. The layout may either
diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp
index b174ba5b3..57a8f5f26 100644
--- a/src/gui/widgets/layoutarray.cpp
+++ b/src/gui/widgets/layoutarray.cpp
@@ -24,11 +24,9 @@
 
 #include "logger.h"
 
-#include "gui/widgets/basiccontainer2.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/layouttype.h"
-
-#include "utils/delete2.h"
+#include "gui/widgets/widget.h"
 
 #include <cassert>
 
diff --git a/src/gui/widgets/layoutarray.h b/src/gui/widgets/layoutarray.h
index f6fffde18..bf41281cd 100644
--- a/src/gui/widgets/layoutarray.h
+++ b/src/gui/widgets/layoutarray.h
@@ -23,13 +23,11 @@
 #ifndef GUI_WIDGETS_LAYOUTARRAY_H
 #define GUI_WIDGETS_LAYOUTARRAY_H
 
-#include "gui/widgets/layoutcell.h"
-
 #include <vector>
 
 #include "localconsts.h"
 
-class BasicContainer2;
+class LayoutCell;
 class Widget;
 
 /**
diff --git a/src/gui/widgets/layoutcell.cpp b/src/gui/widgets/layoutcell.cpp
index 9f5996284..7a537d35c 100644
--- a/src/gui/widgets/layoutcell.cpp
+++ b/src/gui/widgets/layoutcell.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/layoutcell.h"
 
-#include "gui/widgets/layout.h"
 #include "gui/widgets/layoutarray.h"
 #include "gui/widgets/widget.h"
 
@@ -103,7 +102,7 @@ LayoutCell &LayoutCell::at(const int x, const int y)
     return getArray().at(x, y);
 }
 
-LayoutCell &LayoutCell::place(Widget *wg,
+LayoutCell &LayoutCell::place(Widget *const wg,
                               const int x, const int y,
                               const int w, const int h)
 {
diff --git a/src/gui/widgets/layoutcell.h b/src/gui/widgets/layoutcell.h
index f262ebb05..25783558c 100644
--- a/src/gui/widgets/layoutcell.h
+++ b/src/gui/widgets/layoutcell.h
@@ -25,11 +25,7 @@
 
 #include "localconsts.h"
 
-#include <vector>
-
-class BasicContainer2;
 class LayoutArray;
-class LayoutCell;
 class Widget;
 
 /**
@@ -93,7 +89,7 @@ class LayoutCell
         /**
          * @see LayoutArray::place
          */
-        LayoutCell &place(Widget *wg,
+        LayoutCell &place(Widget *const wg,
                           const int x, const int y,
                           const int w = 1, const int h = 1);
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 1877e1940..c96310e6f 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -27,6 +27,7 @@
 
 #include "listeners/widgetlistener.h"
 
+class BasicContainer2;
 class ContainerPlacer;
 
 /**
diff --git a/src/gui/widgets/layouttype.h b/src/gui/widgets/layouttype.h
index aecd4bcd4..ffc2cb829 100644
--- a/src/gui/widgets/layouttype.h
+++ b/src/gui/widgets/layouttype.h
@@ -37,6 +37,6 @@ namespace LayoutType
         SET = -43, /**< Uses the share as the new size. */
         ADD = -44  /**< Adds the share to the current size. */
     };
-}
+}  // namespace LayoutType
 
 #endif  // GUI_WIDGETS_LAYOUTTYPE_H
diff --git a/src/gui/widgets/linepart.h b/src/gui/widgets/linepart.h
index 34bc76e8e..c1b1fb357 100644
--- a/src/gui/widgets/linepart.h
+++ b/src/gui/widgets/linepart.h
@@ -29,7 +29,6 @@
 #include "localconsts.h"
 
 class Image;
-class LinkHandler;
 
 class LinePart final
 {
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 4dcce4b9c..723131edc 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -27,7 +27,6 @@
 #include "being/localplayer.h"
 
 #include "gui/models/ignorechoiceslistmodel.h"
-#include "gui/models/playerrelationlistmodel.h"
 #include "gui/models/playertablemodel.h"
 
 #include "gui/widgets/button.h"
@@ -40,7 +39,6 @@
 #include "gui/widgets/guitable.h"
 
 #include "utils/delete2.h"
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 6ba74449d..5cf4e905b 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -27,7 +27,6 @@
 
 #include "gui/windows/okdialog.h"
 
-#include "gui/models/extendedlistmodel.h"
 #include "gui/models/fontsizechoicelistmodel.h"
 #include "gui/models/fontsmodel.h"
 #include "gui/models/langlistmodel.h"
@@ -44,8 +43,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include "resources/resourcemanager.h"
-
 #include "debug.h"
 
 const char* ACTION_THEME = "theme";
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index be3697426..c72b4a3ed 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -44,15 +44,12 @@
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/sdlhelper.h"
 
 #include "test/testmain.h"
 
 #include "gui/models/modelistmodel.h"
 #include "gui/models/opengllistmodel.h"
 
-#include <algorithm>
-
 #include "debug.h"
 
 extern Graphics *mainGraphics;