5 files changed, 15 insertions, 9 deletions
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index e4edc8857..4e8e77003 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -22,14 +22,17 @@
 #ifndef DESKTOP_H
 #define DESKTOP_H
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/container.h"
 
 #include <guichan/widgetlistener.hpp>
 
 class Image;
 
+namespace gcn
+{
+    class Label;
+}
+
 /**
  * Desktop widget, for drawing a background image and color.
  *
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 5572abd03..39ced1119 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -25,8 +25,6 @@
 #define POPUP_H
 
 #include "configuration.h"
-#include "guichanfwd.h"
-
 #include "gui/widgets/container.h"
 
 #include <guichan/mouselistener.hpp>
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 52f8515c7..6a1fdc026 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/tabbedarea.h"
 
-#include "guichanfwd.h"
-
 #include "gui/widgets/setuptabscroll.h"
 #include "gui/widgets/window.h"
 
@@ -45,6 +43,11 @@ class Slider;
 class SliderList;
 class TextField;
 
+namespace gcn
+{
+    class ListModel;
+}
+
 class SetupItem : public gcn::ActionListener
 {
     public:
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index e931888e4..0e459a014 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -23,11 +23,14 @@
 #ifndef TABLE_MODEL_H
 #define TABLE_MODEL_H
 
-#include <guichanfwd.h>
-
 #include <set>
 #include <vector>
 
+namespace gcn
+{
+    class Widget;
+}
+
 class TableModelListener
 {
 public:
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 13883980e..6e6fcdaf0 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -24,7 +24,6 @@
 #define WINDOW_H
 
 #include "graphics.h"
-#include "guichanfwd.h"
 #include "localconsts.h"
 
 #include <guichan/widgetlistener.hpp>