Huge header cleanup to reduce dependencies and compile time.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/gui/trade.h b/src/gui/trade.h
index b767d47b..44815d66 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -24,9 +24,14 @@
 #ifndef _TMW_TRADE_H
 #define _TMW_TRADE_H
 
-#include "itemcontainer.h"
 #include "window.h"
-#include "scrollarea.h"
+
+#include "../guichanfwd.h"
+
+class Inventory;
+class Item;
+class ItemContainer;
+class ScrollArea;
 
 /**
  * Trade dialog.
@@ -101,8 +106,8 @@ class TradeWindow : public Window, gcn::ActionListener
          */
         void action(const std::string& eventId);
 
-        Inventory myInventory;
-        Inventory partnerInventory;
+        Inventory *myInventory;
+        Inventory *partnerInventory;
         ItemContainer *myItemContainer;
         ItemContainer *partnerItemContainer;