9 files changed, 3 insertions, 22 deletions
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index fad7e83d..a3e54df0 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -57,6 +57,4 @@ class BuySellDialog : public Window, public gcn::ActionListener
         gcn::Button *cancelButton;
 };
 
-extern BuySellDialog *buySellDialog;
-
 #endif
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index 4d38f0e2..d17bdeb2 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -48,6 +48,4 @@ class ChargeDialog : public Window
         ProgressBar* progBar;
 };
 
-extern ChargeDialog* chargeDialog;
-
 #endif
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index eebfc29d..b629ddab 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -22,21 +22,17 @@
  */
 
 #include "debugwindow.h"
-#include "button.h"
-#include "minimap.h"
 
 #include <guichan/widgets/label.hpp>
 #include <sstream>
+#include <SDL_mouse.h>
+
+#include "button.h"
 
 #include "../game.h"
-#include "../graphics.h"
 #include "../engine.h"
 #include "../map.h"
 
-extern Graphics *graphics;
-extern Minimap *minimap;
-extern int frame;
-
 DebugWindow::DebugWindow():
     Window("Debug")
 {
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 7d2ee6c1..a2480f79 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -63,6 +63,4 @@ class DebugWindow : public Window, public gcn::ActionListener
 
 };
 
-extern DebugWindow *debugWindow;
-
 #endif
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 83f731db..c4c47a88 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -36,7 +36,6 @@ class Graphics;
 class Image;
 class Item;
 class PopupMenu;
-class WindowContainer;
 
 /**
  * \defgroup GUI Core GUI related classes (widgets)
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 0c6a5ef1..f10717bc 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -70,7 +70,5 @@ class MiniStatusWindow : public Window, public gcn::ActionListener {
         gcn::Label *hpLabel, *mpLabel;
 };
 
-extern MiniStatusWindow *miniStatusWindow;
-
 #endif
  
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index aa6aa725..4a0e8b49 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -75,6 +75,4 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         gcn::ScrollArea *scrollArea;
 };
 
-extern NpcTextDialog *npcTextDialog;
-
 #endif
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 9b30002a..142819b5 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -102,6 +102,4 @@ class SellDialog : public Window, public gcn::ActionListener,
         int m_amountItems;
 };
 
-extern SellDialog *sellDialog;
-
 #endif
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 2acb1af2..b76b9a55 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -116,6 +116,4 @@ class Setup : public Window, public gcn::ActionListener
         bool soundEnabled;
 };
 
-extern Setup *setupWindow;
-
 #endif