9 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 4433b646..6626b848 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -41,6 +41,8 @@
 #include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
+#include "../resources/colordb.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 #include "../utils/trim.h"
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 055d9963..5a5acfad 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -24,7 +24,6 @@
 #include <guichan/widgets/label.hpp>
 
 #include "debugwindow.h"
-#include "gui.h"
 #include "viewport.h"
 
 #include "widgets/layout.h"
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 5ba9501d..e553fbe7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -26,7 +26,6 @@
 
 #include "button.h"
 #include "equipmentwindow.h"
-#include "gui.h"
 #include "itempopup.h"
 #include "playerbox.h"
 #include "viewport.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 9681d44a..5c0c24f7 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -115,7 +115,6 @@ class Gui : public gcn::Gui
 };
 
 extern Gui *gui;                              /**< The GUI system */
-extern Viewport *viewport;                    /**< The viewport */
 extern SDLInput *guiInput;                    /**< GUI input */
 
 /**
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index a3572d4f..70b3efb5 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -27,7 +27,6 @@
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
-#include "gui.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index e152b03d..d3cc2c22 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -20,7 +20,6 @@
  */
 #include <SDL_mouse.h>
 
-#include "gui.h"
 #include "itemshortcutcontainer.h"
 #include "itempopup.h"
 #include "viewport.h"
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 393fc6aa..2edc6983 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -53,7 +53,7 @@ private:
     PlayerTableModel *mPlayerTableModel;
     GuiTable *mPlayerTable;
     GuiTable *mPlayerTitleTable;
-    ScrollArea *mPlayerScrollArea;
+    gcn::ScrollArea *mPlayerScrollArea;
 
     gcn::CheckBox *mPersistIgnores;
     gcn::CheckBox *mDefaultTrading;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 11a0004b..25e69c43 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -19,7 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui.h"
 #include "popupmenu.h"
 #include "viewport.h"
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index e352f765..522ea734 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -27,13 +27,14 @@
 #include "windowcontainer.h"
 
 #include "../configlistener.h"
+#include "../position.h"
 
-class Map;
 class FloorItem;
+class Graphics;
 class ImageSet;
 class Item;
+class Map;
 class PopupMenu;
-class Graphics;
 
 /**
  * The viewport on the map. Displays the current map and handles mouse input
@@ -137,4 +138,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         PopupMenu *mPopupMenu;     /**< Popup menu. */
 };
 
+extern Viewport *viewport;                    /**< The viewport */
+
 #endif