diff --git a/src/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h
index 5610e4c73..ff53bf86c 100644
--- a/src/wifi/helper/wifi-helper.h
+++ b/src/wifi/helper/wifi-helper.h
@@ -24,8 +24,8 @@
 #define WIFI_HELPER_H
 
 #include "ns3/trace-helper.h"
-#include "ns3/wifi-mac-helper.h"
 #include "ns3/wifi-phy.h"
+#include "wifi-mac-helper.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h
index 5b6c16ed4..d63633979 100644
--- a/src/wifi/model/dca-txop.h
+++ b/src/wifi/model/dca-txop.h
@@ -21,9 +21,9 @@
 #ifndef DCA_TXOP_H
 #define DCA_TXOP_H
 
-#include "ns3/wifi-mac-header.h"
-#include "ns3/wifi-remote-station-manager.h"
-#include "ns3/dcf.h"
+#include "wifi-mac-header.h"
+#include "wifi-remote-station-manager.h"
+#include "dcf.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/dsss-parameter-set.h b/src/wifi/model/dsss-parameter-set.h
index 9f7b3a50c..33a5dfa6d 100644
--- a/src/wifi/model/dsss-parameter-set.h
+++ b/src/wifi/model/dsss-parameter-set.h
@@ -21,7 +21,7 @@
 #ifndef DSSS_PARAMETER_SET_H
 #define DSSS_PARAMETER_SET_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/edca-parameter-set.h b/src/wifi/model/edca-parameter-set.h
index 4886dc61c..2cc19aac4 100644
--- a/src/wifi/model/edca-parameter-set.h
+++ b/src/wifi/model/edca-parameter-set.h
@@ -21,7 +21,7 @@
 #ifndef EDCA_PARAMETER_SET_H
 #define EDCA_PARAMETER_SET_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/erp-information.h b/src/wifi/model/erp-information.h
index 98b57a778..2ca07b88a 100644
--- a/src/wifi/model/erp-information.h
+++ b/src/wifi/model/erp-information.h
@@ -21,7 +21,7 @@
 #ifndef ERP_INFORMATION_H
 #define ERP_INFORMATION_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/ht-capabilities.h b/src/wifi/model/ht-capabilities.h
index 2cab4ce16..0c1e9d24e 100644
--- a/src/wifi/model/ht-capabilities.h
+++ b/src/wifi/model/ht-capabilities.h
@@ -22,7 +22,7 @@
 #ifndef HT_CAPABILITIES_H
 #define HT_CAPABILITIES_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 /**
  * This defines the maximum number of supported MCSs that a STA is
diff --git a/src/wifi/model/ht-operations.h b/src/wifi/model/ht-operations.h
index 823f3a4e0..6780a8b6d 100644
--- a/src/wifi/model/ht-operations.h
+++ b/src/wifi/model/ht-operations.h
@@ -21,7 +21,7 @@
 #ifndef HT_OPERATIONS_H
 #define HT_OPERATIONS_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 /**
  * This defines the maximum number of supported MCSs that a STA is
diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h
index f0ab79db5..8629d8090 100644
--- a/src/wifi/model/interference-helper.h
+++ b/src/wifi/model/interference-helper.h
@@ -22,7 +22,7 @@
 #define INTERFERENCE_HELPER_H
 
 #include "ns3/nstime.h"
-#include "ns3/wifi-tx-vector.h"
+#include "wifi-tx-vector.h"
 #include "error-rate-model.h"
 
 namespace ns3 {
diff --git a/src/wifi/model/ssid.h b/src/wifi/model/ssid.h
index 30fef30d8..a06dbec2e 100644
--- a/src/wifi/model/ssid.h
+++ b/src/wifi/model/ssid.h
@@ -21,7 +21,7 @@
 #ifndef SSID_H
 #define SSID_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/supported-rates.h b/src/wifi/model/supported-rates.h
index 04d1e24ba..a7824a342 100644
--- a/src/wifi/model/supported-rates.h
+++ b/src/wifi/model/supported-rates.h
@@ -22,7 +22,7 @@
 #define SUPPORTED_RATES_H
 
 #include "ns3/buffer.h"
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/vht-capabilities.h b/src/wifi/model/vht-capabilities.h
index 3eabafab5..e25226b82 100644
--- a/src/wifi/model/vht-capabilities.h
+++ b/src/wifi/model/vht-capabilities.h
@@ -23,7 +23,7 @@
 #define VHT_CAPABILITIES_H
 
 #include "ns3/buffer.h"
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/wifi-information-element-vector.h b/src/wifi/model/wifi-information-element-vector.h
index 244db651d..af1b80fb5 100644
--- a/src/wifi/model/wifi-information-element-vector.h
+++ b/src/wifi/model/wifi-information-element-vector.h
@@ -22,7 +22,7 @@
 #ifndef WIFI_INFORMATION_ELEMENT_VECTOR_H
 #define WIFI_INFORMATION_ELEMENT_VECTOR_H
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/wifi-information-element.cc b/src/wifi/model/wifi-information-element.cc
index 251b17d89..36e9c3b1b 100644
--- a/src/wifi/model/wifi-information-element.cc
+++ b/src/wifi/model/wifi-information-element.cc
@@ -18,7 +18,7 @@
  * Author: Dean Armstrong <deanarm@gmail.com>
  */
 
-#include "ns3/wifi-information-element.h"
+#include "wifi-information-element.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/wifi-radio-energy-model.h b/src/wifi/model/wifi-radio-energy-model.h
index df807a252..3bc751700 100644
--- a/src/wifi/model/wifi-radio-energy-model.h
+++ b/src/wifi/model/wifi-radio-energy-model.h
@@ -24,7 +24,7 @@
 
 #include "ns3/device-energy-model.h"
 #include "ns3/traced-value.h"
-#include "ns3/wifi-phy.h"
+#include "wifi-phy.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/wifi-tx-vector.cc b/src/wifi/model/wifi-tx-vector.cc
index 65fed799f..9f020bdbf 100644
--- a/src/wifi/model/wifi-tx-vector.cc
+++ b/src/wifi/model/wifi-tx-vector.cc
@@ -19,7 +19,7 @@
  *          Ghada Badawy <gbadawy@gmail.com>
  */
 
-#include "ns3/wifi-tx-vector.h"
+#include "wifi-tx-vector.h"
 
 namespace ns3 {
 
diff --git a/src/wifi/model/wifi-tx-vector.h b/src/wifi/model/wifi-tx-vector.h
index caf84f087..1732ea381 100644
--- a/src/wifi/model/wifi-tx-vector.h
+++ b/src/wifi/model/wifi-tx-vector.h
@@ -22,8 +22,8 @@
 #ifndef WIFI_TX_VECTOR_H
 #define WIFI_TX_VECTOR_H
 
-#include <ns3/wifi-mode.h>
-#include <ns3/wifi-preamble.h>
+#include "wifi-mode.h"
+#include "wifi-preamble.h"
 
 namespace ns3 {