diff --git a/third_party/iwlwifi/BUILD.bazel b/third_party/iwlwifi/BUILD.bazel
index a947834..16895c1 100644
--- a/third_party/iwlwifi/BUILD.bazel
+++ b/third_party/iwlwifi/BUILD.bazel
@@ -34,8 +34,8 @@
        "iwl-context-info.h",
         ],
     deps = [
-        "//src/iwlwifi/fw:api",
-#        "//src/iwlwifi/platform:platform",
+        "//third_party/iwlwifi/fw:api",
+#        "//third_party/iwlwifi/platform:platform",
 #        "@fuchsia_sdk//pkg/ddk",
 #        "//zircon/system/public",
 #        "//zircon/system/ulib/sync",
@@ -44,4 +44,4 @@
 #        "//sdk/banjo/ddk.hw.wlan.wlaninfo:ddk.hw.wlan.wlaninfo_banjo_c",
 #        "//zircon/system/public",
     ],
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/cfg/7000.c b/third_party/iwlwifi/cfg/7000.c
index b39f2ba..36da06f 100644
--- a/third_party/iwlwifi/cfg/7000.c
+++ b/third_party/iwlwifi/cfg/7000.c
@@ -34,7 +34,7 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-config.h"
 
 /* Highest firmware API version supported */
 #define IWL7260_UCODE_API_MAX 17
diff --git a/third_party/iwlwifi/cfg/8000.c b/third_party/iwlwifi/cfg/8000.c
index 10fb9ed..ca344d8 100644
--- a/third_party/iwlwifi/cfg/8000.c
+++ b/third_party/iwlwifi/cfg/8000.c
@@ -33,7 +33,7 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-config.h"
 
 /* Highest firmware API version supported */
 #define IWL8000_UCODE_API_MAX 36
diff --git a/third_party/iwlwifi/cfg/9000.c b/third_party/iwlwifi/cfg/9000.c
index 38226b8..ae96844 100644
--- a/third_party/iwlwifi/cfg/9000.c
+++ b/third_party/iwlwifi/cfg/9000.c
@@ -32,8 +32,8 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/fw/file.h"
-#include "src/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/iwl-config.h"
 
 /* Highest firmware API version supported */
 #define IWL9000_UCODE_API_MAX 44
diff --git a/third_party/iwlwifi/cfg/BUILD.bazel b/third_party/iwlwifi/cfg/BUILD.bazel
index 43bb569..1ee357c 100644
--- a/third_party/iwlwifi/cfg/BUILD.bazel
+++ b/third_party/iwlwifi/cfg/BUILD.bazel
@@ -12,7 +12,7 @@
         "9000.c",
   ],
   deps = [
-    "//src/iwlwifi:core",
-    "//src/iwlwifi/fw:api",
+    "//third_party/iwlwifi:core",
+    "//third_party/iwlwifi/fw:api",
   ],
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/fw/BUILD.bazel b/third_party/iwlwifi/fw/BUILD.bazel
index 2202c3d..9b8975c 100644
--- a/third_party/iwlwifi/fw/BUILD.bazel
+++ b/third_party/iwlwifi/fw/BUILD.bazel
@@ -50,7 +50,7 @@
         "img.h",
         ],
     deps = [
-        "//src/iwlwifi/platform:platform",
+        "//third_party/iwlwifi/platform:platform",
         "@fuchsia_sdk//pkg/ddk",
         "@fuchsia_sdk//fidl/fuchsia_wlan_ieee80211:fuchsia_wlan_ieee80211_banjo_cc",
         ],
@@ -73,9 +73,9 @@
         ],
     deps = [
         ":api",
-        "//src/iwlwifi:core",
-        "//src/iwlwifi/platform:platform",
+        "//third_party/iwlwifi:core",
+        "//third_party/iwlwifi/platform:platform",
 #    "//zircon/system/public",
 #    "//zircon/system/ulib/sync",
         ],
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/fw/acpi.h b/third_party/iwlwifi/fw/acpi.h
index 71faf51..32fb605 100644
--- a/third_party/iwlwifi/fw/acpi.h
+++ b/third_party/iwlwifi/fw/acpi.h
@@ -37,7 +37,7 @@
 #include <stddef.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #define ACPI_WRDS_METHOD "WRDS"
 #define ACPI_EWRD_METHOD "EWRD"
diff --git a/third_party/iwlwifi/fw/api/alive.h b/third_party/iwlwifi/fw/api/alive.h
index f2980c8..cf6d227 100644
--- a/third_party/iwlwifi/fw/api/alive.h
+++ b/third_party/iwlwifi/fw/api/alive.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_ALIVE_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_ALIVE_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* alive response is_valid values */
 #define ALIVE_RESP_UCODE_OK BIT(0)
diff --git a/third_party/iwlwifi/fw/api/binding.h b/third_party/iwlwifi/fw/api/binding.h
index c9923fb..8034d31 100644
--- a/third_party/iwlwifi/fw/api/binding.h
+++ b/third_party/iwlwifi/fw/api/binding.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_BINDING_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_BINDING_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define MAX_MACS_IN_BINDING (3)
 #define MAX_BINDINGS (4)
diff --git a/third_party/iwlwifi/fw/api/cmdhdr.h b/third_party/iwlwifi/fw/api/cmdhdr.h
index f90920f..d729904 100644
--- a/third_party/iwlwifi/fw/api/cmdhdr.h
+++ b/third_party/iwlwifi/fw/api/cmdhdr.h
@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * DOC: Host command section
diff --git a/third_party/iwlwifi/fw/api/coex.h b/third_party/iwlwifi/fw/api/coex.h
index cae6160..961f17e 100644
--- a/third_party/iwlwifi/fw/api/coex.h
+++ b/third_party/iwlwifi/fw/api/coex.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_COEX_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_COEX_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define BITS(nb) (BIT(nb) - 1)
 
diff --git a/third_party/iwlwifi/fw/api/config.h b/third_party/iwlwifi/fw/api/config.h
index bb29671..955b4ab 100644
--- a/third_party/iwlwifi/fw/api/config.h
+++ b/third_party/iwlwifi/fw/api/config.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_CONFIG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_CONFIG_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * struct iwl_dqa_enable_cmd
diff --git a/third_party/iwlwifi/fw/api/d3.h b/third_party/iwlwifi/fw/api/d3.h
index 6908f2d..9c13d01 100644
--- a/third_party/iwlwifi/fw/api/d3.h
+++ b/third_party/iwlwifi/fw/api/d3.h
@@ -38,7 +38,7 @@
 
 #include <netinet/if_ether.h>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_d3_wakeup_flags - D3 manager wakeup flags
diff --git a/third_party/iwlwifi/fw/api/datapath.h b/third_party/iwlwifi/fw/api/datapath.h
index 36a3955..1c45eb6 100644
--- a/third_party/iwlwifi/fw/api/datapath.h
+++ b/third_party/iwlwifi/fw/api/datapath.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DATAPATH_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DATAPATH_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_data_path_subcmd_ids - data path group commands
diff --git a/third_party/iwlwifi/fw/api/dbg-tlv.h b/third_party/iwlwifi/fw/api/dbg-tlv.h
index 0622859..5d147bd 100644
--- a/third_party/iwlwifi/fw/api/dbg-tlv.h
+++ b/third_party/iwlwifi/fw/api/dbg-tlv.h
@@ -33,7 +33,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DBG_TLV_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DBG_TLV_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * struct iwl_fw_ini_header: Common Header for all debug group TLV's structures
diff --git a/third_party/iwlwifi/fw/api/dhc.h b/third_party/iwlwifi/fw/api/dhc.h
index bd0dc07..e28be5a 100644
--- a/third_party/iwlwifi/fw/api/dhc.h
+++ b/third_party/iwlwifi/fw/api/dhc.h
@@ -35,8 +35,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DHC_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_DHC_H_
 
-#include "src/iwlwifi/fw/api/mac.h"
-#include "src/iwlwifi/fw/api/scan.h"
+#include "third_party/iwlwifi/fw/api/mac.h"
+#include "third_party/iwlwifi/fw/api/scan.h"
 
 #define DHC_TABLE_MASK_POS (28)
 
diff --git a/third_party/iwlwifi/fw/api/filter.h b/third_party/iwlwifi/fw/api/filter.h
index 330ba97..8df10de 100644
--- a/third_party/iwlwifi/fw/api/filter.h
+++ b/third_party/iwlwifi/fw/api/filter.h
@@ -36,8 +36,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_FILTER_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_FILTER_H_
 
-#include "src/iwlwifi/fw/api/mac.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/mac.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define MAX_PORT_ID_NUM 2
 #define MAX_MCAST_FILTERING_ADDRESSES 256
diff --git a/third_party/iwlwifi/fw/api/led.h b/third_party/iwlwifi/fw/api/led.h
index 35d82e3..561d9a7 100644
--- a/third_party/iwlwifi/fw/api/led.h
+++ b/third_party/iwlwifi/fw/api/led.h
@@ -34,7 +34,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_LED_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_LED_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * struct iwl_led_cmd - LED switching command
diff --git a/third_party/iwlwifi/fw/api/mac-cfg.h b/third_party/iwlwifi/fw/api/mac-cfg.h
index 75b7b6e..a0f04c5 100644
--- a/third_party/iwlwifi/fw/api/mac-cfg.h
+++ b/third_party/iwlwifi/fw/api/mac-cfg.h
@@ -37,9 +37,9 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_MAC_CFG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_MAC_CFG_H_
 
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 /**
  * enum iwl_mac_conf_subcmd_ids - mac configuration command IDs
diff --git a/third_party/iwlwifi/fw/api/mac.h b/third_party/iwlwifi/fw/api/mac.h
index b83dc84..f03c450 100644
--- a/third_party/iwlwifi/fw/api/mac.h
+++ b/third_party/iwlwifi/fw/api/mac.h
@@ -35,7 +35,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_MAC_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_MAC_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * The first MAC indices (starting from 0) are available to the driver,
diff --git a/third_party/iwlwifi/fw/api/nan.h b/third_party/iwlwifi/fw/api/nan.h
index 9c4e750..38e1fed 100644
--- a/third_party/iwlwifi/fw/api/nan.h
+++ b/third_party/iwlwifi/fw/api/nan.h
@@ -37,8 +37,8 @@
 
 #include <stdint.h>
 
-#include "src/iwlwifi/fw/api/phy-ctxt.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/phy-ctxt.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* TODO: read it from tlv */
 #define NAN_MAX_SUPPORTED_DE_ENTRIES 10
diff --git a/third_party/iwlwifi/fw/api/nvm-reg.h b/third_party/iwlwifi/fw/api/nvm-reg.h
index dfed61f..cdfe832 100644
--- a/third_party/iwlwifi/fw/api/nvm-reg.h
+++ b/third_party/iwlwifi/fw/api/nvm-reg.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_NVM_REG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_NVM_REG_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_regulatory_and_nvm_subcmd_ids - regulatory/NVM commands
diff --git a/third_party/iwlwifi/fw/api/offload.h b/third_party/iwlwifi/fw/api/offload.h
index ac7393f..5563f1b 100644
--- a/third_party/iwlwifi/fw/api/offload.h
+++ b/third_party/iwlwifi/fw/api/offload.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_OFFLOAD_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_OFFLOAD_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_prot_offload_subcmd_ids - protocol offload commands
diff --git a/third_party/iwlwifi/fw/api/paging.h b/third_party/iwlwifi/fw/api/paging.h
index 1929618..b33a9bc 100644
--- a/third_party/iwlwifi/fw/api/paging.h
+++ b/third_party/iwlwifi/fw/api/paging.h
@@ -35,7 +35,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PAGING_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PAGING_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define NUM_OF_FW_PAGING_BLOCKS 33 /* 32 for data and 1 block for CSS */
 
diff --git a/third_party/iwlwifi/fw/api/phy-ctxt.h b/third_party/iwlwifi/fw/api/phy-ctxt.h
index 98cba15..af0595e 100644
--- a/third_party/iwlwifi/fw/api/phy-ctxt.h
+++ b/third_party/iwlwifi/fw/api/phy-ctxt.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PHY_CTXT_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PHY_CTXT_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* Supported bands */
 #define PHY_BAND_5 (0)
diff --git a/third_party/iwlwifi/fw/api/phy.h b/third_party/iwlwifi/fw/api/phy.h
index 2e26d70..515aaae 100644
--- a/third_party/iwlwifi/fw/api/phy.h
+++ b/third_party/iwlwifi/fw/api/phy.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PHY_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_PHY_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_phy_ops_subcmd_ids - PHY group commands
diff --git a/third_party/iwlwifi/fw/api/power.h b/third_party/iwlwifi/fw/api/power.h
index 04ed405..69b284f 100644
--- a/third_party/iwlwifi/fw/api/power.h
+++ b/third_party/iwlwifi/fw/api/power.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_POWER_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_POWER_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* Power Management Commands, Responses, Notifications */
 
diff --git a/third_party/iwlwifi/fw/api/rs.h b/third_party/iwlwifi/fw/api/rs.h
index 394a80e..a834e39 100644
--- a/third_party/iwlwifi/fw/api/rs.h
+++ b/third_party/iwlwifi/fw/api/rs.h
@@ -35,8 +35,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_RS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_RS_H_
 
-#include "src/iwlwifi/fw/api/mac.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/mac.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_tlc_mng_cfg_flags_enum - options for TLC config flags
diff --git a/third_party/iwlwifi/fw/api/rx.h b/third_party/iwlwifi/fw/api/rx.h
index 67eeb3e..a830f37 100644
--- a/third_party/iwlwifi/fw/api/rx.h
+++ b/third_party/iwlwifi/fw/api/rx.h
@@ -37,7 +37,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_RX_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_RX_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* API for pre-9000 hardware */
 
diff --git a/third_party/iwlwifi/fw/api/scan.h b/third_party/iwlwifi/fw/api/scan.h
index c532c4a..c3c931e 100644
--- a/third_party/iwlwifi/fw/api/scan.h
+++ b/third_party/iwlwifi/fw/api/scan.h
@@ -41,7 +41,7 @@
 #include <netinet/if_ether.h>
 #include <stdint.h>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* Scan Commands, Responses, Notifications */
 
diff --git a/third_party/iwlwifi/fw/api/sf.h b/third_party/iwlwifi/fw/api/sf.h
index 4a37f3c..0bd36b3 100644
--- a/third_party/iwlwifi/fw/api/sf.h
+++ b/third_party/iwlwifi/fw/api/sf.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_SF_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_SF_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* Smart Fifo state */
 enum iwl_sf_state {
diff --git a/third_party/iwlwifi/fw/api/soc.h b/third_party/iwlwifi/fw/api/soc.h
index e8e02ea..1a10d8b 100644
--- a/third_party/iwlwifi/fw/api/soc.h
+++ b/third_party/iwlwifi/fw/api/soc.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_SOC_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_SOC_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* type of devices for defining SOC latency */
 enum iwl_soc_device_types {
diff --git a/third_party/iwlwifi/fw/api/sta.h b/third_party/iwlwifi/fw/api/sta.h
index 06c5830..005f276 100644
--- a/third_party/iwlwifi/fw/api/sta.h
+++ b/third_party/iwlwifi/fw/api/sta.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_STA_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_STA_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_sta_flags - flags for the ADD_STA host command
diff --git a/third_party/iwlwifi/fw/api/stats.h b/third_party/iwlwifi/fw/api/stats.h
index 109068f..d525afa 100644
--- a/third_party/iwlwifi/fw/api/stats.h
+++ b/third_party/iwlwifi/fw/api/stats.h
@@ -36,8 +36,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_STATS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_STATS_H_
 
-#include "src/iwlwifi/fw/api/mac.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/mac.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 struct mvm_statistics_dbg {
   __le32 burst_check;
diff --git a/third_party/iwlwifi/fw/api/tdls.h b/third_party/iwlwifi/fw/api/tdls.h
index bd062cd..80602a5 100644
--- a/third_party/iwlwifi/fw/api/tdls.h
+++ b/third_party/iwlwifi/fw/api/tdls.h
@@ -36,9 +36,9 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TDLS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TDLS_H_
 
-#include "src/iwlwifi/fw/api/phy-ctxt.h"
-#include "src/iwlwifi/fw/api/tx.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/phy-ctxt.h"
+#include "third_party/iwlwifi/fw/api/tx.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define IWL_MVM_TDLS_STA_COUNT 4
 
diff --git a/third_party/iwlwifi/fw/api/testing.h b/third_party/iwlwifi/fw/api/testing.h
index e8a771c..b422c72 100644
--- a/third_party/iwlwifi/fw/api/testing.h
+++ b/third_party/iwlwifi/fw/api/testing.h
@@ -34,7 +34,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TESTING_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TESTING_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define FIPS_KEY_LEN_128 16
 #define FIPS_KEY_LEN_256 32
diff --git a/third_party/iwlwifi/fw/api/time-event.h b/third_party/iwlwifi/fw/api/time-event.h
index 42a2f26..5ba9268 100644
--- a/third_party/iwlwifi/fw/api/time-event.h
+++ b/third_party/iwlwifi/fw/api/time-event.h
@@ -36,8 +36,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TIME_EVENT_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TIME_EVENT_H_
 
-#include "src/iwlwifi/fw/api/phy-ctxt.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/fw/api/phy-ctxt.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* Time Event types, according to MAC type */
 enum iwl_time_event_type {
diff --git a/third_party/iwlwifi/fw/api/tof.h b/third_party/iwlwifi/fw/api/tof.h
index d1eb33f..ac39f6a 100644
--- a/third_party/iwlwifi/fw/api/tof.h
+++ b/third_party/iwlwifi/fw/api/tof.h
@@ -35,7 +35,7 @@
 
 #include <netinet/if_ether.h>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* ToF sub-group command IDs */
 enum iwl_mvm_tof_sub_grp_ids {
diff --git a/third_party/iwlwifi/fw/api/tx.h b/third_party/iwlwifi/fw/api/tx.h
index 892e091..69660e8 100644
--- a/third_party/iwlwifi/fw/api/tx.h
+++ b/third_party/iwlwifi/fw/api/tx.h
@@ -35,9 +35,9 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TX_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TX_H_
 
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 /**
  * enum iwl_tx_flags - bitmasks for tx_flags in TX command
diff --git a/third_party/iwlwifi/fw/api/txq.h b/third_party/iwlwifi/fw/api/txq.h
index d4d816d..6a02c57 100644
--- a/third_party/iwlwifi/fw/api/txq.h
+++ b/third_party/iwlwifi/fw/api/txq.h
@@ -35,7 +35,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TXQ_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_API_TXQ_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * DQA queue numbers
diff --git a/third_party/iwlwifi/fw/dbg.c b/third_party/iwlwifi/fw/dbg.c
index 6a13ab0..ab7359e 100644
--- a/third_party/iwlwifi/fw/dbg.c
+++ b/third_party/iwlwifi/fw/dbg.c
@@ -33,20 +33,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/dbg.h"
 
 #include <zircon/syscalls.h>
 #include <zircon/time.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/fw/debugfs.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/debug.h"
+#include "third_party/iwlwifi/fw/debugfs.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/debug.h"
 
 /**
  * struct iwl_fw_dump_ptrs - set of pointers needed for the fw-error-dump
diff --git a/third_party/iwlwifi/fw/dbg.h b/third_party/iwlwifi/fw/dbg.h
index d1ea997..cdb51c7 100644
--- a/third_party/iwlwifi/fw/dbg.h
+++ b/third_party/iwlwifi/fw/dbg.h
@@ -37,15 +37,15 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_DBG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_DBG_H_
 
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/api/dbg-tlv.h"
-#include "src/iwlwifi/fw/error-dump.h"
-#include "src/iwlwifi/fw/file.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/api/dbg-tlv.h"
+#include "third_party/iwlwifi/fw/error-dump.h"
+#include "third_party/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 /**
  * struct iwl_fw_dump_desc - describes the dump
diff --git a/third_party/iwlwifi/fw/error-dump.h b/third_party/iwlwifi/fw/error-dump.h
index cb3b052..328de24 100644
--- a/third_party/iwlwifi/fw/error-dump.h
+++ b/third_party/iwlwifi/fw/error-dump.h
@@ -36,9 +36,9 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_ERROR_DUMP_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_ERROR_DUMP_H_
 
-#include "src/iwlwifi/fw/file.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #define IWL_FW_ERROR_DUMP_BARKER 0x14789632
 
diff --git a/third_party/iwlwifi/fw/file.h b/third_party/iwlwifi/fw/file.h
index 763c0ad..4551bcc 100644
--- a/third_party/iwlwifi/fw/file.h
+++ b/third_party/iwlwifi/fw/file.h
@@ -38,7 +38,7 @@
 
 #include <netinet/if_ether.h>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /* v1/v2 uCode file layout */
 struct iwl_ucode_header {
diff --git a/third_party/iwlwifi/fw/img.h b/third_party/iwlwifi/fw/img.h
index 82e5161..78ad238 100644
--- a/third_party/iwlwifi/fw/img.h
+++ b/third_party/iwlwifi/fw/img.h
@@ -36,11 +36,11 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_IMG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_IMG_H_
 
-#include "src/iwlwifi/fw/api/dbg-tlv.h"
-#include "src/iwlwifi/fw/error-dump.h"
-#include "src/iwlwifi/fw/file.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/fw/api/dbg-tlv.h"
+#include "third_party/iwlwifi/fw/error-dump.h"
+#include "third_party/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/memory.h"
 
 /**
  * enum iwl_ucode_type
diff --git a/third_party/iwlwifi/fw/init.c b/third_party/iwlwifi/fw/init.c
index 9b8c744..c6aa6ce 100644
--- a/third_party/iwlwifi/fw/init.c
+++ b/third_party/iwlwifi/fw/init.c
@@ -30,11 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/debugfs.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/platform/task.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/debugfs.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/platform/task.h"
 
 void iwl_fw_runtime_init(struct iwl_fw_runtime* fwrt, struct iwl_trans* trans,
                          const struct iwl_fw* fw, const struct iwl_fw_runtime_ops* ops,
diff --git a/third_party/iwlwifi/fw/notif-wait.c b/third_party/iwlwifi/fw/notif-wait.c
index 80c4804..667abba 100644
--- a/third_party/iwlwifi/fw/notif-wait.c
+++ b/third_party/iwlwifi/fw/notif-wait.c
@@ -31,9 +31,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/notif-wait.h"
+#include "third_party/iwlwifi/fw/notif-wait.h"
 
-#include "src/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-drv.h"
 
 void iwl_notification_wait_init(struct iwl_notif_wait_data* notif_wait) {
   mtx_init(&notif_wait->notif_wait_lock, mtx_plain);
diff --git a/third_party/iwlwifi/fw/notif-wait.h b/third_party/iwlwifi/fw/notif-wait.h
index dd8fd6e..abb6779 100644
--- a/third_party/iwlwifi/fw/notif-wait.h
+++ b/third_party/iwlwifi/fw/notif-wait.h
@@ -41,7 +41,7 @@
 #include <zircon/listnode.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 struct iwl_notif_wait_data {
   list_node_t notif_waits;
diff --git a/third_party/iwlwifi/fw/paging.c b/third_party/iwlwifi/fw/paging.c
index 9d492fe..fa25076 100644
--- a/third_party/iwlwifi/fw/paging.c
+++ b/third_party/iwlwifi/fw/paging.c
@@ -36,10 +36,10 @@
 #include <zircon/status.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/platform/memory.h"
 
 void iwl_free_fw_paging(struct iwl_fw_runtime* fwrt) {
   int i;
diff --git a/third_party/iwlwifi/fw/runtime.h b/third_party/iwlwifi/fw/runtime.h
index 4bb9b74..c97dff1 100644
--- a/third_party/iwlwifi/fw/runtime.h
+++ b/third_party/iwlwifi/fw/runtime.h
@@ -34,14 +34,14 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_RUNTIME_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_FW_RUNTIME_H_
 
-#include "src/iwlwifi/fw/api/dbg-tlv.h"
-#include "src/iwlwifi/fw/api/debug.h"
-#include "src/iwlwifi/fw/api/paging.h"
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/iwl-config.h"
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/task.h"
+#include "third_party/iwlwifi/fw/api/dbg-tlv.h"
+#include "third_party/iwlwifi/fw/api/debug.h"
+#include "third_party/iwlwifi/fw/api/paging.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/task.h"
 
 struct iwl_fw_runtime_ops {
   int (*dump_start)(void* ctx);
diff --git a/third_party/iwlwifi/fw/smem.c b/third_party/iwlwifi/fw/smem.c
index 0bf7fd2..3515a84 100644
--- a/third_party/iwlwifi/fw/smem.c
+++ b/third_party/iwlwifi/fw/smem.c
@@ -33,9 +33,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-drv.h"
 
 static void iwl_parse_shared_mem_22000(struct iwl_fw_runtime* fwrt, struct iwl_rx_packet* pkt) {
   struct iwl_shared_mem_cfg* mem_cfg = (void*)pkt->data;
diff --git a/third_party/iwlwifi/iwl-config.h b/third_party/iwlwifi/iwl-config.h
index 71aa2da..807e947 100644
--- a/third_party/iwlwifi/iwl-config.h
+++ b/third_party/iwlwifi/iwl-config.h
@@ -37,10 +37,10 @@
 
 #include <stdbool.h>
 
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 enum iwl_device_family {
   IWL_DEVICE_FAMILY_UNDEFINED,
diff --git a/third_party/iwlwifi/iwl-constants.h b/third_party/iwlwifi/iwl-constants.h
index 13a2c3d..cdcb89f 100644
--- a/third_party/iwlwifi/iwl-constants.h
+++ b/third_party/iwlwifi/iwl-constants.h
@@ -34,7 +34,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_CONSTANTS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_CONSTANTS_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 enum {
   IWL_D0I3_DBG_KEEP_BUS = BIT(0),
diff --git a/third_party/iwlwifi/iwl-csr.h b/third_party/iwlwifi/iwl-csr.h
index 2a34feb..be7194d 100644
--- a/third_party/iwlwifi/iwl-csr.h
+++ b/third_party/iwlwifi/iwl-csr.h
@@ -35,7 +35,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_CSR_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_CSR_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * CSR (control and status registers)
diff --git a/third_party/iwlwifi/iwl-dbg-tlv.h b/third_party/iwlwifi/iwl-dbg-tlv.h
index 409bb39..63c8d4d 100644
--- a/third_party/iwlwifi/iwl-dbg-tlv.h
+++ b/third_party/iwlwifi/iwl-dbg-tlv.h
@@ -35,7 +35,7 @@
 
 #include <stdint.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 /**
  * struct iwl_apply_point_data
diff --git a/third_party/iwlwifi/iwl-debug.h b/third_party/iwlwifi/iwl-debug.h
index 2d662ec..3a2f18a 100644
--- a/third_party/iwlwifi/iwl-debug.h
+++ b/third_party/iwlwifi/iwl-debug.h
@@ -37,8 +37,8 @@
 
 #include <stdbool.h>
 
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/platform/debug.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/platform/debug.h"
 
 static inline bool iwl_have_debug_level(uint32_t level) {
 #ifdef CPTCFG_IWLWIFI_DEBUG
diff --git a/third_party/iwlwifi/iwl-drv.c b/third_party/iwlwifi/iwl-drv.c
index 1b930f0..3efb4d0 100644
--- a/third_party/iwlwifi/iwl-drv.c
+++ b/third_party/iwlwifi/iwl-drv.c
@@ -43,18 +43,18 @@
 #include <zircon/listnode.h>
 #include <zircon/status.h>
 
-#include "src/iwlwifi/platform/align.h"
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/iwl-agn-hw.h"
-#include "src/iwlwifi/iwl-config.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-dbg-tlv.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/device.h"
-#include "src/iwlwifi/platform/module.h"
+#include "third_party/iwlwifi/platform/align.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/iwl-agn-hw.h"
+#include "third_party/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-dbg-tlv.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/device.h"
+#include "third_party/iwlwifi/platform/module.h"
 #ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
 #include "iwl-dbg-cfg.h"
 #endif
diff --git a/third_party/iwlwifi/iwl-drv.h b/third_party/iwlwifi/iwl-drv.h
index b1b6828..45e6b1b 100644
--- a/third_party/iwlwifi/iwl-drv.h
+++ b/third_party/iwlwifi/iwl-drv.h
@@ -36,7 +36,7 @@
 
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 /* for all modules */
 #define DRV_NAME "iwlwifi"
diff --git a/third_party/iwlwifi/iwl-eeprom-parse.c b/third_party/iwlwifi/iwl-eeprom-parse.c
index 8ba137d..7cf77e4 100644
--- a/third_party/iwlwifi/iwl-eeprom-parse.c
+++ b/third_party/iwlwifi/iwl-eeprom-parse.c
@@ -31,10 +31,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-#include "src/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
 
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
 
 #if 0  // NEEDS_PORTING
 /* EEPROM offset definitions */
diff --git a/third_party/iwlwifi/iwl-eeprom-parse.h b/third_party/iwlwifi/iwl-eeprom-parse.h
index f2cd5ea..d8041c3 100644
--- a/third_party/iwlwifi/iwl-eeprom-parse.h
+++ b/third_party/iwlwifi/iwl-eeprom-parse.h
@@ -36,9 +36,9 @@
 
 #include <fuchsia/hardware/wlanphyinfo/c/banjo.h>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 struct iwl_nvm_data {
   int n_hw_addrs;
diff --git a/third_party/iwlwifi/iwl-eeprom-read.h b/third_party/iwlwifi/iwl-eeprom-read.h
index 55b2cb4..a4fd226 100644
--- a/third_party/iwlwifi/iwl-eeprom-read.h
+++ b/third_party/iwlwifi/iwl-eeprom-read.h
@@ -33,7 +33,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_EEPROM_READ_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_EEPROM_READ_H_
 
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 int iwl_read_eeprom(struct iwl_trans* trans, uint8_t** eeprom, size_t* eeprom_size);
 
diff --git a/third_party/iwlwifi/iwl-fh.h b/third_party/iwlwifi/iwl-fh.h
index 8e44620..2ef9ac5 100644
--- a/third_party/iwlwifi/iwl-fh.h
+++ b/third_party/iwlwifi/iwl-fh.h
@@ -37,8 +37,8 @@
 
 #include <stdint.h>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /****************************/
 /* Flow Handler Definitions */
diff --git a/third_party/iwlwifi/iwl-io.c b/third_party/iwlwifi/iwl-io.c
index c393f1d..dbbf168 100644
--- a/third_party/iwlwifi/iwl-io.c
+++ b/third_party/iwlwifi/iwl-io.c
@@ -32,16 +32,16 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-io.h"
 
 #include <zircon/syscalls.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-fh.h"
-#include "src/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-fh.h"
+#include "third_party/iwlwifi/iwl-prph.h"
 
 void iwl_write8(struct iwl_trans* trans, uint32_t ofs, uint8_t val) {
   iwl_trans_write8(trans, ofs, val);
diff --git a/third_party/iwlwifi/iwl-io.h b/third_party/iwlwifi/iwl-io.h
index e174082..87a9f8a 100644
--- a/third_party/iwlwifi/iwl-io.h
+++ b/third_party/iwlwifi/iwl-io.h
@@ -36,9 +36,9 @@
 #include <zircon/types.h>
 
 #if 0  // NEEDS_PORTING
-#include "src/iwlwifi/iwl-devtrace.h"
+#include "third_party/iwlwifi/iwl-devtrace.h"
 #endif  // NEEDS_PORTING
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 void iwl_write8(struct iwl_trans* trans, uint32_t ofs, uint8_t val);
 void iwl_write32(struct iwl_trans* trans, uint32_t ofs, uint32_t val);
diff --git a/third_party/iwlwifi/iwl-modparams.h b/third_party/iwlwifi/iwl-modparams.h
index d0583eb..cc5117b 100644
--- a/third_party/iwlwifi/iwl-modparams.h
+++ b/third_party/iwlwifi/iwl-modparams.h
@@ -37,8 +37,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 extern struct iwl_mod_params iwlwifi_mod_params;
 
diff --git a/third_party/iwlwifi/iwl-nvm-parse.c b/third_party/iwlwifi/iwl-nvm-parse.c
index 381f5ec..e4b9e88 100644
--- a/third_party/iwlwifi/iwl-nvm-parse.c
+++ b/third_party/iwlwifi/iwl-nvm-parse.c
@@ -32,21 +32,21 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-#include "src/iwlwifi/iwl-nvm-parse.h"
+#include "third_party/iwlwifi/iwl-nvm-parse.h"
 
 #include <stdint.h>
 
-#include "src/iwlwifi/fw/acpi.h"
-#include "src/iwlwifi/fw/api/cmdhdr.h"
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/api/nvm-reg.h"
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/fw/api/cmdhdr.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/api/nvm-reg.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
 /* NVM offsets (in words) definitions */
 enum nvm_offsets {
diff --git a/third_party/iwlwifi/iwl-nvm-parse.h b/third_party/iwlwifi/iwl-nvm-parse.h
index 2a9b04e..2beb6e6 100644
--- a/third_party/iwlwifi/iwl-nvm-parse.h
+++ b/third_party/iwlwifi/iwl-nvm-parse.h
@@ -34,8 +34,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_NVM_PARSE_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_NVM_PARSE_H_
 
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
  * enum iwl_nvm_sbands_flags - modification flags for the channel profiles
diff --git a/third_party/iwlwifi/iwl-op-mode.h b/third_party/iwlwifi/iwl-op-mode.h
index 403c2f2..9396fd0 100644
--- a/third_party/iwlwifi/iwl-op-mode.h
+++ b/third_party/iwlwifi/iwl-op-mode.h
@@ -36,8 +36,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_OP_MODE_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_OP_MODE_H_
 
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
 #include "fw/testmode.h"
diff --git a/third_party/iwlwifi/iwl-phy-db.c b/third_party/iwlwifi/iwl-phy-db.c
index c47e114..e55db00 100644
--- a/third_party/iwlwifi/iwl-phy-db.c
+++ b/third_party/iwlwifi/iwl-phy-db.c
@@ -31,13 +31,13 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
 
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define CHANNEL_NUM_SIZE 4 /* num of channels in calib_ch size */
 
diff --git a/third_party/iwlwifi/iwl-phy-db.h b/third_party/iwlwifi/iwl-phy-db.h
index 886c5be..5f1c494 100644
--- a/third_party/iwlwifi/iwl-phy-db.h
+++ b/third_party/iwlwifi/iwl-phy-db.h
@@ -34,8 +34,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_PHY_DB_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_PHY_DB_H_
 
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 // This should be static, but is exported for unittest.
 enum iwl_phy_db_section_type {
diff --git a/third_party/iwlwifi/iwl-prph.h b/third_party/iwlwifi/iwl-prph.h
index 82c6f90..5c7e532 100644
--- a/third_party/iwlwifi/iwl-prph.h
+++ b/third_party/iwlwifi/iwl-prph.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_PRPH_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_PRPH_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /*
  * Registers in this file are internal, not PCI bus memory mapped.
diff --git a/third_party/iwlwifi/iwl-scd.h b/third_party/iwlwifi/iwl-scd.h
index dee24e8..f5a5d27 100644
--- a/third_party/iwlwifi/iwl-scd.h
+++ b/third_party/iwlwifi/iwl-scd.h
@@ -34,9 +34,9 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_SCD_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_SCD_H_
 
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 static inline void iwl_scd_txq_set_chain(struct iwl_trans* trans, uint16_t txq_id) {
   iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
diff --git a/third_party/iwlwifi/iwl-trans.c b/third_party/iwlwifi/iwl-trans.c
index e823874..caeadc0 100644
--- a/third_party/iwlwifi/iwl-trans.c
+++ b/third_party/iwlwifi/iwl-trans.c
@@ -32,11 +32,11 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
-#include "src/iwlwifi/iwl-constants.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-fh.h"
+#include "third_party/iwlwifi/iwl-constants.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-fh.h"
 
 struct iwl_trans* iwl_trans_alloc(unsigned int priv_size, struct device* dev,
                                   const struct iwl_cfg* cfg, struct iwl_trans_ops* ops) {
diff --git a/third_party/iwlwifi/iwl-trans.h b/third_party/iwlwifi/iwl-trans.h
index 81c4fb8..774cf62 100644
--- a/third_party/iwlwifi/iwl-trans.h
+++ b/third_party/iwlwifi/iwl-trans.h
@@ -36,22 +36,22 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_TRANS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_TRANS_H_
 
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/iwl-config.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
 #ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
-#include "src/iwlwifi/iwl-dbg-cfg.h"
+#include "third_party/iwlwifi/iwl-dbg-cfg.h"
 #endif
-#include "src/iwlwifi/fw/api/cmdhdr.h"
-#include "src/iwlwifi/fw/api/txq.h"
+#include "third_party/iwlwifi/fw/api/cmdhdr.h"
+#include "third_party/iwlwifi/fw/api/txq.h"
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
-#include "src/iwlwifi/fw/testmode.h"
+#include "third_party/iwlwifi/fw/testmode.h"
 #endif
-#include "src/iwlwifi/fw/api/dbg-tlv.h"
-#include "src/iwlwifi/iwl-dbg-tlv.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/fw/api/dbg-tlv.h"
+#include "third_party/iwlwifi/iwl-dbg-tlv.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/memory.h"
 
 /**
  * DOC: Transport layer - what is it ?
diff --git a/third_party/iwlwifi/iwl-vendor-cmd.h b/third_party/iwlwifi/iwl-vendor-cmd.h
index 63d4e13..40df625 100644
--- a/third_party/iwlwifi/iwl-vendor-cmd.h
+++ b/third_party/iwlwifi/iwl-vendor-cmd.h
@@ -36,7 +36,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_VENDOR_CMD_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_IWL_VENDOR_CMD_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 #define INTEL_OUI 0x001735
 
diff --git a/third_party/iwlwifi/mvm/API_rates.h b/third_party/iwlwifi/mvm/API_rates.h
index d10874e..7edd932 100644
--- a/third_party/iwlwifi/mvm/API_rates.h
+++ b/third_party/iwlwifi/mvm/API_rates.h
@@ -43,7 +43,7 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_API_RATES_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_API_RATES_H_
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 /**
   @defgroup GroupRates Rates Masks and Indices
diff --git a/third_party/iwlwifi/mvm/BUILD.bazel b/third_party/iwlwifi/mvm/BUILD.bazel
index c26eefe..2e98f2d 100644
--- a/third_party/iwlwifi/mvm/BUILD.bazel
+++ b/third_party/iwlwifi/mvm/BUILD.bazel
@@ -46,12 +46,12 @@
     "@fuchsia_sdk//fidl/fuchsia_hardware_wlanphyinfo:fuchsia_hardware_wlanphyinfo_banjo_cc",
     "@fuchsia_sdk//fidl/fuchsia_hardware_wlan_info:fuchsia_hardware_wlan_info_banjo_cc",
     "@fuchsia_sdk//fidl/fuchsia_wlan_ieee80211:fuchsia_wlan_ieee80211_llcpp_cc",
-    "//src/iwlwifi:core",
-    "//src/iwlwifi/fw:fw",
-    "//src/iwlwifi/fw:api",
-   "//src/iwlwifi/platform:platform",
+    "//third_party/iwlwifi:core",
+    "//third_party/iwlwifi/fw:fw",
+    "//third_party/iwlwifi/fw:api",
+   "//third_party/iwlwifi/platform:platform",
     "@fuchsia_sdk//pkg/ddk",
 #    "//zircon/system/public",
 #    "//zircon/system/ulib/async",
   ],
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/mvm/_rateScaleMng.h b/third_party/iwlwifi/mvm/_rateScaleMng.h
index dc6b57c..a4214f4 100644
--- a/third_party/iwlwifi/mvm/_rateScaleMng.h
+++ b/third_party/iwlwifi/mvm/_rateScaleMng.h
@@ -36,8 +36,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM__RATESCALEMNG_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM__RATESCALEMNG_H_
 
-#include "src/iwlwifi/mvm/apiGroupDatapath.h"
-#include "src/iwlwifi/mvm/apiVersion.h"
+#include "third_party/iwlwifi/mvm/apiGroupDatapath.h"
+#include "third_party/iwlwifi/mvm/apiVersion.h"
 
 #define RS_MNG_INVALID_VAL ((U32)-1)
 #define RS_MNG_RATE_MIN_FAILURE_TH 3
diff --git a/third_party/iwlwifi/mvm/binding.c b/third_party/iwlwifi/mvm/binding.c
index a3e320f..b68ac79 100644
--- a/third_party/iwlwifi/mvm/binding.c
+++ b/third_party/iwlwifi/mvm/binding.c
@@ -35,8 +35,8 @@
 #include <string.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 struct iwl_mvm_iface_iterator_data {
   struct iwl_mvm_vif* ignore_vif;
diff --git a/third_party/iwlwifi/mvm/coex.c b/third_party/iwlwifi/mvm/coex.c
index 97bb25b..2ba5e5f 100644
--- a/third_party/iwlwifi/mvm/coex.c
+++ b/third_party/iwlwifi/mvm/coex.c
@@ -33,11 +33,11 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/fw/api/coex.h"
+#include "third_party/iwlwifi/fw/api/coex.h"
 
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 #ifdef CPTCFG_IWLWIFI_LTE_COEX
 #include "lte-coex.h"
diff --git a/third_party/iwlwifi/mvm/fw-api.h b/third_party/iwlwifi/mvm/fw-api.h
index 8d50a8c..ccbe873 100644
--- a/third_party/iwlwifi/mvm/fw-api.h
+++ b/third_party/iwlwifi/mvm/fw-api.h
@@ -36,38 +36,38 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_FW_API_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_FW_API_H_
 
-#include "src/iwlwifi/fw/api/alive.h"
-#include "src/iwlwifi/fw/api/binding.h"
-#include "src/iwlwifi/fw/api/cmdhdr.h"
-#include "src/iwlwifi/fw/api/coex.h"
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/api/config.h"
-#include "src/iwlwifi/fw/api/context.h"
-#include "src/iwlwifi/fw/api/d3.h"
-#include "src/iwlwifi/fw/api/datapath.h"
-#include "src/iwlwifi/fw/api/filter.h"
-#include "src/iwlwifi/fw/api/led.h"
-#include "src/iwlwifi/fw/api/mac-cfg.h"
-#include "src/iwlwifi/fw/api/mac.h"
-#include "src/iwlwifi/fw/api/nvm-reg.h"
-#include "src/iwlwifi/fw/api/offload.h"
-#include "src/iwlwifi/fw/api/phy-ctxt.h"
-#include "src/iwlwifi/fw/api/phy.h"
-#include "src/iwlwifi/fw/api/power.h"
-#include "src/iwlwifi/fw/api/rs.h"
-#include "src/iwlwifi/fw/api/rx.h"
-#include "src/iwlwifi/fw/api/scan.h"
-#include "src/iwlwifi/fw/api/sf.h"
-#include "src/iwlwifi/fw/api/soc.h"
-#include "src/iwlwifi/fw/api/sta.h"
-#include "src/iwlwifi/fw/api/stats.h"
-#include "src/iwlwifi/fw/api/tdls.h"
-#include "src/iwlwifi/fw/api/time-event.h"
-#include "src/iwlwifi/fw/api/tof.h"
-#include "src/iwlwifi/fw/api/tx.h"
+#include "third_party/iwlwifi/fw/api/alive.h"
+#include "third_party/iwlwifi/fw/api/binding.h"
+#include "third_party/iwlwifi/fw/api/cmdhdr.h"
+#include "third_party/iwlwifi/fw/api/coex.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/api/config.h"
+#include "third_party/iwlwifi/fw/api/context.h"
+#include "third_party/iwlwifi/fw/api/d3.h"
+#include "third_party/iwlwifi/fw/api/datapath.h"
+#include "third_party/iwlwifi/fw/api/filter.h"
+#include "third_party/iwlwifi/fw/api/led.h"
+#include "third_party/iwlwifi/fw/api/mac-cfg.h"
+#include "third_party/iwlwifi/fw/api/mac.h"
+#include "third_party/iwlwifi/fw/api/nvm-reg.h"
+#include "third_party/iwlwifi/fw/api/offload.h"
+#include "third_party/iwlwifi/fw/api/phy-ctxt.h"
+#include "third_party/iwlwifi/fw/api/phy.h"
+#include "third_party/iwlwifi/fw/api/power.h"
+#include "third_party/iwlwifi/fw/api/rs.h"
+#include "third_party/iwlwifi/fw/api/rx.h"
+#include "third_party/iwlwifi/fw/api/scan.h"
+#include "third_party/iwlwifi/fw/api/sf.h"
+#include "third_party/iwlwifi/fw/api/soc.h"
+#include "third_party/iwlwifi/fw/api/sta.h"
+#include "third_party/iwlwifi/fw/api/stats.h"
+#include "third_party/iwlwifi/fw/api/tdls.h"
+#include "third_party/iwlwifi/fw/api/time-event.h"
+#include "third_party/iwlwifi/fw/api/tof.h"
+#include "third_party/iwlwifi/fw/api/tx.h"
 #ifdef CPTCFG_IWLWIFI_DEBUG_HOST_CMD_ENABLED
-#include "src/iwlwifi/fw/api/dhc.h"
+#include "third_party/iwlwifi/fw/api/dhc.h"
 #endif
-#include "src/iwlwifi/fw/api/testing.h"
+#include "third_party/iwlwifi/fw/api/testing.h"
 
 #endif  // SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_FW_API_H_
diff --git a/third_party/iwlwifi/mvm/fw.c b/third_party/iwlwifi/mvm/fw.c
index 47ac4cd..3888e8f 100644
--- a/third_party/iwlwifi/mvm/fw.c
+++ b/third_party/iwlwifi/mvm/fw.c
@@ -35,22 +35,22 @@
  *****************************************************************************/
 #include <zircon/status.h>
 
-#include "src/iwlwifi/fw/acpi.h"
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/iwl-csr.h" /* for iwl_mvm_rx_card_state_notif */
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-io.h" /* for iwl_mvm_rx_card_state_notif */
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/iwl-nvm-parse.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-phy-db.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/iwl-csr.h" /* for iwl_mvm_rx_card_state_notif */
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-io.h" /* for iwl_mvm_rx_card_state_notif */
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/iwl-nvm-parse.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
-#include "src/iwlwifi/fw/testmode.h"
-#include "src/iwlwifi/iwl-dnt-cfg.h"
+#include "third_party/iwlwifi/fw/testmode.h"
+#include "third_party/iwlwifi/iwl-dnt-cfg.h"
 #endif
 
 #define MVM_UCODE_ALIVE_TIMEOUT ZX_SEC(3)  // (HZ * CPTCFG_IWL_TIMEOUT_FACTOR)
diff --git a/third_party/iwlwifi/mvm/mac-ctxt.c b/third_party/iwlwifi/mvm/mac-ctxt.c
index 6238536..b0be0e1 100644
--- a/third_party/iwlwifi/mvm/mac-ctxt.c
+++ b/third_party/iwlwifi/mvm/mac-ctxt.c
@@ -34,11 +34,11 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
 
 const uint8_t iwl_mvm_ac_to_tx_fifo[] = {
     IWL_MVM_TX_FIFO_VO,
diff --git a/third_party/iwlwifi/mvm/mac80211.c b/third_party/iwlwifi/mvm/mac80211.c
index 8aab3ca..1dd56ea 100644
--- a/third_party/iwlwifi/mvm/mac80211.c
+++ b/third_party/iwlwifi/mvm/mac80211.c
@@ -40,26 +40,26 @@
 
 #include <ddk/hw/wlan/ieee80211/c/banjo.h>
 
-#include "src/iwlwifi/fw/api/nan.h"
-#include "src/iwlwifi/fw/error-dump.h"
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-nvm-parse.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-phy-db.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-vendor-cmd.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/sta.h"
-#include "src/iwlwifi/mvm/time-event.h"
-#include "src/iwlwifi/mvm/tof.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/fw/api/nan.h"
+#include "third_party/iwlwifi/fw/error-dump.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-nvm-parse.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-vendor-cmd.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/sta.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/mvm/tof.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
-#include "src/iwlwifi/iwl-dnt-cfg.h"
-#include "src/iwlwifi/iwl-dnt-dispatch.h"
+#include "third_party/iwlwifi/iwl-dnt-cfg.h"
+#include "third_party/iwlwifi/iwl-dnt-dispatch.h"
 #endif
 #ifdef CPTCFG_NL80211_TESTMODE
-#include "src/iwlwifi/fw/testmode.h"
+#include "third_party/iwlwifi/fw/testmode.h"
 #endif
 
 #if 0  // NEEDS_PORTING
diff --git a/third_party/iwlwifi/mvm/mvm.h b/third_party/iwlwifi/mvm/mvm.h
index 6c4b116..21d34dd 100644
--- a/third_party/iwlwifi/mvm/mvm.h
+++ b/third_party/iwlwifi/mvm/mvm.h
@@ -44,29 +44,29 @@
 #include <fuchsia/hardware/wlanphyinfo/c/banjo.h>
 //#include <wlan/protocol/mac.h>
 
-#include "src/iwlwifi/fw/acpi.h"
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/file.h"
-#include "src/iwlwifi/fw/notif-wait.h"
-#include "src/iwlwifi/fw/runtime.h"
-#include "src/iwlwifi/iwl-config.h"
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-nvm-parse.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-phy-db.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/iwl-vendor-cmd.h"
-#include "src/iwlwifi/mvm/constants.h"
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/sta.h"
-#include "src/iwlwifi/mvm/tof.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/kernel.h"
-#include "src/iwlwifi/platform/task.h"
+#include "third_party/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/fw/notif-wait.h"
+#include "third_party/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-nvm-parse.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-vendor-cmd.h"
+#include "third_party/iwlwifi/mvm/constants.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/sta.h"
+#include "third_party/iwlwifi/mvm/tof.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/task.h"
 
 #ifdef CPTCFG_IWLWIFI_LTE_COEX
-#include "src/iwlwifi/lte-coex.h"
+#include "third_party/iwlwifi/lte-coex.h"
 #endif
 
 #define IWL_MVM_MAX_ADDRESSES 5
diff --git a/third_party/iwlwifi/mvm/nvm.c b/third_party/iwlwifi/mvm/nvm.c
index 4c0b335..76979e3 100644
--- a/third_party/iwlwifi/mvm/nvm.c
+++ b/third_party/iwlwifi/mvm/nvm.c
@@ -34,14 +34,14 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/fw/acpi.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-eeprom-read.h"
-#include "src/iwlwifi/iwl-nvm-parse.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-eeprom-read.h"
+#include "third_party/iwlwifi/iwl-nvm-parse.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 #if 0   // NEEDS_PORTING
 /*
diff --git a/third_party/iwlwifi/mvm/ops.c b/third_party/iwlwifi/mvm/ops.c
index d164d53..ff6843c 100644
--- a/third_party/iwlwifi/mvm/ops.c
+++ b/third_party/iwlwifi/mvm/ops.c
@@ -43,31 +43,31 @@
 
 #if 0  // NEEDS_PORTING
 #include "fw-api.h"
-#include "src/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/fw/acpi.h"
 #endif  // NEEDS_PORTING
-#include "src/iwlwifi/fw/api/nan.h"
-#include "src/iwlwifi/fw/api/scan.h"
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/img.h"
-#include "src/iwlwifi/fw/notif-wait.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-phy-db.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/rs.h"
-#include "src/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/fw/api/nan.h"
+#include "third_party/iwlwifi/fw/api/scan.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/fw/notif-wait.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/rs.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
 
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
-#include "src/iwlwifi/iwl-dnt-cfg.h"
-#include "src/iwlwifi/iwl-dnt-dispatch.h"
-#include "src/iwlwifi/iwl-tm-gnl.h"
+#include "third_party/iwlwifi/iwl-dnt-cfg.h"
+#include "third_party/iwlwifi/iwl-dnt-dispatch.h"
+#include "third_party/iwlwifi/iwl-tm-gnl.h"
 #endif
 
 #define KBUILD_MODNAME "iwlwifi"
diff --git a/third_party/iwlwifi/mvm/phy-ctxt.c b/third_party/iwlwifi/mvm/phy-ctxt.c
index 186787b..72e1b1d 100644
--- a/third_party/iwlwifi/mvm/phy-ctxt.c
+++ b/third_party/iwlwifi/mvm/phy-ctxt.c
@@ -37,8 +37,8 @@
 
 #include <fuchsia/hardware/wlanphyinfo/c/banjo.h>
 
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 // A channel setting used as default value. In some cases, we need an arbitrary value for channel.
 // For example, during initializing a PHY context in firmware, we need a (whatever) value to add
diff --git a/third_party/iwlwifi/mvm/power.c b/third_party/iwlwifi/mvm/power.c
index 0a16e24..7f2bc7d 100644
--- a/third_party/iwlwifi/mvm/power.c
+++ b/third_party/iwlwifi/mvm/power.c
@@ -49,16 +49,16 @@
 //   is disabled as well.
 //
 
-#include "src/iwlwifi/fw/api/power.h"
+#include "third_party/iwlwifi/fw/api/power.h"
 
 #include <zircon/status.h>
 
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-modparams.h"
-#include "src/iwlwifi/mvm/constants.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-modparams.h"
+#include "third_party/iwlwifi/mvm/constants.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 #define POWER_KEEP_ALIVE_PERIOD_SEC 25
 
diff --git a/third_party/iwlwifi/mvm/rs-ng.h b/third_party/iwlwifi/mvm/rs-ng.h
index 5f31c09..4afe94b 100644
--- a/third_party/iwlwifi/mvm/rs-ng.h
+++ b/third_party/iwlwifi/mvm/rs-ng.h
@@ -38,8 +38,8 @@
 
 #include <fuchsia/hardware/wlanphyinfo/c/banjo.h>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
 
 #define U08 uint8_t
 #define U16 uint16_t
@@ -47,11 +47,11 @@
 #define U64 uint64_t
 #define INLINE inline
 
-#include "src/iwlwifi/mvm/API_rates.h"
-#include "src/iwlwifi/mvm/_rateScaleMng.h"
-#include "src/iwlwifi/mvm/apiGroupDatapath.h"
-#include "src/iwlwifi/mvm/apiVersion.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/mvm/API_rates.h"
+#include "third_party/iwlwifi/mvm/_rateScaleMng.h"
+#include "third_party/iwlwifi/mvm/apiGroupDatapath.h"
+#include "third_party/iwlwifi/mvm/apiVersion.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #define RS_NAME "iwlwifi-rs"
 
diff --git a/third_party/iwlwifi/mvm/rs.h b/third_party/iwlwifi/mvm/rs.h
index ccbf570..8e7fca9 100644
--- a/third_party/iwlwifi/mvm/rs.h
+++ b/third_party/iwlwifi/mvm/rs.h
@@ -36,6 +36,6 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_RS_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_RS_H_
 
-#include "src/iwlwifi/mvm/rs-ng.h"
+#include "third_party/iwlwifi/mvm/rs-ng.h"
 
 #endif  // SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_RS_H_
diff --git a/third_party/iwlwifi/mvm/rx.c b/third_party/iwlwifi/mvm/rx.c
index 6647016..013a772 100644
--- a/third_party/iwlwifi/mvm/rx.c
+++ b/third_party/iwlwifi/mvm/rx.c
@@ -35,10 +35,10 @@
 
 #include <zircon/status.h>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 /*
  * iwl_mvm_rx_rx_phy_cmd - REPLY_RX_PHY_CMD handler
  *
diff --git a/third_party/iwlwifi/mvm/rxmq.c b/third_party/iwlwifi/mvm/rxmq.c
index 360d4d3..2cccb58 100644
--- a/third_party/iwlwifi/mvm/rxmq.c
+++ b/third_party/iwlwifi/mvm/rxmq.c
@@ -33,10 +33,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
 static bool is_multicast_ether_addr(uint8_t addr[6]) { return (addr[0] & 0x1) != 0; }
 
diff --git a/third_party/iwlwifi/mvm/scan.c b/third_party/iwlwifi/mvm/scan.c
index 45d7cc0..532d78d 100644
--- a/third_party/iwlwifi/mvm/scan.c
+++ b/third_party/iwlwifi/mvm/scan.c
@@ -34,7 +34,7 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/fw/api/scan.h"
+#include "third_party/iwlwifi/fw/api/scan.h"
 
 #include <lib/async/time.h>
 #include <stdio.h>
@@ -42,9 +42,9 @@
 #include <zircon/status.h>
 #include <zircon/time.h>
 
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/platform/task.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/platform/task.h"
 
 #define IWL_DENSE_EBS_SCAN_RATIO 5
 #define IWL_SPARSE_EBS_SCAN_RATIO 1
diff --git a/third_party/iwlwifi/mvm/sta.c b/third_party/iwlwifi/mvm/sta.c
index 6a91ae8..5075699 100644
--- a/third_party/iwlwifi/mvm/sta.c
+++ b/third_party/iwlwifi/mvm/sta.c
@@ -33,13 +33,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/mvm/sta.h"
+#include "third_party/iwlwifi/mvm/sta.h"
 
 #include <zircon/status.h>
 
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/rs.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/rs.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
 static zx_status_t iwl_mvm_set_fw_key_idx(struct iwl_mvm* mvm);
 
diff --git a/third_party/iwlwifi/mvm/sta.h b/third_party/iwlwifi/mvm/sta.h
index 9bc5c14..a12e6b4 100644
--- a/third_party/iwlwifi/mvm/sta.h
+++ b/third_party/iwlwifi/mvm/sta.h
@@ -45,9 +45,9 @@
 #include <fuchsia/hardware/wlanphyinfo/c/banjo.h>
 
 /* for IWL_MAX_TID_COUNT */
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/rs.h"
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/rs.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 struct iwl_mvm;
 struct iwl_mvm_vif;
diff --git a/third_party/iwlwifi/mvm/time-event.c b/third_party/iwlwifi/mvm/time-event.c
index d96e6fd..9b5d233 100644
--- a/third_party/iwlwifi/mvm/time-event.c
+++ b/third_party/iwlwifi/mvm/time-event.c
@@ -34,18 +34,18 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
 
 #include <lib/async/time.h>
 #include <zircon/status.h>
 
-#include "src/iwlwifi/fw/notif-wait.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/platform/time.h"
+#include "third_party/iwlwifi/fw/notif-wait.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/platform/time.h"
 
 /*
  * For the high priority TE use a time event type that has similar priority to
diff --git a/third_party/iwlwifi/mvm/time-event.h b/third_party/iwlwifi/mvm/time-event.h
index bad0fea..bf4c897 100644
--- a/third_party/iwlwifi/mvm/time-event.h
+++ b/third_party/iwlwifi/mvm/time-event.h
@@ -35,8 +35,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_TIME_EVENT_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_TIME_EVENT_H_
 
-#include "src/iwlwifi/mvm/fw-api.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/fw-api.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 /**
  * DOC: Time Events - what is it?
diff --git a/third_party/iwlwifi/mvm/tof.c b/third_party/iwlwifi/mvm/tof.c
index 5759e0a..ac50c92 100644
--- a/third_party/iwlwifi/mvm/tof.c
+++ b/third_party/iwlwifi/mvm/tof.c
@@ -30,9 +30,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/api/tof.h"
+#include "third_party/iwlwifi/fw/api/tof.h"
 
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 #define IWL_MVM_TOF_RANGE_REQ_MAX_ID 256
 
diff --git a/third_party/iwlwifi/mvm/tof.h b/third_party/iwlwifi/mvm/tof.h
index b2bdc02..0e14325 100644
--- a/third_party/iwlwifi/mvm/tof.h
+++ b/third_party/iwlwifi/mvm/tof.h
@@ -33,8 +33,8 @@
 #ifndef SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_TOF_H_
 #define SRC_CONNECTIVITY_WLAN_DRIVERS_THIRD_PARTY_INTEL_IWLWIFI_MVM_TOF_H_
 
-#include "src/iwlwifi/fw/api/tof.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/fw/api/tof.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 struct iwl_mvm_tof_data {
   struct iwl_tof_config_cmd tof_cfg;
diff --git a/third_party/iwlwifi/mvm/tt.c b/third_party/iwlwifi/mvm/tt.c
index 9606a47..f6ce8f5 100644
--- a/third_party/iwlwifi/mvm/tt.c
+++ b/third_party/iwlwifi/mvm/tt.c
@@ -33,7 +33,7 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 #if 0  // NEEDS_PORTING
 #define IWL_MVM_TEMP_NOTIF_WAIT_TIMEOUT HZ
diff --git a/third_party/iwlwifi/mvm/tx.c b/third_party/iwlwifi/mvm/tx.c
index ebd6ca3..743a343 100644
--- a/third_party/iwlwifi/mvm/tx.c
+++ b/third_party/iwlwifi/mvm/tx.c
@@ -34,12 +34,12 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/iwl-eeprom-parse.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/sta.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/iwl-eeprom-parse.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/sta.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #if 0  // NEEDS_PORTING
 static void iwl_mvm_bar_check_trigger(struct iwl_mvm* mvm, const uint8_t* addr, uint16_t tid,
diff --git a/third_party/iwlwifi/mvm/utils.c b/third_party/iwlwifi/mvm/utils.c
index 2c1ccac..0feff42 100644
--- a/third_party/iwlwifi/mvm/utils.c
+++ b/third_party/iwlwifi/mvm/utils.c
@@ -36,12 +36,12 @@
 #include <zircon/status.h>
 #include <zircon/syscalls.h>
 
-#include "src/iwlwifi/fw/api/rs.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/fw/api/rs.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 
 /*
  * Will return ZX_OK even if the cmd failed when ZX_ERR_BAD_STATE is asserted unless
diff --git a/third_party/iwlwifi/pcie/BUILD.bazel b/third_party/iwlwifi/pcie/BUILD.bazel
index 2c7da78..c0fff06 100644
--- a/third_party/iwlwifi/pcie/BUILD.bazel
+++ b/third_party/iwlwifi/pcie/BUILD.bazel
@@ -19,21 +19,21 @@
   deps = [
  #   "//garnet/lib/wlan/protocol:protocol",
  #   "//sdk/banjo/fuchsia.hardware.pci:fuchsia.hardware.pci_banjo_c",
-    "//src/iwlwifi:core",
-    "//src/iwlwifi/fw",
- #   "//src/devices/pci/lib/device-protocol-pci",
- #   "//src/lib/ddk",
+    "//third_party/iwlwifi:core",
+    "//third_party/iwlwifi/fw",
+ #   "//third_party/devices/pci/lib/device-protocol-pci",
+ #   "//third_party/lib/ddk",
  #   "//zircon/system/ulib/backtrace-request",
  #   "//zircon/system/ulib/sync",
  #   "//zircon/system/ulib/zircon-internal",
   ],
  # public_deps = [
- #   "//src/iwlwifi/platform",
+ #   "//third_party/iwlwifi/platform",
  #   "//zircon/system/public",
  # ]
  # friend =
- #     [ "//src/iwlwifi/test:*" ]
+ #     [ "//third_party/iwlwifi/test:*" ]
 
   # TODO(https://fxbug.dev/58162): delete the below and fix compiler warnings
   #configs += [ "//build/config:Wno-conversion" ]
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/pcie/drv.c b/third_party/iwlwifi/pcie/drv.c
index c1e6e9e..6ac8f46 100644
--- a/third_party/iwlwifi/pcie/drv.c
+++ b/third_party/iwlwifi/pcie/drv.c
@@ -40,14 +40,14 @@
 #include <stdlib.h>
 #include <zircon/status.h>
 
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/pcie/internal.h"
-#include "src/iwlwifi/platform/kernel.h"
-#include "src/iwlwifi/platform/pci.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/pci.h"
 
 #if 0  // NEEDS_PORTING
-#include "src/iwlwifi/fw/acpi.h"
+#include "third_party/iwlwifi/fw/acpi.h"
 #endif  // NEEDS_PORTING
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
diff --git a/third_party/iwlwifi/pcie/entry.h b/third_party/iwlwifi/pcie/entry.h
index 442f63c..5146eca 100644
--- a/third_party/iwlwifi/pcie/entry.h
+++ b/third_party/iwlwifi/pcie/entry.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 // PCIE driver entry points.
 zx_status_t iwl_pci_find_device_id(uint16_t device_id, uint16_t subsystem_device_id,
diff --git a/third_party/iwlwifi/pcie/internal.h b/third_party/iwlwifi/pcie/internal.h
index 5111f0f..fb3fd80 100644
--- a/third_party/iwlwifi/pcie/internal.h
+++ b/third_party/iwlwifi/pcie/internal.h
@@ -42,18 +42,18 @@
 #include <threads.h>
 #include <zircon/listnode.h>
 
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-fh.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/irq.h"
-#include "src/iwlwifi/platform/kernel.h"
-#include "src/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-fh.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/irq.h"
+#include "third_party/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/memory.h"
 
 /* We need 2 entries for the TX command and header, and another one might
  * be needed for potential data in the SKB's head. The remaining ones can
diff --git a/third_party/iwlwifi/pcie/rx.c b/third_party/iwlwifi/pcie/rx.c
index 1cfdd92..8a014fc 100644
--- a/third_party/iwlwifi/pcie/rx.c
+++ b/third_party/iwlwifi/pcie/rx.c
@@ -41,13 +41,13 @@
 #if 0  // NEEDS_PORTING
 #include "iwl-context-info-gen3.h"
 #endif
-#include "src/iwlwifi/platform/align.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-op-mode.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/pcie/internal.h"
-#include "src/iwlwifi/platform/irq.h"
-#include "src/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/platform/align.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/platform/irq.h"
+#include "third_party/iwlwifi/platform/memory.h"
 
 zx_status_t _iwl_pcie_rx_init(struct iwl_trans* trans);
 void iwl_pcie_free_rbs_pool(struct iwl_trans* trans);
diff --git a/third_party/iwlwifi/pcie/trans-gen2.c b/third_party/iwlwifi/pcie/trans-gen2.c
index 55d9afc..fc3ab97 100644
--- a/third_party/iwlwifi/pcie/trans-gen2.c
+++ b/third_party/iwlwifi/pcie/trans-gen2.c
@@ -34,13 +34,13 @@
 
 #include <zircon/time.h>
 
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/iwl-constants.h"
-#include "src/iwlwifi/iwl-context-info-gen3.h"
-#include "src/iwlwifi/iwl-context-info.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/iwl-constants.h"
+#include "third_party/iwlwifi/iwl-context-info-gen3.h"
+#include "third_party/iwlwifi/iwl-context-info.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/pcie/internal.h"
 
 /*
  * Start up NIC's basic functionality after it has been reset
diff --git a/third_party/iwlwifi/pcie/trans.c b/third_party/iwlwifi/pcie/trans.c
index 9e7071e..c7d1497 100644
--- a/third_party/iwlwifi/pcie/trans.c
+++ b/third_party/iwlwifi/pcie/trans.c
@@ -48,20 +48,20 @@
 #include <zircon/time.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/error-dump.h"
-#include "src/iwlwifi/iwl-agn-hw.h"
-#include "src/iwlwifi/iwl-constants.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-fh.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-scd.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/pcie/internal.h"
-#include "src/iwlwifi/platform/time.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/error-dump.h"
+#include "third_party/iwlwifi/iwl-agn-hw.h"
+#include "third_party/iwlwifi/iwl-constants.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-fh.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-scd.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/platform/time.h"
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
-#include "src/iwlwifi/iwl-dnt-cfg.h"
+#include "third_party/iwlwifi/iwl-dnt-cfg.h"
 #endif
 
 /* extended range in FW SRAM */
diff --git a/third_party/iwlwifi/pcie/tx-gen2.c b/third_party/iwlwifi/pcie/tx-gen2.c
index 3398be8..220ff3a 100644
--- a/third_party/iwlwifi/pcie/tx-gen2.c
+++ b/third_party/iwlwifi/pcie/tx-gen2.c
@@ -31,11 +31,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include "src/iwlwifi/fw/api/tx.h"
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/fw/api/tx.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/pcie/internal.h"
 
 /*
  * iwl_pcie_gen2_tx_stop - Stop all Tx DMA channels
diff --git a/third_party/iwlwifi/pcie/tx.c b/third_party/iwlwifi/pcie/tx.c
index 1172afd..72c1dca 100644
--- a/third_party/iwlwifi/pcie/tx.c
+++ b/third_party/iwlwifi/pcie/tx.c
@@ -34,7 +34,7 @@
  *
  *****************************************************************************/
 
-#include "src/iwlwifi/fw/api/tx.h"
+#include "third_party/iwlwifi/fw/api/tx.h"
 
 #include <zircon/status.h>
 #include <zircon/types.h>
@@ -42,15 +42,15 @@
 //#include <src/iwlwifi/ieee80211.h>
 
 #if 0  // NEEDS_PORTING
-#include "src/iwlwifi/iwl-op-mode.h"
+#include "third_party/iwlwifi/iwl-op-mode.h"
 #endif  // NEEDS_PORTING
-#include "src/iwlwifi/iwl-csr.h"
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-io.h"
-#include "src/iwlwifi/iwl-prph.h"
-#include "src/iwlwifi/iwl-scd.h"
-#include "src/iwlwifi/pcie/internal.h"
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/iwl-csr.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-io.h"
+#include "third_party/iwlwifi/iwl-prph.h"
+#include "third_party/iwlwifi/iwl-scd.h"
+#include "third_party/iwlwifi/pcie/internal.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
 #define IWL_TX_CRC_SIZE 4
 #define IWL_TX_DELIMITER_SIZE 4
diff --git a/third_party/iwlwifi/platform/BUILD.bazel b/third_party/iwlwifi/platform/BUILD.bazel
index 29c25c5..14b6185 100644
--- a/third_party/iwlwifi/platform/BUILD.bazel
+++ b/third_party/iwlwifi/platform/BUILD.bazel
@@ -97,15 +97,15 @@
         "@fuchsia_sdk//fidl/fuchsia_wlan_common:fuchsia_wlan_common_banjo_cc",
         "@fuchsia_sdk//fidl/fuchsia_wlan_ieee80211:fuchsia_wlan_ieee80211_cc",
         "@fuchsia_sdk//fidl/fuchsia_wlan_internal:fuchsia_wlan_internal_banjo_cc",
-       "//src/iwlwifi:core",
-    #   "//src/iwlwifi/cfg",
-       "//src/iwlwifi/mvm:mvm",
-       "//src/iwlwifi/pcie",
-    #   "//src/devices/lib/driver",
+       "//third_party/iwlwifi:core",
+    #   "//third_party/iwlwifi/cfg",
+       "//third_party/iwlwifi/mvm:mvm",
+       "//third_party/iwlwifi/pcie",
+    #   "//third_party/devices/lib/driver",
         "@fuchsia_sdk//pkg/ddk",
         "@fuchsia_sdk//pkg/async_loop_cpp",
         "@fuchsia_sdk//pkg/async_loop_default",
-    #  "//src/lib/ddktl",
+    #  "//third_party/lib/ddktl",
     
     # Zircon deps dont have to be mentioned I think.
     #   "//zircon/system/public",
@@ -113,12 +113,12 @@
     #   "//zircon/system/ulib/async-loop:async-loop-default",
     #   "//zircon/system/ulib/fbl",
     ],
-    copts = ["-Isrc/iwlwifi"],
+    copts = ["-Ithird_party/iwlwifi"],
 )
 
 #source_set("fuchsia_device") {
 #  friend =
-#      [ "//src/iwlwifi/test:*" ]
+#      [ "//third_party/iwlwifi/test:*" ]
   # TODO(https://fxbug.dev/58162): delete the below and fix compiler warnings
 #  configs += [ "//build/config:Wno-conversion" ]
 #}
diff --git a/third_party/iwlwifi/platform/bind.cc b/third_party/iwlwifi/platform/bind.cc
index 1144283..2edfa34 100644
--- a/third_party/iwlwifi/platform/bind.cc
+++ b/third_party/iwlwifi/platform/bind.cc
@@ -7,8 +7,8 @@
 #include <zircon/errors.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/iwlwifi-bind.h"
-#include "src/iwlwifi/platform/pcie-device.h"
+#include "third_party/iwlwifi/platform/iwlwifi-bind.h"
+#include "third_party/iwlwifi/platform/pcie-device.h"
 
 // Currently the Intel wlan driver only supports PCIe. When we add support for other forms of
 // interfaces, we can mux all of that through this file using build time config options.
diff --git a/third_party/iwlwifi/platform/driver-inspector.cc b/third_party/iwlwifi/platform/driver-inspector.cc
index 56e082a..2f83c4d 100644
--- a/third_party/iwlwifi/platform/driver-inspector.cc
+++ b/third_party/iwlwifi/platform/driver-inspector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/platform/driver-inspector.h"
+#include "third_party/iwlwifi/platform/driver-inspector.h"
 
 #include <lib/inspect/cpp/reader.h>
 #include <zircon/errors.h>
diff --git a/third_party/iwlwifi/platform/irq.h b/third_party/iwlwifi/platform/irq.h
index 5d18b1f..f939a59 100644
--- a/third_party/iwlwifi/platform/irq.h
+++ b/third_party/iwlwifi/platform/irq.h
@@ -11,7 +11,7 @@
 
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/third_party/iwlwifi/platform/module.h b/third_party/iwlwifi/platform/module.h
index fa39dc6..ef51dff 100644
--- a/third_party/iwlwifi/platform/module.h
+++ b/third_party/iwlwifi/platform/module.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <zircon/types.h>
 
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/third_party/iwlwifi/platform/mvm-mlme.cc b/third_party/iwlwifi/platform/mvm-mlme.cc
index 1e68aaf..8a102e5 100644
--- a/third_party/iwlwifi/platform/mvm-mlme.cc
+++ b/third_party/iwlwifi/platform/mvm-mlme.cc
@@ -63,9 +63,9 @@
 #include "ieee80211_include.h"
 
 extern "C" {
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
 }  // extern "C"
 
 #include "ieee80211.h"
diff --git a/third_party/iwlwifi/platform/pcie-device.cc b/third_party/iwlwifi/platform/pcie-device.cc
index 0155331..80605cf 100644
--- a/third_party/iwlwifi/platform/pcie-device.cc
+++ b/third_party/iwlwifi/platform/pcie-device.cc
@@ -5,7 +5,7 @@
 // TODO(rsakthi) - how to get this from bazel?
 #define CPTCFG_IWLMVM 1
 
-#include "src/iwlwifi/platform/pcie-device.h"
+#include "third_party/iwlwifi/platform/pcie-device.h"
 
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/async-loop/default.h>
@@ -15,12 +15,12 @@
 #include <memory>
 
 extern "C" {
-#include "src/iwlwifi/iwl-debug.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/pcie/entry.h"
+#include "third_party/iwlwifi/iwl-debug.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/pcie/entry.h"
 }
 
-#include "src/iwlwifi/platform/driver-inspector.h"
+#include "third_party/iwlwifi/platform/driver-inspector.h"
 
 #if !CPTCFG_IWLMVM
 #error "PcieDevice requires support for MVM firmwares."
diff --git a/third_party/iwlwifi/platform/pcie-device.h b/third_party/iwlwifi/platform/pcie-device.h
index 3d1fd98..2f08f40 100644
--- a/third_party/iwlwifi/platform/pcie-device.h
+++ b/third_party/iwlwifi/platform/pcie-device.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "src/iwlwifi/platform/kernel.h"
-#include "src/iwlwifi/platform/wlanphy-impl-device.h"
+#include "third_party/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/wlanphy-impl-device.h"
 
 namespace async {
 class Loop;
diff --git a/third_party/iwlwifi/platform/wlanmac-device.cc b/third_party/iwlwifi/platform/wlanmac-device.cc
index 52a83c7..f035e23 100644
--- a/third_party/iwlwifi/platform/wlanmac-device.cc
+++ b/third_party/iwlwifi/platform/wlanmac-device.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/platform/wlanmac-device.h"
+#include "third_party/iwlwifi/platform/wlanmac-device.h"
 
 #include <zircon/status.h>
 
 #include <memory>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }  // extern "C"
 
-#include "src/iwlwifi/platform/mvm-mlme.h"
+#include "third_party/iwlwifi/platform/mvm-mlme.h"
 
 namespace wlan::iwlwifi {
 
diff --git a/third_party/iwlwifi/platform/wlanphy-impl-device.cc b/third_party/iwlwifi/platform/wlanphy-impl-device.cc
index e3a2e06..d23adaa 100644
--- a/third_party/iwlwifi/platform/wlanphy-impl-device.cc
+++ b/third_party/iwlwifi/platform/wlanphy-impl-device.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/platform/wlanphy-impl-device.h"
+#include "third_party/iwlwifi/platform/wlanphy-impl-device.h"
 
 #include <zircon/status.h>
 
 #include <memory>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }  // extern "C"
 
-#include "src/iwlwifi/platform/mvm-mlme.h"
-#include "src/iwlwifi/platform/wlanmac-device.h"
+#include "third_party/iwlwifi/platform/mvm-mlme.h"
+#include "third_party/iwlwifi/platform/wlanmac-device.h"
 
 namespace wlan::iwlwifi {
 
diff --git a/third_party/iwlwifi/test/BUILD.bazel b/third_party/iwlwifi/test/BUILD.bazel
index d309cd6..6e4925a 100644
--- a/third_party/iwlwifi/test/BUILD.bazel
+++ b/third_party/iwlwifi/test/BUILD.bazel
@@ -33,23 +33,23 @@
   #  "//sdk/banjo/fuchsia.hardware.wlan.mac:fuchsia.hardware.wlan.mac_banjo_cpp",
   #  "//sdk/banjo/fuchsia.hardware.wlanphyimpl:fuchsia.hardware.wlanphyimpl_banjo_cpp",
   #  "//sdk/fidl/fuchsia.wlan.common:fuchsia.wlan.common_banjo_cpp",
-  #  "//src/iwlwifi:core",
-  #  "//src/iwlwifi/fw:api",
-  #  "//src/iwlwifi/mvm",
-  #  "//src/iwlwifi/platform:fuchsia_device",
-  # "//src/devices/testing/fake-bti",
+  #  "//third_party/iwlwifi:core",
+  #  "//third_party/iwlwifi/fw:api",
+  #  "//third_party/iwlwifi/mvm",
+  #  "//third_party/iwlwifi/platform:fuchsia_device",
+  # "//third_party/devices/testing/fake-bti",
   # "//zircon/system/ulib/async-loop:async-loop-cpp",
   # "//zircon/system/ulib/async-loop:async-loop-default",
   # "//zircon/system/ulib/fbl",
 
-  #  "//src/connectivity/wlan/drivers/testing/lib/sim-device",
-  #  "//src/connectivity/wlan/drivers/testing/lib/sim-env",
-  #  "//src/connectivity/wlan/drivers/testing/lib/sim-fake-ap",
-  # "//src/iwlwifi:core",
-  # "//src/iwlwifi/platform",
-  # "//src/devices/pci/testing:pci-protocol-fake",
-  # "//src/devices/testing/mock-ddk",
+  #  "//third_party/connectivity/wlan/drivers/testing/lib/sim-device",
+  #  "//third_party/connectivity/wlan/drivers/testing/lib/sim-env",
+  #  "//third_party/connectivity/wlan/drivers/testing/lib/sim-fake-ap",
+  # "//third_party/iwlwifi:core",
+  # "//third_party/iwlwifi/platform",
+  # "//third_party/devices/pci/testing:pci-protocol-fake",
+  # "//third_party/devices/testing/mock-ddk",
   # "//zircon/system/public",
    "//zircon/system/ulib/zxtest",
   ],
-)
\ No newline at end of file
+)
diff --git a/third_party/iwlwifi/test/driver-inspector-test.cc b/third_party/iwlwifi/test/driver-inspector-test.cc
index 07a8eb4..cece280 100644
--- a/third_party/iwlwifi/test/driver-inspector-test.cc
+++ b/third_party/iwlwifi/test/driver-inspector-test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/platform/driver-inspector.h"
+#include "third_party/iwlwifi/platform/driver-inspector.h"
 
 #include <lib/inspect/cpp/hierarchy.h>
 #include <lib/inspect/cpp/reader.h>
diff --git a/third_party/iwlwifi/test/dummy-test.cc b/third_party/iwlwifi/test/dummy-test.cc
index a11de56..b3aae52 100644
--- a/third_party/iwlwifi/test/dummy-test.cc
+++ b/third_party/iwlwifi/test/dummy-test.cc
@@ -6,7 +6,7 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/fake-ucode-capa-test.cc b/third_party/iwlwifi/test/fake-ucode-capa-test.cc
index 78f330f..77af2e2 100644
--- a/third_party/iwlwifi/test/fake-ucode-capa-test.cc
+++ b/third_party/iwlwifi/test/fake-ucode-capa-test.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/fake-ucode-capa-test.h"
+#include "third_party/iwlwifi/test/fake-ucode-capa-test.h"
 
 #include <zircon/assert.h>
 #include <zircon/status.h>
 
-#include "src/iwlwifi/test/tlv-fw-builder.h"
+#include "third_party/iwlwifi/test/tlv-fw-builder.h"
 
 extern "C" {
-#include "src/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/fw/img.h"
 }  // extern "C"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/fake-ucode-capa-test.h b/third_party/iwlwifi/test/fake-ucode-capa-test.h
index b358fea..9468785 100644
--- a/third_party/iwlwifi/test/fake-ucode-capa-test.h
+++ b/third_party/iwlwifi/test/fake-ucode-capa-test.h
@@ -10,7 +10,7 @@
 #include <zxtest/zxtest.h>
 
 #include "src/connectivity/wlan/drivers/testing/lib/sim-env/sim-env.h"
-#include "src/iwlwifi/test/sim-trans.h"
+#include "third_party/iwlwifi/test/sim-trans.h"
 #include "src/devices/testing/mock-ddk/mock-device.h"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/fw-dbg-test.cc b/third_party/iwlwifi/test/fw-dbg-test.cc
index 10176bf..245252d 100644
--- a/third_party/iwlwifi/test/fw-dbg-test.cc
+++ b/third_party/iwlwifi/test/fw-dbg-test.cc
@@ -10,13 +10,13 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/fw/dbg.h"
-#include "src/iwlwifi/fw/error-dump.h"
-#include "src/iwlwifi/fw/runtime.h"
+#include "third_party/iwlwifi/fw/dbg.h"
+#include "third_party/iwlwifi/fw/error-dump.h"
+#include "third_party/iwlwifi/fw/runtime.h"
 }
 
-#include "src/iwlwifi/platform/driver-inspector.h"
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/platform/driver-inspector.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/fw-test.cc b/third_party/iwlwifi/test/fw-test.cc
index 56f245c..4cb7e11 100644
--- a/third_party/iwlwifi/test/fw-test.cc
+++ b/third_party/iwlwifi/test/fw-test.cc
@@ -5,13 +5,13 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/platform/memory.h"
-#include "src/iwlwifi/test/sim-nvm.h"
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/test/sim-nvm.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/inspect-host-cmd.cc b/third_party/iwlwifi/test/inspect-host-cmd.cc
index 78d4126..661a92b 100644
--- a/third_party/iwlwifi/test/inspect-host-cmd.cc
+++ b/third_party/iwlwifi/test/inspect-host-cmd.cc
@@ -4,7 +4,7 @@
 
 // Util functions to dump info/data for debug.
 
-#include "src/iwlwifi/test/inspect-host-cmd.h"
+#include "third_party/iwlwifi/test/inspect-host-cmd.h"
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/third_party/iwlwifi/test/inspect-host-cmd.h b/third_party/iwlwifi/test/inspect-host-cmd.h
index aa2a3ed..ecbcf96 100644
--- a/third_party/iwlwifi/test/inspect-host-cmd.h
+++ b/third_party/iwlwifi/test/inspect-host-cmd.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif  // defined(__cplusplus)
 
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 
 // Util functions to dump host command info/data for debug.
 void inspect_host_cmd(const char* func_name, int line_no, struct iwl_host_cmd* cmd);
diff --git a/third_party/iwlwifi/test/iwl-phy-db-test.cc b/third_party/iwlwifi/test/iwl-phy-db-test.cc
index b81fc65..e82bc22 100644
--- a/third_party/iwlwifi/test/iwl-phy-db-test.cc
+++ b/third_party/iwlwifi/test/iwl-phy-db-test.cc
@@ -14,7 +14,7 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/iwl-phy-db.h"
+#include "third_party/iwlwifi/iwl-phy-db.h"
 }
 
 namespace wlan {
diff --git a/third_party/iwlwifi/test/mac-ctxt-test.cc b/third_party/iwlwifi/test/mac-ctxt-test.cc
index 48d3f84..279eb23 100644
--- a/third_party/iwlwifi/test/mac-ctxt-test.cc
+++ b/third_party/iwlwifi/test/mac-ctxt-test.cc
@@ -9,10 +9,10 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/mac80211-test.cc b/third_party/iwlwifi/test/mac80211-test.cc
index dee2bef..d0e5b58 100644
--- a/third_party/iwlwifi/test/mac80211-test.cc
+++ b/third_party/iwlwifi/test/mac80211-test.cc
@@ -9,11 +9,11 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/test/mock-trans.h"
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/mock-trans.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 #include "zircon/system/ulib/fbl/include/fbl/auto_lock.h"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/mock-trans.h b/third_party/iwlwifi/test/mock-trans.h
index 0c86aea..44473c2 100644
--- a/third_party/iwlwifi/test/mock-trans.h
+++ b/third_party/iwlwifi/test/mock-trans.h
@@ -11,8 +11,8 @@
 
 #include <zircon/assert.h>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/test/sim-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/test/sim-trans.h"
 
 namespace wlan::testing {
 
diff --git a/third_party/iwlwifi/test/mvm-mlme-test.cc b/third_party/iwlwifi/test/mvm-mlme-test.cc
index f2cbffa..3f6f250 100644
--- a/third_party/iwlwifi/test/mvm-mlme-test.cc
+++ b/third_party/iwlwifi/test/mvm-mlme-test.cc
@@ -16,15 +16,15 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/mvm-mlme.h"
-#include "src/iwlwifi/platform/wlanphy-impl-device.h"
-#include "src/iwlwifi/test/mock-trans.h"
-#include "src/iwlwifi/test/single-ap-test.h"
-#include "src/iwlwifi/test/wlan-pkt-builder.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/mvm-mlme.h"
+#include "third_party/iwlwifi/platform/wlanphy-impl-device.h"
+#include "third_party/iwlwifi/test/mock-trans.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/wlan-pkt-builder.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/mvm-test.cc b/third_party/iwlwifi/test/mvm-test.cc
index a43ead6..3c455e3 100644
--- a/third_party/iwlwifi/test/mvm-test.cc
+++ b/third_party/iwlwifi/test/mvm-test.cc
@@ -10,16 +10,16 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/time-event.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/time-event.h"
 }
 
-#include "src/iwlwifi/platform/ieee80211.h"
-#include "src/iwlwifi/platform/memory.h"
-#include "src/iwlwifi/test/fake-ucode-capa-test.h"
-#include "src/iwlwifi/test/mock-trans.h"
-#include "src/iwlwifi/test/single-ap-test.h"
-#include "src/iwlwifi/test/wlan-pkt-builder.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/memory.h"
+#include "third_party/iwlwifi/test/fake-ucode-capa-test.h"
+#include "third_party/iwlwifi/test/mock-trans.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/wlan-pkt-builder.h"
 
 namespace wlan {
 namespace testing {
diff --git a/third_party/iwlwifi/test/notif-wait-test.cc b/third_party/iwlwifi/test/notif-wait-test.cc
index fc6c0a2..9405610 100644
--- a/third_party/iwlwifi/test/notif-wait-test.cc
+++ b/third_party/iwlwifi/test/notif-wait-test.cc
@@ -11,7 +11,7 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/fw/notif-wait.h"
+#include "third_party/iwlwifi/fw/notif-wait.h"
 }
 
 namespace wlan {
diff --git a/third_party/iwlwifi/test/nvm-test.cc b/third_party/iwlwifi/test/nvm-test.cc
index 238e10a..deca6e9 100644
--- a/third_party/iwlwifi/test/nvm-test.cc
+++ b/third_party/iwlwifi/test/nvm-test.cc
@@ -4,14 +4,14 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/test/sim-nvm.h"
+#include "third_party/iwlwifi/test/sim-nvm.h"
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/phy-ctxt-test.cc b/third_party/iwlwifi/test/phy-ctxt-test.cc
index 9f3e15d..adf93a4 100644
--- a/third_party/iwlwifi/test/phy-ctxt-test.cc
+++ b/third_party/iwlwifi/test/phy-ctxt-test.cc
@@ -8,10 +8,10 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
 namespace wlan {
diff --git a/third_party/iwlwifi/test/platform-test.cc b/third_party/iwlwifi/test/platform-test.cc
index b82d3e7..6435a23 100644
--- a/third_party/iwlwifi/test/platform-test.cc
+++ b/third_party/iwlwifi/test/platform-test.cc
@@ -5,9 +5,9 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/platform/compiler.h"
-#include "src/iwlwifi/platform/debug.h"
-#include "src/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/debug.h"
+#include "third_party/iwlwifi/platform/kernel.h"
 
 namespace {
 
diff --git a/third_party/iwlwifi/test/sim-mvm.cc b/third_party/iwlwifi/test/sim-mvm.cc
index 2d98032..ac79f6e 100644
--- a/third_party/iwlwifi/test/sim-mvm.cc
+++ b/third_party/iwlwifi/test/sim-mvm.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/sim-mvm.h"
+#include "third_party/iwlwifi/test/sim-mvm.h"
 
 extern "C" {
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/fw/api/datapath.h"
-#include "src/iwlwifi/fw/api/sta.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/fw/api/datapath.h"
+#include "third_party/iwlwifi/fw/api/sta.h"
 }  // extern "C"
 
-#include "src/iwlwifi/test/inspect-host-cmd.h"
+#include "third_party/iwlwifi/test/inspect-host-cmd.h"
 
 namespace wlan {
 namespace testing {
diff --git a/third_party/iwlwifi/test/sim-mvm.h b/third_party/iwlwifi/test/sim-mvm.h
index 235ab2c..01ed86f 100644
--- a/third_party/iwlwifi/test/sim-mvm.h
+++ b/third_party/iwlwifi/test/sim-mvm.h
@@ -12,11 +12,11 @@
 #include "src/connectivity/wlan/drivers/testing/lib/sim-env/sim-sta-ifc.h"
 
 extern "C" {
-#include "src/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/iwl-trans.h"
 }  // extern "C"
 
-#include "src/iwlwifi/test/sim-nvm.h"
-#include "src/iwlwifi/test/sim.h"
+#include "third_party/iwlwifi/test/sim-nvm.h"
+#include "third_party/iwlwifi/test/sim.h"
 
 namespace wlan::testing {
 
diff --git a/third_party/iwlwifi/test/sim-nvm-data.inc b/third_party/iwlwifi/test/sim-nvm-data.inc
index 16e4c6c..eaa3a41 100644
--- a/third_party/iwlwifi/test/sim-nvm-data.inc
+++ b/third_party/iwlwifi/test/sim-nvm-data.inc
@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "src/iwlwifi/fw/api/nvm-reg.h"
+#include "third_party/iwlwifi/fw/api/nvm-reg.h"
 
 namespace wlan::testing {
 
diff --git a/third_party/iwlwifi/test/sim-nvm.cc b/third_party/iwlwifi/test/sim-nvm.cc
index 0d6bf31..4c8ad34 100644
--- a/third_party/iwlwifi/test/sim-nvm.cc
+++ b/third_party/iwlwifi/test/sim-nvm.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/sim-nvm.h"
+#include "third_party/iwlwifi/test/sim-nvm.h"
 
 #include <string.h>
 #include <zircon/assert.h>
@@ -10,11 +10,11 @@
 #include <vector>
 
 extern "C" {
-#include "src/iwlwifi/fw/api/nvm-reg.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/fw/api/nvm-reg.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/test/sim-nvm-data.inc"
+#include "third_party/iwlwifi/test/sim-nvm-data.inc"
 
 namespace wlan::testing {
 
diff --git a/third_party/iwlwifi/test/sim-nvm.h b/third_party/iwlwifi/test/sim-nvm.h
index f6b07bd..ed20701 100644
--- a/third_party/iwlwifi/test/sim-nvm.h
+++ b/third_party/iwlwifi/test/sim-nvm.h
@@ -10,8 +10,8 @@
 
 #include <vector>
 
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/test/sim.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/test/sim.h"
 
 namespace wlan::testing {
 
diff --git a/third_party/iwlwifi/test/sim-trans.cc b/third_party/iwlwifi/test/sim-trans.cc
index 24942de..f143a9a 100644
--- a/third_party/iwlwifi/test/sim-trans.cc
+++ b/third_party/iwlwifi/test/sim-trans.cc
@@ -16,7 +16,7 @@
 // sim_trans_priv is returned. To access the simulated-transportation-specific
 // variable, use IWL_TRANS_GET_SIM_TRANS(trans) to get it.
 
-#include "src/iwlwifi/test/sim-trans.h"
+#include "third_party/iwlwifi/test/sim-trans.h"
 
 #include <fuchsia/hardware/wlan/mac/c/banjo.h>
 #include <fuchsia/hardware/wlanphyimpl/c/banjo.h>
@@ -26,16 +26,16 @@
 #include <zircon/status.h>
 
 extern "C" {
-#include "src/iwlwifi/fw/api/alive.h"
-#include "src/iwlwifi/fw/api/commands.h"
-#include "src/iwlwifi/iwl-config.h"
-#include "src/iwlwifi/iwl-drv.h"
-#include "src/iwlwifi/iwl-trans.h"
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/fw/api/alive.h"
+#include "third_party/iwlwifi/fw/api/commands.h"
+#include "third_party/iwlwifi/iwl-config.h"
+#include "third_party/iwlwifi/iwl-drv.h"
+#include "third_party/iwlwifi/iwl-trans.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
-#include "src/iwlwifi/platform/mvm-mlme.h"
-#include "src/iwlwifi/platform/wlanphy-impl-device.h"
+#include "third_party/iwlwifi/platform/mvm-mlme.h"
+#include "third_party/iwlwifi/platform/wlanphy-impl-device.h"
 #include "src/devices/testing/mock-ddk/mock-device.h"
 
 using wlan::testing::IWL_TRANS_GET_SIM_TRANS;
diff --git a/third_party/iwlwifi/test/sim-trans.h b/third_party/iwlwifi/test/sim-trans.h
index 6474c05..ce53d30 100644
--- a/third_party/iwlwifi/test/sim-trans.h
+++ b/third_party/iwlwifi/test/sim-trans.h
@@ -16,8 +16,8 @@
 #include <memory>
 
 #include "src/connectivity/wlan/drivers/testing/lib/sim-env/sim-env.h"
-#include "src/iwlwifi/platform/kernel.h"
-#include "src/iwlwifi/test/sim-mvm.h"
+#include "third_party/iwlwifi/platform/kernel.h"
+#include "third_party/iwlwifi/test/sim-mvm.h"
 
 namespace async {
 
diff --git a/third_party/iwlwifi/test/single-ap-test.cc b/third_party/iwlwifi/test/single-ap-test.cc
index 5852c9d..db98be1 100644
--- a/third_party/iwlwifi/test/single-ap-test.cc
+++ b/third_party/iwlwifi/test/single-ap-test.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 #include <zircon/assert.h>
 
-#include "src/iwlwifi/test/tlv-fw-builder.h"
+#include "third_party/iwlwifi/test/tlv-fw-builder.h"
 
 extern "C" {
-#include "src/iwlwifi/fw/img.h"
+#include "third_party/iwlwifi/fw/img.h"
 }  // extern "C"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/single-ap-test.h b/third_party/iwlwifi/test/single-ap-test.h
index 7ac601a..3b48dcc 100644
--- a/third_party/iwlwifi/test/single-ap-test.h
+++ b/third_party/iwlwifi/test/single-ap-test.h
@@ -13,7 +13,7 @@
 
 #include "src/connectivity/wlan/drivers/testing/lib/sim-env/sim-env.h"
 #include "src/connectivity/wlan/drivers/testing/lib/sim-fake-ap/sim-fake-ap.h"
-#include "src/iwlwifi/test/sim-trans.h"
+#include "third_party/iwlwifi/test/sim-trans.h"
 #include "src/devices/testing/mock-ddk/mock-device.h"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/sta-test.cc b/third_party/iwlwifi/test/sta-test.cc
index f42354c..eeda286 100644
--- a/third_party/iwlwifi/test/sta-test.cc
+++ b/third_party/iwlwifi/test/sta-test.cc
@@ -9,12 +9,12 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
-#include "src/iwlwifi/mvm/sta.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/sta.h"
 }
 
-#include "src/iwlwifi/test/mock-trans.h"
-#include "src/iwlwifi/test/single-ap-test.h"
+#include "third_party/iwlwifi/test/mock-trans.h"
+#include "third_party/iwlwifi/test/single-ap-test.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/task-test.cc b/third_party/iwlwifi/test/task-test.cc
index aad1c64..798acfe 100644
--- a/third_party/iwlwifi/test/task-test.cc
+++ b/third_party/iwlwifi/test/task-test.cc
@@ -10,7 +10,7 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/platform/task-internal.h"
+#include "third_party/iwlwifi/platform/task-internal.h"
 
 namespace wlan::testing {
 namespace {
diff --git a/third_party/iwlwifi/test/tlv-fw-builder.cc b/third_party/iwlwifi/test/tlv-fw-builder.cc
index 18480c0..6e2074e 100644
--- a/third_party/iwlwifi/test/tlv-fw-builder.cc
+++ b/third_party/iwlwifi/test/tlv-fw-builder.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/tlv-fw-builder.h"
+#include "third_party/iwlwifi/test/tlv-fw-builder.h"
 
 #include <endian.h>
 
 #include <cstring>
 
-#include "src/iwlwifi/platform/compiler.h"
+#include "third_party/iwlwifi/platform/compiler.h"
 
 extern "C" {
-#include "src/iwlwifi/fw/file.h"
+#include "third_party/iwlwifi/fw/file.h"
 }  // extern "C"
 
 namespace wlan::testing {
diff --git a/third_party/iwlwifi/test/utils-test.cc b/third_party/iwlwifi/test/utils-test.cc
index 0189aa9..c565903 100644
--- a/third_party/iwlwifi/test/utils-test.cc
+++ b/third_party/iwlwifi/test/utils-test.cc
@@ -18,7 +18,7 @@
 #include <zxtest/zxtest.h>
 
 extern "C" {
-#include "src/iwlwifi/mvm/mvm.h"
+#include "third_party/iwlwifi/mvm/mvm.h"
 }
 
 namespace {
diff --git a/third_party/iwlwifi/test/wlan-pkt-builder.cc b/third_party/iwlwifi/test/wlan-pkt-builder.cc
index 4ffab1e..3b471f2 100644
--- a/third_party/iwlwifi/test/wlan-pkt-builder.cc
+++ b/third_party/iwlwifi/test/wlan-pkt-builder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/iwlwifi/test/wlan-pkt-builder.h"
+#include "third_party/iwlwifi/test/wlan-pkt-builder.h"
 
 #include <fuchsia/wlan/common/cpp/banjo.h>
 
diff --git a/third_party/iwlwifi/test/wlan-pkt-builder.h b/third_party/iwlwifi/test/wlan-pkt-builder.h
index 11634e1..ecc7ee7 100644
--- a/third_party/iwlwifi/test/wlan-pkt-builder.h
+++ b/third_party/iwlwifi/test/wlan-pkt-builder.h
@@ -14,7 +14,7 @@
 
 #include <zxtest/zxtest.h>
 
-#include "src/iwlwifi/platform/ieee80211.h"
+#include "third_party/iwlwifi/platform/ieee80211.h"
 
 namespace wlan::testing {