diff --git a/src/core/config.h b/src/core/config.h
index 256b491ef..49b823a69 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -17,8 +17,8 @@
  *
  * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef NS3_CONFIG_H
+#define NS3_CONFIG_H
 
 #include "ptr.h"
 #include <string>
@@ -139,4 +139,4 @@ Ptr<Object> GetRootNamespaceObject (uint32_t i);
 
 } // namespace ns3
 
-#endif /* CONFIG_H */
+#endif /* NS3_CONFIG_H */
diff --git a/src/devices/wifi/nqsta-wifi-mac.cc b/src/devices/wifi/nqsta-wifi-mac.cc
index 1b956b4ca..2f94f52d8 100644
--- a/src/devices/wifi/nqsta-wifi-mac.cc
+++ b/src/devices/wifi/nqsta-wifi-mac.cc
@@ -479,7 +479,10 @@ NqstaWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
     } 
   else if (hdr->IsData ()) 
     {
-      ForwardUp (packet, hdr->GetAddr2 (), hdr->GetAddr1 ());
+      if (hdr->GetAddr3 () != GetAddress ())
+        {
+          ForwardUp (packet, hdr->GetAddr3 (), hdr->GetAddr1 ());
+        }
     } 
   else if (hdr->IsProbeReq () ||
            hdr->IsAssocReq ()) 
diff --git a/src/node/channel.h b/src/node/channel.h
index 750a8ef20..1e4a0cd6a 100644
--- a/src/node/channel.h
+++ b/src/node/channel.h
@@ -14,8 +14,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CHANNEL_H
-#define CHANNEL_H
+#ifndef NS3_CHANNEL_H
+#define NS3_CHANNEL_H
 
 #include <string>
 #include <stdint.h>
@@ -69,4 +69,4 @@ private:
 
 }; // namespace ns3
 
-#endif /* CHANNEL_H */
+#endif /* NS3_CHANNEL_H */