--- a/src/wifi/model/mac-low.h	Sun Sep 22 19:56:47 2013 -0700
+++ b/src/wifi/model/mac-low.h	Sun Sep 22 19:59:34 2013 -0700
@@ -519,8 +519,7 @@
   uint32_t GetRtsSize (void) const;
   uint32_t GetCtsSize (void) const;
   uint32_t GetSize (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
-  Time NowUs (void) const;
-void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr,
+  void ForwardDown (Ptr<const Packet> packet, const WifiMacHeader *hdr,
                     WifiTxVector txVector, WifiPreamble preamble);
   WifiTxVector GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
   WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;
@@ -552,7 +551,6 @@
   void NotifyAckTimeoutResetNow ();
   void NotifyCtsTimeoutStartNow (Time duration);
   void NotifyCtsTimeoutResetNow ();
-  void MaybeCancelPrevious (void);
 
   void NavCounterResetCtsMissed (Time rtsEndRxTime);
   void NormalAckTimeout (void);
@@ -570,7 +568,6 @@
 
   void SendRtsForPacket (void);
   void SendDataPacket (void);
-  void SendCurrentTxPacket (void);
   void StartDataTxTimers (WifiTxVector dataTxVector);
   virtual void DoDispose (void);
   /**

--- a/src/wifi/model/wifi-net-device.h	Sun Sep 22 19:56:47 2013 -0700
+++ b/src/wifi/model/wifi-net-device.h	Sun Sep 22 19:59:34 2013 -0700
@@ -119,7 +119,6 @@
   void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
   void LinkUp (void);
   void LinkDown (void);
-  void Setup (void);
   Ptr<WifiChannel> DoGetChannel (void) const;
   void CompleteConfig (void);