Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 6 insertions, 7 deletions

diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 22c8a9b6..2edc6983 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -24,17 +24,16 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "button.h"
-#include "scrollarea.h"
 #include "setuptab.h"
-#include "table.h"
 
-#include "../guichanfwd.h"
 #include "../player_relations.h"
 
+class GuiTable;
 class PlayerTableModel;
+class StaticTableModel;
 
-class Setup_Players : public SetupTab, public gcn::ActionListener, public PlayerRelationsListener
+class Setup_Players : public SetupTab, 
+                      public gcn::ActionListener, public PlayerRelationsListener
 {
 public:
     Setup_Players();
@@ -54,13 +53,13 @@ private:
     PlayerTableModel *mPlayerTableModel;
     GuiTable *mPlayerTable;
     GuiTable *mPlayerTitleTable;
-    ScrollArea *mPlayerScrollArea;
+    gcn::ScrollArea *mPlayerScrollArea;
 
     gcn::CheckBox *mPersistIgnores;
     gcn::CheckBox *mDefaultTrading;
     gcn::CheckBox *mDefaultWhisper;
 
-    Button *mDeleteButton;
+    gcn::Button *mDeleteButton;
     gcn::DropDown *mIgnoreActionChoicesBox;
 };