diff --git a/src/devices/mesh/802.11s/ie-dot11s-configuration.cc b/src/devices/mesh/802.11s/ie-dot11s-configuration.cc
index 311b463d2..948424253 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-configuration.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-configuration.cc
@@ -21,9 +21,6 @@
 
 
 #include "ns3/ie-dot11s-configuration.h"
-#include "ns3/assert.h"
-
-//NS_LOG_COMPONENT_DEFINE ("IeDot11sConfiguration");
 
 namespace ns3 {
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-configuration.h b/src/devices/mesh/802.11s/ie-dot11s-configuration.h
index 8db1627ba..c721dce62 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-configuration.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-configuration.h
@@ -23,9 +23,6 @@
 #ifndef MESH_CONFIGURATION_H
 #define MESH_CONFIGURATION_H
 
-#include <stdint.h>
-#include "ns3/buffer.h"
-#include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
 namespace ns3 {
diff --git a/src/devices/mesh/802.11s/ie-dot11s-peer-management.h b/src/devices/mesh/802.11s/ie-dot11s-peer-management.h
index 0e758e47d..4aafb9195 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-peer-management.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-peer-management.h
@@ -23,8 +23,6 @@
 #ifndef MESH_PEER_MAN_ELEMENT
 #define MESH_PEER_MAN_ELEMENT
 
-#include <stdint.h>
-#include "ns3/buffer.h"
 #include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-perr.cc b/src/devices/mesh/802.11s/ie-dot11s-perr.cc
index 9763edab8..e18c9a3f0 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-perr.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-perr.cc
@@ -21,6 +21,7 @@
 
 #include "ns3/ie-dot11s-perr.h"
 #include "ns3/address-utils.h"
+#include "ns3/node.h"
 
 namespace ns3 {
 IeDot11sPerr::~IeDot11sPerr()
diff --git a/src/devices/mesh/802.11s/ie-dot11s-perr.h b/src/devices/mesh/802.11s/ie-dot11s-perr.h
index 4021c860e..99e36414a 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-perr.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-perr.h
@@ -22,12 +22,8 @@
 #ifndef PERR_INFORMATION_ELEMENT_H
 #define PERR_INFORMATION_ELEMENT_H
 
-#include <stdint.h>
-#include "ns3/node.h"
-#include "ns3/buffer.h"
 #include "ns3/mac48-address.h"
 #include "ns3/hwmp-rtable.h"
-#include "ns3/header.h"
 #include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-prep.cc b/src/devices/mesh/802.11s/ie-dot11s-prep.cc
index 0e7a7874a..bbc18cb34 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-prep.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-prep.cc
@@ -21,6 +21,7 @@
 
 #include "ns3/ie-dot11s-prep.h"
 #include "ns3/address-utils.h"
+#include "ns3/node.h"
 #include "ns3/assert.h"
 namespace ns3 {
 /********************************
diff --git a/src/devices/mesh/802.11s/ie-dot11s-prep.h b/src/devices/mesh/802.11s/ie-dot11s-prep.h
index 3de2207b5..be6037040 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-prep.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-prep.h
@@ -23,11 +23,7 @@
 #define WIFI_PREP_INFORMATION_ELEMENT_H
 
 
-#include <stdint.h>
-#include "ns3/node.h"
-#include "ns3/buffer.h"
 #include "ns3/mac48-address.h"
-#include "ns3/header.h"
 #include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-preq.cc b/src/devices/mesh/802.11s/ie-dot11s-preq.cc
index a31cb2b0f..da3c4288b 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-preq.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-preq.cc
@@ -21,6 +21,7 @@
 
 #include "ns3/ie-dot11s-preq.h"
 #include "ns3/address-utils.h"
+#include "ns3/node.h"
 #include "ns3/assert.h"
 
 namespace ns3 {
diff --git a/src/devices/mesh/802.11s/ie-dot11s-preq.h b/src/devices/mesh/802.11s/ie-dot11s-preq.h
index 01ee11305..e60921635 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-preq.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-preq.h
@@ -22,13 +22,9 @@
 #ifndef WIFI_PREQ_INFORMATION_ELEMENT_H
 #define WIFI_PREQ_INFORMATION_ELEMENT_H
 
-#include <stdint.h>
 #include <vector>
 
-#include "ns3/node.h"
-#include "ns3/buffer.h"
 #include "ns3/mac48-address.h"
-#include "ns3/header.h"
 #include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-rann.cc b/src/devices/mesh/802.11s/ie-dot11s-rann.cc
index ca2c7cb4a..15d1eaa6f 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-rann.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-rann.cc
@@ -22,6 +22,7 @@
 #include "ns3/ie-dot11s-rann.h"
 #include "ns3/assert.h"
 #include "ns3/address-utils.h"
+#include "ns3/node.h"
 
 namespace ns3 {
 
diff --git a/src/devices/mesh/802.11s/ie-dot11s-rann.h b/src/devices/mesh/802.11s/ie-dot11s-rann.h
index 7de682324..d570e84e7 100644
--- a/src/devices/mesh/802.11s/ie-dot11s-rann.h
+++ b/src/devices/mesh/802.11s/ie-dot11s-rann.h
@@ -22,12 +22,7 @@
 #ifndef RANN_INFORMATION_ELEMENT_H
 #define RANN_INFORMATION_ELEMENT_H
 
-#include <stdint.h>
-
-#include "ns3/buffer.h"
 #include "ns3/mac48-address.h"
-#include "ns3/node.h"
-#include "ns3/header.h"
 #include "ns3/dot11s-codes.h"
 #include "ns3/wifi-information-element.h"
 
diff --git a/src/devices/mesh/hwmp-state.h b/src/devices/mesh/hwmp-state.h
index 97da32d1f..1a2e99631 100644
--- a/src/devices/mesh/hwmp-state.h
+++ b/src/devices/mesh/hwmp-state.h
@@ -22,16 +22,14 @@
 #ifndef HWMP_STATE_H
 #define HWMP_STATE_H
 #include <map>
-#include "ns3/event-id.h"
-#include "ns3/ptr.h"
 #include "ns3/hwmp-rtable.h"
 #include "ns3/packet.h"
-#include "ns3/wifi-net-device.h"
 #include "ns3/mesh-wifi-mac.h"
 #include "ns3/ie-dot11s-preq.h"
 #include "ns3/ie-dot11s-prep.h"
 #include "ns3/ie-dot11s-perr.h"
 #include "ns3/dot11s-parameters.h"
+#include "ns3/wifi-net-device.h"
 namespace ns3 {
 /**
  * \ingroup mesh
diff --git a/src/devices/mesh/hwmp.h b/src/devices/mesh/hwmp.h
index 90bea5ce0..09f842c6b 100644
--- a/src/devices/mesh/hwmp.h
+++ b/src/devices/mesh/hwmp.h
@@ -23,6 +23,7 @@
 
 #ifndef HWMP_H
 #define HWMP_H
+
 #include <map>
 #include <queue>
 #include "ns3/tag.h"
@@ -30,7 +31,6 @@
 #include "ns3/mac48-address.h"
 #include "ns3/mesh-l2-routing-protocol.h"
 #include "ns3/packet.h"
-#include "ns3/ptr.h"
 #include "ns3/hwmp-state.h"
 namespace ns3 {
 class HwmpState;
diff --git a/src/devices/mesh/mesh-l2-routing-protocol.h b/src/devices/mesh/mesh-l2-routing-protocol.h
index a68fc5ba1..7a816308b 100644
--- a/src/devices/mesh/mesh-l2-routing-protocol.h
+++ b/src/devices/mesh/mesh-l2-routing-protocol.h
@@ -24,7 +24,6 @@
 
 #include "ns3/object.h"
 #include "ns3/mac48-address.h"
-#include "ns3/ptr.h"
 
 namespace ns3 {
 
diff --git a/src/devices/mesh/mesh-mgt-headers.cc b/src/devices/mesh/mesh-mgt-headers.cc
index e1f823920..55704edbd 100644
--- a/src/devices/mesh/mesh-mgt-headers.cc
+++ b/src/devices/mesh/mesh-mgt-headers.cc
@@ -22,12 +22,7 @@
 
 #include "ns3/mesh-mgt-headers.h"
 #include "ns3/address-utils.h"
-#include "ns3/simulator.h"
 #include "ns3/assert.h"
-#include "ns3/log.h"
-
-NS_LOG_COMPONENT_DEFINE("MeshMgtHeaders");
-
 
 namespace ns3 {
 /***********************************************************
@@ -72,7 +67,6 @@ void
 MgtMeshBeaconHeader::Serialize (Buffer::Iterator start) const
   {
     //First we pack Beacon:
-    NS_LOG_DEBUG("Serialization beacon");
     Buffer::Iterator i = start;
     MgtBeaconHeader::Serialize(i);
     i.Next (MgtBeaconHeader::GetSerializedSize());
@@ -86,7 +80,6 @@ MgtMeshBeaconHeader::Serialize (Buffer::Iterator start) const
 uint32_t
 MgtMeshBeaconHeader::Deserialize (Buffer::Iterator start)
 {
-  NS_LOG_DEBUG("Deserialization beacon");
   Buffer::Iterator i = start;
   MgtBeaconHeader::Deserialize(start);
   i.Next (MgtBeaconHeader::GetSerializedSize());
@@ -138,9 +131,9 @@ MeshMgtPeerLinkManFrame::SetIeDot11sConfiguration(IeDot11sConfiguration MeshConf
 }
 
 void
-MeshMgtPeerLinkManFrame::SetIeDot11sPeerManagement(IeDot11sPeerManagement MeshPeerElement)
+MeshMgtPeerLinkManFrame::SetIeDot11sPeerManagement(IeDot11sPeerManagement meshPeerElement)
 {
-  PeerLinkMan = MeshPeerElement;
+  PeerLinkMan = meshPeerElement;
 }
 
 uint16_t
diff --git a/src/devices/mesh/mesh-mgt-headers.h b/src/devices/mesh/mesh-mgt-headers.h
index fd24fdbfb..73d1b0502 100644
--- a/src/devices/mesh/mesh-mgt-headers.h
+++ b/src/devices/mesh/mesh-mgt-headers.h
@@ -23,16 +23,9 @@
 #ifndef MESH_MGT_HEADERS_H
 #define MESH_MGT_HEADERS_H
 
-#include <stdint.h>
-
 #include "ns3/header.h"
-#include "ns3/status-code.h"
 #include "ns3/supported-rates.h"
 #include "ns3/ie-dot11s-peer-management.h"
-#include "ns3/ie-dot11s-preq.h"
-#include "ns3/ie-dot11s-prep.h"
-#include "ns3/ie-dot11s-perr.h"
-#include "ns3/ie-dot11s-rann.h"
 #include "ns3/ie-dot11s-configuration.h"
 #include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/mgt-headers.h"
@@ -70,7 +63,7 @@ public:
   void    SetQosField(uint16_t qos);
   void    SetMeshId(Ssid Id);
   void    SetIeDot11sConfiguration(IeDot11sConfiguration MeshConf);
-  void    SetIeDot11sPeerManagement(IeDot11sPeerManagement MeshPeerElement);
+  void    SetIeDot11sPeerManagement(IeDot11sPeerManagement meshPeerElement);
 
   uint16_t         GetAid();
   SupportedRates   GetSupportedRates();
diff --git a/src/devices/mesh/mesh-point-device.cc b/src/devices/mesh/mesh-point-device.cc
index d44a6cb9b..48c305b80 100644
--- a/src/devices/mesh/mesh-point-device.cc
+++ b/src/devices/mesh/mesh-point-device.cc
@@ -21,11 +21,8 @@
 
 
 #include "ns3/node.h"
-#include "ns3/channel.h"
 #include "ns3/packet.h"
 #include "ns3/log.h"
-#include "ns3/boolean.h"
-#include "ns3/simulator.h"
 #include "ns3/mesh-point-device.h"
 
 NS_LOG_COMPONENT_DEFINE ("MeshPointDevice");
diff --git a/src/devices/mesh/mesh-point-device.h b/src/devices/mesh/mesh-point-device.h
index 2ae6d940a..75ac8229c 100644
--- a/src/devices/mesh/mesh-point-device.h
+++ b/src/devices/mesh/mesh-point-device.h
@@ -25,8 +25,6 @@
 
 #include "ns3/net-device.h"
 #include "ns3/mac48-address.h"
-#include "ns3/nstime.h"
-#include "ns3/bridge-net-device.h"
 #include "ns3/bridge-channel.h"
 #include "ns3/mesh-l2-routing-protocol.h"
 
diff --git a/src/devices/mesh/mesh-wifi-mac-header.h b/src/devices/mesh/mesh-wifi-mac-header.h
index 823406474..e9c8730e8 100644
--- a/src/devices/mesh/mesh-wifi-mac-header.h
+++ b/src/devices/mesh/mesh-wifi-mac-header.h
@@ -24,8 +24,6 @@
 
 #include "ns3/header.h"
 #include "ns3/mac48-address.h"
-#include "ns3/nstime.h"
-#include <stdint.h>
 
 namespace ns3 {
 /**
diff --git a/src/devices/mesh/mesh-wifi-mac.cc b/src/devices/mesh/mesh-wifi-mac.cc
index e2dd8c30d..72bee758d 100644
--- a/src/devices/mesh/mesh-wifi-mac.cc
+++ b/src/devices/mesh/mesh-wifi-mac.cc
@@ -35,6 +35,10 @@
 #include "ns3/mac-low.h"
 #include "ns3/tx-statistics.h"
 #include "ns3/hwmp.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
+#include "ns3/mgt-headers.h"
+#include "ns3/wifi-remote-station-manager.h"
+#include "ns3/mesh-wifi-peer-manager.h"
 
 NS_LOG_COMPONENT_DEFINE ("MeshWifiMac");
 
diff --git a/src/devices/mesh/mesh-wifi-mac.h b/src/devices/mesh/mesh-wifi-mac.h
index 7163f0e5d..ee0b50700 100644
--- a/src/devices/mesh/mesh-wifi-mac.h
+++ b/src/devices/mesh/mesh-wifi-mac.h
@@ -22,18 +22,13 @@
 #ifndef MAC_HIGH_MESH_H
 #define MAC_HIGH_MESH_H
 
-#include <stdint.h>
 #include <map>
 #include "ns3/mac48-address.h"
-#include "ns3/mgt-headers.h"
 #include "ns3/mesh-mgt-headers.h"
-#include "ns3/callback.h"
-#include "ns3/packet.h"
-#include "ns3/nstime.h"
-#include "ns3/ie-dot11s-beacon-timing.h"
-#include "ns3/wifi-remote-station-manager.h"
-#include "ns3/mesh-wifi-peer-manager.h"
 #include "ns3/wifi-mac.h"
+#include "ns3/ie-dot11s-preq.h"
+#include "ns3/ie-dot11s-prep.h"
+#include "ns3/ie-dot11s-perr.h"
 
 namespace ns3 {
 
@@ -68,23 +63,23 @@ public:
   void  SetCtsTimeout (Time ctsTimeout);
   void  SetAckTimeout (Time ackTimeout);
   void  SetEifsNoDifs (Time eifsNoDifs);
-  virtual Time  GetSlot () const;
-  virtual Time  GetSifs () const;
-  virtual Time  GetPifs () const;
-  virtual Time  GetCtsTimeout () const;
-  virtual Time  GetAckTimeout () const;
-  virtual Time  GetEifsNoDifs () const;
+  Time  GetSlot () const;
+  Time  GetSifs () const;
+  Time  GetPifs () const;
+  Time  GetCtsTimeout () const;
+  Time  GetAckTimeout () const;
+  Time  GetEifsNoDifs () const;
   void  SetWifiPhy (Ptr<WifiPhy> phy);
   void  SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
   void  Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
   void  Enqueue (Ptr<const Packet> packet, Mac48Address to);
-  virtual bool  SupportsSendFrom () const;
+  bool  SupportsSendFrom () const;
   void  SetForwardUpCallback (Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> upCallback);
   void  SetLinkUpCallback (Callback<void> linkUp);
   void  SetLinkDownCallback (Callback<void> linkDown);
-  virtual Mac48Address GetAddress () const;
-  virtual Mac48Address GetBssid () const;
-  virtual Ssid  GetSsid () const;
+  Mac48Address GetAddress () const;
+  Mac48Address GetBssid () const;
+  Ssid  GetSsid () const;
   void  SetAddress (Mac48Address address);
   void  SetSsid (Ssid ssid);
   /**
diff --git a/src/devices/mesh/mesh-wifi-peer-manager.h b/src/devices/mesh/mesh-wifi-peer-manager.h
index 094c37185..21c192f2d 100644
--- a/src/devices/mesh/mesh-wifi-peer-manager.h
+++ b/src/devices/mesh/mesh-wifi-peer-manager.h
@@ -23,11 +23,7 @@
 #ifndef WIFI_PEER_MAN_H
 #define WIFI_PEER_MAN_H
 
-#include "ns3/event-id.h"
-#include "ns3/ptr.h"
-#include "ns3/nstime.h"
 #include "ns3/mac48-address.h"
-#include "ns3/uinteger.h"
 #include "ns3/wifi-net-device.h"
 #include "ns3/ie-dot11s-peer-management.h"
 #include "ns3/ie-dot11s-beacon-timing.h"