12 files changed, 26 insertions, 20 deletions
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 005ba7c72..e2ab3bf83 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -28,6 +28,8 @@
 
 #include "gui/widgets/listbox.h"
 
+#include "gui/base/listmodel.hpp"
+
 #include <string>
 
 class Image;
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
index 4d29e24d3..c019d9aac 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/widgets/colormodel.h
@@ -23,13 +23,17 @@
 
 #include "utils/stringvector.h"
 
-#include "gui/base/color.hpp"
 #include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
 
 class Widget2;
 
+namespace gcn
+{
+    class Color;
+}
+
 struct ColorPair
 {
     ColorPair(const gcn::Color* c1, const gcn::Color* c2) :
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index a1908a3c6..9bb459d45 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -23,10 +23,7 @@
 #ifndef GUI_WIDGETS_DROPDOWN_H
 #define GUI_WIDGETS_DROPDOWN_H
 
-#include "gui/widgets/widget2.h"
-
 #include "gui/base/basiccontainer.hpp"
-//#include "gui/base/listmodel.hpp"
 
 #include "listeners/actionlistener.h"
 #include "listeners/focuslistener.h"
@@ -37,10 +34,7 @@
 #include "localconsts.h"
 
 class Image;
-class ImageRect;
-class ListBox;
 class PopupList;
-class ScrollArea;
 class Skin;
 
 namespace gcn
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index d68e222ac..96f2a9532 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -26,7 +26,6 @@
 #include "localconsts.h"
 
 #include "gui/widgets/tablemodel.h"
-#include "gui/widgets/widget2.h"
 
 #include "listeners/keylistener.h"
 #include "listeners/mouselistener.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 3e9a99a2a..2cf27ae30 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -48,6 +48,7 @@ namespace
     struct OpenUrlListener : public ActionListener
     {
         OpenUrlListener() :
+            ActionListener(),
             url()
         {
         }
@@ -65,6 +66,7 @@ namespace
 }  // namespace
 
 ItemLinkHandler::ItemLinkHandler() :
+    LinkHandler(),
     mItemPopup(new ItemPopup)
 {
     mItemPopup->postInit();
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index b6adf9fba..b63c9b10e 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -22,8 +22,6 @@
 #ifndef GUI_WIDGETS_LABEL_H
 #define GUI_WIDGETS_LABEL_H
 
-#include "gui/widgets/widget2.h"
-
 #include "gui/base/widgets/label.hpp"
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index f1ebee317..625f21085 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -23,12 +23,23 @@
 #ifndef GUI_WIDGETS_LISTBOX_H
 #define GUI_WIDGETS_LISTBOX_H
 
+#include "gui/base/color.hpp"
+
 #include "gui/base/widgets/listbox.hpp"
 
+#include "render/graphics.h"
+
 #include "localconsts.h"
 
 class Skin;
+class KeyEvent;
+class MouseEvent;
+class Widget2;
 
+namespace gcn
+{
+    class ListModel;
+}
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
  * box except this one doesn't have a background, instead completely relying
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index d3fb4e5e3..7481dc9db 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WIDGETS_PLAYERBOX_H
 #define GUI_WIDGETS_PLAYERBOX_H
 
-#include "gui/widgets/widget2.h"
-
 #include "gui/base/widgets/scrollarea.hpp"
 
 #include "localconsts.h"
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 45f52d3b3..a495d7c46 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -25,14 +25,17 @@
 
 #include "listeners/focuslistener.h"
 
-#include "gui/base/listmodel.hpp"
-
 #include "localconsts.h"
 
 class DropDown;
 class ListBox;
 class ScrollArea;
 
+namespace gcn
+{
+    class ListModel;
+}
+
 class PopupList final : public Popup,
                         public FocusListener
 {
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 87b7c46f9..502d85d21 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -21,9 +21,6 @@
 #ifndef GUI_WIDGETS_SETUPITEM_H
 #define GUI_WIDGETS_SETUPITEM_H
 
-//#include "gui/widgets/button.h"
-//#include "gui/widgets/tabs/setuptabscroll.h"
-
 #include "gui/widgets/widget2.h"
 
 #include "listeners/actionlistener.h"
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
index f4c213b2f..d50af8ff3 100644
--- a/src/gui/widgets/setuptouchitem.cpp
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -27,7 +27,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/vertcontainer.h"
 
-#include "gui/widgets/tabs/setuptabscroll.h" 
+#include "gui/widgets/tabs/setuptabscroll.h"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index bfa721b7a..b05a498dc 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WIDGETS_TEXTFIELD_H
 #define GUI_WIDGETS_TEXTFIELD_H
 
-#include "gui/widgets/widget2.h"
-
 #include "listeners/focuslistener.h"
 
 #include "gui/base/widgets/textfield.hpp"