5 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/base/basiccontainer.cpp b/src/gui/base/basiccontainer.cpp
index edc465726..9f2806016 100644
--- a/src/gui/base/basiccontainer.cpp
+++ b/src/gui/base/basiccontainer.cpp
@@ -69,8 +69,6 @@
 
 #include <algorithm>
 
-#include "gui/focushandler.h"
-
 #include "render/graphics.h"
 
 #include "debug.h"
diff --git a/src/gui/base/gui.hpp b/src/gui/base/gui.hpp
index 391a0520e..8c4ac4db0 100644
--- a/src/gui/base/gui.hpp
+++ b/src/gui/base/gui.hpp
@@ -67,13 +67,14 @@
 #include <list>
 #include <deque>
 
-#include "events/keyevent.h"
-
-#include "input/mouseinput.h"
+#include "localconsts.h"
 
+class Event;
 class FocusHandler;
 class Graphics;
+class KeyEvent;
 class KeyListener;
+class MouseInput;
 class SDLInput;
 
 namespace gcn
diff --git a/src/gui/base/widget.hpp b/src/gui/base/widget.hpp
index 6245d3c98..dd872d9a1 100644
--- a/src/gui/base/widget.hpp
+++ b/src/gui/base/widget.hpp
@@ -81,9 +81,7 @@ class FocusHandler;
 class FocusListener;
 class Font;
 class Graphics;
-class KeyInput;
 class KeyListener;
-class MouseInput;
 class MouseListener;
 class WidgetListener;
 
diff --git a/src/gui/base/widgets/listbox.cpp b/src/gui/base/widgets/listbox.cpp
index 02d94626c..765878834 100644
--- a/src/gui/base/widgets/listbox.cpp
+++ b/src/gui/base/widgets/listbox.cpp
@@ -69,6 +69,8 @@
 
 #include "gui/font.h"
 
+#include "gui/base/listmodel.hpp"
+
 #include "listeners/selectionlistener.h"
 
 #include "debug.h"
diff --git a/src/gui/base/widgets/listbox.hpp b/src/gui/base/widgets/listbox.hpp
index ff2df395c..c46aca6ae 100644
--- a/src/gui/base/widgets/listbox.hpp
+++ b/src/gui/base/widgets/listbox.hpp
@@ -66,7 +66,6 @@
 
 #include <list>
 
-#include "gui/base/listmodel.hpp"
 #include "gui/base/widget.hpp"
 
 #include "listeners/keylistener.h"
@@ -76,6 +75,8 @@ class SelectionListener;
 
 namespace gcn
 {
+    class ListModel;
+
     /**
      * An implementation of a list box where an item can be selected.
      *