diff -r a1e00acc5986 src/devices/wifi/aarf-wifi-manager.h
--- a/src/devices/wifi/aarf-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/aarf-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -40,7 +40,7 @@
   virtual ~AarfWifiManager ();
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/aarfcd-wifi-manager.h
--- a/src/devices/wifi/aarfcd-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/aarfcd-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -43,7 +43,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/amrr-wifi-manager.h
--- a/src/devices/wifi/amrr-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/amrr-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -44,7 +44,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/arf-wifi-manager.h
--- a/src/devices/wifi/arf-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/arf-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -47,7 +47,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/cara-wifi-manager.h
--- a/src/devices/wifi/cara-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/cara-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -43,7 +43,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/constant-rate-wifi-manager.h
--- a/src/devices/wifi/constant-rate-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/constant-rate-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -41,7 +41,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/dca-txop.h
--- a/src/devices/wifi/dca-txop.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/dca-txop.h	Fri May 28 11:09:52 2010 +1000
@@ -114,7 +114,7 @@
   class Dcf;
   friend class Dcf;
   friend class TransmissionListener;
-  friend class WifiRemoteStation;
+  friend struct WifiRemoteStation;
 
   DcaTxop &operator = (const DcaTxop &);
   DcaTxop (const DcaTxop &o);
diff -r a1e00acc5986 src/devices/wifi/ideal-wifi-manager.h
--- a/src/devices/wifi/ideal-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/ideal-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -52,7 +52,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/minstrel-wifi-manager.h
--- a/src/devices/wifi/minstrel-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/minstrel-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -54,7 +54,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/onoe-wifi-manager.h
--- a/src/devices/wifi/onoe-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/onoe-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -45,7 +45,7 @@
 
 private:
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/rraa-wifi-manager.h
--- a/src/devices/wifi/rraa-wifi-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/rraa-wifi-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -54,7 +54,7 @@
   };
 
   // overriden from base class
-  virtual class WifiRemoteStation *DoCreateStation (void) const;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const;
   virtual void DoReportRxOk (WifiRemoteStation *station, 
                              double rxSnr, WifiMode txMode);
   virtual void DoReportRtsFailed (WifiRemoteStation *station);
diff -r a1e00acc5986 src/devices/wifi/wifi-remote-station-manager.h
--- a/src/devices/wifi/wifi-remote-station-manager.h	Thu May 27 08:34:16 2010 +0200
+++ b/src/devices/wifi/wifi-remote-station-manager.h	Fri May 28 11:09:52 2010 +1000
@@ -31,8 +31,8 @@
 
 namespace ns3 {
 
-class WifiRemoteStation;
-class WifiRemoteStationState;
+struct WifiRemoteStation;
+struct WifiRemoteStationState;
 class WifiPhy;
 class WifiMacHeader;
 
@@ -363,7 +363,7 @@
   /**
    * \return a new station data structure
    */
-  virtual class WifiRemoteStation *DoCreateStation (void) const = 0;
+  virtual struct WifiRemoteStation *DoCreateStation (void) const = 0;
   /**
    * \param station the station with which we need to communicate
    * \param size size of the packet or fragment we want to send