Prepare our source so that it'll survive a guichan header cleanup, should it ever happen...

33 files changed, 70 insertions, 5 deletions

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 6fc91858..5a87fa5b 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -23,7 +23,9 @@
 
 #include "browserbox.h"
 
+#include <guichan/graphics.hpp>
 #include <guichan/imagefont.hpp>
+#include <guichan/mouseinput.hpp>
 
 #include "linkhandler.h"
 #include "gui.h"
diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp
index f587e020..0fec4e8c 100644
--- a/src/gui/buddywindow.cpp
+++ b/src/gui/buddywindow.cpp
@@ -22,9 +22,12 @@
  */
 
 #include "buddywindow.h"
-#include "scrollarea.h"
+
+#include <guichan/widgets/listbox.hpp>
+
 #include "button.h"
 #include "chat.h"
+#include "scrollarea.h"
 
 extern ChatWindow *chatWindow;
 
diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h
index 4468f74e..5526e13f 100644
--- a/src/gui/buddywindow.h
+++ b/src/gui/buddywindow.h
@@ -24,12 +24,12 @@
 #ifndef _TMW_BUDDYWINDOW_H
 #define _TMW_BUDDYWINDOW_H
 
-#include <guichan/widgets/button.hpp>
-#include <guichan/widgets/listbox.hpp>
-#include <guichan/widgets/scrollarea.hpp>
+#include <guichan/actionlistener.hpp>
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 #include "../resources/buddylist.h"
 
 /**
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 4ff4f768..f1c81b60 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -24,10 +24,12 @@
 #ifndef _TMW_BUYSELL_H
 #define _TMW_BUYSELL_H
 
-#include <guichan/widgets/button.hpp>
+#include <guichan/actionlistener.hpp>
 
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 /**
  * A dialog to choose between buying or selling at a shop.
  *
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 2457634d..ec2e90d1 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -24,6 +24,7 @@
 #ifndef _CHAR_SEL_SERVER_H
 #define _CHAR_SEL_SERVER_H
 
+#include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
 
 #include "window.h"
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index de1169b0..c42e06ec 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -23,6 +23,8 @@
 #ifndef _TMW_CHARGE_H
 #define _TMW_CHARGE_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 class ProgressBar;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ca24ac47..72de3c83 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -24,6 +24,7 @@
 #include "chat.h"
 
 #include <guichan/focushandler.hpp>
+#include <guichan/key.hpp>
 
 #include "browserbox.h"
 #include "chatinput.h"
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 248aabc6..1766bd08 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -28,6 +28,9 @@
 #include <list>
 #include <string>
 
+#include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index cec13cc5..457cd748 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_OPTION_DIALOG_H
 #define _TMW_OPTION_DIALOG_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 66ee420f..0470ba6f 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_EQUIPMENT_H
 #define _TMW_EQUIPMENT_H 
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 class Spriteset;
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 82476d17..6c9d77cc 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -24,8 +24,12 @@
 #ifndef _TMW_FOCUSHANDLER_H
 #define _TMW_FOCUSHANDLER_H
 
+#include <list>
+
 #include <guichan/focushandler.hpp>
 
+#include "../guichanfwd.h"
+
 /**
  * The focus handler. This focus handler does exactly the same as the Guichan
  * focus handler, but keeps a stack of modal widgets to be able to handle
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 97bc8153..1c2b2063 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,6 +24,7 @@
 #include "gui.h"
 
 #include <guichan/exception.hpp>
+#include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
 
 #ifdef USE_OPENGL
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 959fa2ed..e612a7fe 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -25,6 +25,7 @@
 #define _TMW_GUI
 
 #include <guichan/gui.hpp>
+#include <guichan/mouselistener.hpp>
 
 #include "../guichanfwd.h"
 
diff --git a/src/gui/help.h b/src/gui/help.h
index d2bada56..6a0c6551 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_HELP_H
 #define _TMW_HELP_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 #include "linkhandler.h"
 
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 781fb580..1f26433d 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -25,6 +25,8 @@
 
 #include <sstream>
 
+#include <guichan/key.hpp>
+
 IntTextBox::IntTextBox():
     value(0)
 {
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 9ed6bb75..b89f19a3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -26,6 +26,8 @@
 #include <string>
 #include <sstream>
 
+#include <guichan/mouseinput.hpp>
+
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index cec4aa15..c45245d6 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_INVENTORYWINDOW_H
 #define _TMW_INVENTORYWINDOW_H 
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 01004927..8c5260bf 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -26,6 +26,8 @@
 
 #include <iosfwd>
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 7c7baddc..81a85b8d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -25,6 +25,8 @@
 
 #include <sstream>
 
+#include <guichan/mouseinput.hpp>
+
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 1e266fb8..5b20bb55 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -23,6 +23,10 @@
 
 #include "listbox.h"
 
+#include <guichan/font.hpp>
+#include <guichan/graphics.hpp>
+#include <guichan/listmodel.hpp>
+
 ListBox::ListBox():
     gcn::ListBox()
 {
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index cdd82ad2..afcd0eec 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_NSKILL_H
 #define _TMW_NSKILL_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 2930a00a..41301aa9 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -26,6 +26,8 @@
 
 #include <iosfwd>
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 1db3dd4e..6dcf1e6a 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -24,6 +24,8 @@
 #ifndef _OK_DIALOG_H
 #define _OK_DIALOG_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 51316fa8..7f27607b 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -23,6 +23,9 @@
 
 #include "passwordfield.h"
 
+#include <guichan/font.hpp>
+#include <guichan/graphics.hpp>
+
 
 PasswordField::PasswordField(const std::string& text):
     TextField(text)
diff --git a/src/gui/requesttrade.h b/src/gui/requesttrade.h
index b6783331..8c9ac29a 100644
--- a/src/gui/requesttrade.h
+++ b/src/gui/requesttrade.h
@@ -26,6 +26,8 @@
 
 #include <iosfwd>
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/setup.h b/src/gui/setup.h
index cfe709dc..3fa41dd4 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -26,6 +26,7 @@
 
 #include <vector>
 
+#include <guichan/actionlistener.hpp>
 #include <guichan/listmodel.hpp>
 
 #include "window.h"
diff --git a/src/gui/stats.h b/src/gui/stats.h
index 3d7d0f52..a6b799ce 100644
--- a/src/gui/stats.h
+++ b/src/gui/stats.h
@@ -26,6 +26,8 @@
 
 #include <iosfwd>
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 45ccb75d..d6abd7af 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -26,6 +26,8 @@
 
 #include <iosfwd>
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 315e0c0b..329813e5 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -26,6 +26,7 @@
 #include <sstream>
 
 #include <guichan/basiccontainer.hpp>
+#include <guichan/font.hpp>
 
 TextBox::TextBox():
     gcn::TextBox()
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 5055c328..ec3b55b4 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -23,6 +23,8 @@
 
 #include "textfield.h"
 
+#include <guichan/font.hpp>
+
 #include "../graphics.h"
 
 #include "../graphic/imagerect.h"
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 6fdfcb92..7cb350da 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -24,6 +24,8 @@
 #ifndef _TMW_TRADE_H
 #define _TMW_TRADE_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index c062b484..fa69bd4b 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -24,6 +24,8 @@
 #ifndef _UPDATERWINDOW_H
 #define _UPDATERWINDOW_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 3376d4ae..cc85c0ef 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -27,6 +27,8 @@
 
 #include <SDL.h>
 
+#include <guichan/image.hpp>
+
 #include "log.h"
 
 #include "resources/image.h"