From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Wed, 1 Jan 2014 19:18:27 +0000 (-0800)
Subject: ath - Basic #include adjustments
X-Git-Tag: v3.9.0~891
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/5cd80a8ca6f18f728c9f1e9bd79270cf365cb3a4

ath - Basic #include adjustments

* Basic include adjustments
---

diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c
index 675041f633..55802660a1 100644
--- a/sys/dev/netif/ath/ath/if_ath.c
+++ b/sys/dev/netif/ath/ath/if_ath.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,13 +77,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -96,32 +93,32 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_rx_edma.h>
-#include <dev/ath/if_ath_tx_edma.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_ath_btcoex.h>
-#include <dev/ath/if_ath_spectral.h>
-#include <dev/ath/if_ath_lna_div.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_rx_edma.h>
+#include <dev/netif/ath/ath/if_ath_tx_edma.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_ath_btcoex.h>
+#include <dev/netif/ath/ath/if_ath_spectral.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 /*
@@ -218,7 +215,7 @@ static int	ath_node_set_tim(struct ieee80211_node *, int);
 static void	ath_node_recv_pspoll(struct ieee80211_node *, struct mbuf *);
 
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <dev/ath/if_ath_tdma.h>
+#include <dev/netif/ath/ath/if_ath_tdma.h>
 #endif
 
 SYSCTL_DECL(_hw_ath);
diff --git a/sys/dev/netif/ath/ath/if_ath_ahb.c b/sys/dev/netif/ath/ath/if_ath_ahb.c
index 64a8622a6d..10c79a5fce 100644
--- a/sys/dev/netif/ath/ath/if_ath_ahb.c
+++ b/sys/dev/netif/ath/ath/if_ath_ahb.c
@@ -45,8 +45,6 @@
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
@@ -57,14 +55,16 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
 
 #include <mips/atheros/ar71xxreg.h>
 #include <mips/atheros/ar91xxreg.h>
 #include <mips/atheros/ar71xx_cpudef.h>
 
+#include <machine/resource.h>
+
 /*
  * bus glue.
  */
diff --git a/sys/dev/netif/ath/ath/if_ath_alq.c b/sys/dev/netif/ath/ath/if_ath_alq.c
index 8ca53ae2c5..d820ac6ccf 100644
--- a/sys/dev/netif/ath/ath/if_ath_alq.c
+++ b/sys/dev/netif/ath/ath/if_ath_alq.c
@@ -46,7 +46,7 @@
 #include <sys/endian.h>
 #include <sys/time.h>
 
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 
 #ifdef	ATH_DEBUG_ALQ
 static struct ale *
diff --git a/sys/dev/netif/ath/ath/if_ath_beacon.c b/sys/dev/netif/ath/ath/if_ath_beacon.c
index 173cd8f99b..063f5ce32a 100644
--- a/sys/dev/netif/ath/ath/if_ath_beacon.c
+++ b/sys/dev/netif/ath/ath/if_ath_beacon.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,10 +77,10 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 
 #include <net/bpf.h>
@@ -93,15 +90,15 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
 
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 /*
diff --git a/sys/dev/netif/ath/ath/if_ath_btcoex.c b/sys/dev/netif/ath/ath/if_ath_btcoex.c
index 6b61a7af70..27005dc2d5 100644
--- a/sys/dev/netif/ath/ath/if_ath_btcoex.c
+++ b/sys/dev/netif/ath/ath/if_ath_btcoex.c
@@ -46,11 +46,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -59,7 +55,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -68,8 +64,10 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_btcoex.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_btcoex.h>
 
 /*
  * Initial AR9285 / (WB195) bluetooth coexistence settings,
diff --git a/sys/dev/netif/ath/ath/if_ath_debug.c b/sys/dev/netif/ath/ath/if_ath_debug.c
index 15b6ddda37..80d166e97b 100644
--- a/sys/dev/netif/ath/ath/if_ath_debug.c
+++ b/sys/dev/netif/ath/ath/if_ath_debug.c
@@ -51,8 +51,6 @@
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -61,13 +59,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -77,16 +75,16 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 #ifdef ATH_DEBUG
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
 
 uint64_t ath_debug = 0;
 
diff --git a/sys/dev/netif/ath/ath/if_ath_keycache.c b/sys/dev/netif/ath/ath/if_ath_keycache.c
index f05b5da2a5..0abe09c5ff 100644
--- a/sys/dev/netif/ath/ath/if_ath_keycache.c
+++ b/sys/dev/netif/ath/ath/if_ath_keycache.c
@@ -58,8 +58,6 @@
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
@@ -69,14 +67,14 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
 
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
 
 #ifdef ATH_DEBUG
 static void
diff --git a/sys/dev/netif/ath/ath/if_ath_led.c b/sys/dev/netif/ath/ath/if_ath_led.c
index b95d534c0e..e5d4189161 100644
--- a/sys/dev/netif/ath/ath/if_ath_led.c
+++ b/sys/dev/netif/ath/ath/if_ath_led.c
@@ -64,9 +64,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -76,13 +73,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -92,14 +89,14 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
 
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
 
-#include <dev/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
 
 /*
  * Software LED driver routines.
diff --git a/sys/dev/netif/ath/ath/if_ath_lna_div.c b/sys/dev/netif/ath/ath/if_ath_lna_div.c
index 77f1948f6a..aaebfbc18a 100644
--- a/sys/dev/netif/ath/ath/if_ath_lna_div.c
+++ b/sys/dev/netif/ath/ath/if_ath_lna_div.c
@@ -46,11 +46,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -59,7 +55,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -68,9 +64,11 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_lna_div.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
 
 /* Linux compability macros */
 /*
diff --git a/sys/dev/netif/ath/ath/if_ath_pci.c b/sys/dev/netif/ath/ath/if_ath_pci.c
index f3f6be6ee0..e7a9f16b8f 100644
--- a/sys/dev/netif/ath/ath/if_ath_pci.c
+++ b/sys/dev/netif/ath/ath/if_ath_pci.c
@@ -43,8 +43,6 @@
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
@@ -55,9 +53,11 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
+
+#include <machine/resource.h>
 
-#include <dev/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athvar.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/netif/ath/ath/if_ath_rx.c b/sys/dev/netif/ath/ath/if_ath_rx.c
index 27e7f81b3f..c3ceb5775f 100644
--- a/sys/dev/netif/ath/ath/if_ath_rx.c
+++ b/sys/dev/netif/ath/ath/if_ath_rx.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,13 +77,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -96,30 +93,30 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
-#include <dev/ath/if_ath_lna_div.h>
+#include <dev/netif/ath/ath/if_ath_lna_div.h>
 
 /*
  * Calculate the receive filter according to the
diff --git a/sys/dev/netif/ath/ath/if_ath_rx_edma.c b/sys/dev/netif/ath/ath/if_ath_rx_edma.c
index c33cb37e24..bc6a01cae2 100644
--- a/sys/dev/netif/ath/ath/if_ath_rx_edma.c
+++ b/sys/dev/netif/ath/ath/if_ath_rx_edma.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,13 +77,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -96,29 +93,29 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
-#include <dev/ath/if_ath_rx_edma.h>
+#include <dev/netif/ath/ath/if_ath_rx_edma.h>
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 /*
diff --git a/sys/dev/netif/ath/ath/if_ath_spectral.c b/sys/dev/netif/ath/ath/if_ath_spectral.c
index 2d92bdec61..25a19511ea 100644
--- a/sys/dev/netif/ath/ath/if_ath_spectral.c
+++ b/sys/dev/netif/ath/ath/if_ath_spectral.c
@@ -45,11 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -58,7 +54,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -67,10 +63,12 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_ath_spectral.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_ath_spectral.h>
 
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
 
 struct ath_spectral_state {
 	HAL_SPECTRAL_PARAM	spectral_state;
diff --git a/sys/dev/netif/ath/ath/if_ath_sysctl.c b/sys/dev/netif/ath/ath/if_ath_sysctl.c
index 8f8415bdbc..16557b822d 100644
--- a/sys/dev/netif/ath/ath/if_ath_sysctl.c
+++ b/sys/dev/netif/ath/ath/if_ath_sysctl.c
@@ -58,8 +58,6 @@
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
@@ -69,13 +67,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -85,22 +83,22 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
 
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 static int
diff --git a/sys/dev/netif/ath/ath/if_ath_tdma.c b/sys/dev/netif/ath/ath/if_ath_tdma.c
index 1faaf5de61..87ef52f6e4 100644
--- a/sys/dev/netif/ath/ath/if_ath_tdma.c
+++ b/sys/dev/netif/ath/ath/if_ath_tdma.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,13 +77,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -96,31 +93,31 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <dev/ath/if_ath_tdma.h>
+#include <dev/netif/ath/ath/if_ath_tdma.h>
 
 static void	ath_tdma_settimers(struct ath_softc *sc, u_int32_t nexttbtt,
 		    u_int32_t bintval);
diff --git a/sys/dev/netif/ath/ath/if_ath_tx.c b/sys/dev/netif/ath/ath/if_ath_tx.c
index 33e34a9dbe..846ca25951 100644
--- a/sys/dev/netif/ath/ath/if_ath_tx.c
+++ b/sys/dev/netif/ath/ath/if_ath_tx.c
@@ -60,8 +60,6 @@
 #include <sys/priv.h>
 #include <sys/ktr.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
@@ -71,15 +69,15 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
-#include <net80211/ieee80211_ht.h>
+#include <netproto/802_11/ieee80211_ht.h>
 
 #include <net/bpf.h>
 
@@ -88,22 +86,22 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
 
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_tx_ht.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_tx_ht.h>
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 /*
diff --git a/sys/dev/netif/ath/ath/if_ath_tx_edma.c b/sys/dev/netif/ath/ath/if_ath_tx_edma.c
index 50b157d872..2749950ccf 100644
--- a/sys/dev/netif/ath/ath/if_ath_tx_edma.c
+++ b/sys/dev/netif/ath/ath/if_ath_tx_edma.c
@@ -67,9 +67,6 @@
 #include <sys/priv.h>
 #include <sys/module.h>
 #include <sys/ktr.h>
-#include <sys/smp.h>	/* for mp_ncpus */
-
-#include <machine/bus.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -80,13 +77,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -96,29 +93,29 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
-
-#include <dev/ath/if_ath_debug.h>
-#include <dev/ath/if_ath_misc.h>
-#include <dev/ath/if_ath_tsf.h>
-#include <dev/ath/if_ath_tx.h>
-#include <dev/ath/if_ath_sysctl.h>
-#include <dev/ath/if_ath_led.h>
-#include <dev/ath/if_ath_keycache.h>
-#include <dev/ath/if_ath_rx.h>
-#include <dev/ath/if_ath_beacon.h>
-#include <dev/ath/if_athdfs.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/netif/ath/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_misc.h>
+#include <dev/netif/ath/ath/if_ath_tsf.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>
+#include <dev/netif/ath/ath/if_ath_sysctl.h>
+#include <dev/netif/ath/ath/if_ath_led.h>
+#include <dev/netif/ath/ath/if_ath_keycache.h>
+#include <dev/netif/ath/ath/if_ath_rx.h>
+#include <dev/netif/ath/ath/if_ath_beacon.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
-#include <dev/ath/if_ath_tx_edma.h>
+#include <dev/netif/ath/ath/if_ath_tx_edma.h>
 
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 /*
diff --git a/sys/dev/netif/ath/ath/if_ath_tx_ht.c b/sys/dev/netif/ath/ath/if_ath_tx_ht.c
index 9f5bb0bf17..1bc062e00d 100644
--- a/sys/dev/netif/ath/ath/if_ath_tx_ht.c
+++ b/sys/dev/netif/ath/ath/if_ath_tx_ht.c
@@ -51,8 +51,6 @@
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
 
-#include <machine/bus.h>
-
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -61,13 +59,13 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 
-#include <net80211/ieee80211_var.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
-#include <net80211/ieee80211_superg.h>
+#include <netproto/802_11/ieee80211_superg.h>
 #endif
 #ifdef IEEE80211_SUPPORT_TDMA
-#include <net80211/ieee80211_tdma.h>
+#include <netproto/802_11/ieee80211_tdma.h>
 #endif
 
 #include <net/bpf.h>
@@ -77,18 +75,18 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_hal/ah_devid.h>		/* XXX for softled */
-#include <dev/ath/ath_hal/ah_diagcodes.h>
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_hal/ah_devid.h>		/* XXX for softled */
+#include <dev/netif/ath/ath_hal/ah_diagcodes.h>
 
 #ifdef ATH_TX99_DIAG
-#include <dev/ath/ath_tx99/ath_tx99.h>
+#include <dev/netif/ath/ath_tx99/ath_tx99.h>
 #endif
 
-#include <dev/ath/if_ath_tx.h>		/* XXX for some support functions */
-#include <dev/ath/if_ath_tx_ht.h>
-#include <dev/ath/if_athrate.h>
-#include <dev/ath/if_ath_debug.h>
+#include <dev/netif/ath/ath/if_ath_tx.h>  /* XXX for some support functions */
+#include <dev/netif/ath/ath/if_ath_tx_ht.h>
+#include <dev/netif/ath/ath/if_athrate.h>
+#include <dev/netif/ath/ath/if_ath_debug.h>
 
 /*
  * XXX net80211?
diff --git a/sys/dev/netif/ath/ath/if_athvar.h b/sys/dev/netif/ath/ath/if_athvar.h
index 6b074d6c95..d089a1461c 100644
--- a/sys/dev/netif/ath/ath/if_athvar.h
+++ b/sys/dev/netif/ath/ath/if_athvar.h
@@ -37,13 +37,13 @@
 
 #include <machine/atomic.h>
 
-#include <dev/ath/ath_hal/ah.h>
-#include <dev/ath/ath_hal/ah_desc.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <dev/ath/if_athioctl.h>
-#include <dev/ath/if_athrate.h>
+#include <dev/netif/ath/ath_hal/ah.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
+#include <netproto/802_11/ieee80211_radiotap.h>
+#include <dev/netif/ath/ath/if_athioctl.h>
+#include <dev/netif/ath/ath/if_athrate.h>
 #ifdef	ATH_DEBUG_ALQ
-#include <dev/ath/if_ath_alq.h>
+#include <dev/netif/ath/ath/if_ath_alq.h>
 #endif
 
 #define	ATH_TIMEOUT		1000
diff --git a/sys/dev/netif/ath/ath_dfs/null/dfs_null.c b/sys/dev/netif/ath/ath_dfs/null/dfs_null.c
index e1568ee37d..b4dc7f267c 100644
--- a/sys/dev/netif/ath/ath_dfs/null/dfs_null.c
+++ b/sys/dev/netif/ath/ath_dfs/null/dfs_null.c
@@ -45,11 +45,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -58,7 +54,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -67,10 +63,12 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/if_athdfs.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath/if_athdfs.h>
 
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
 
 /*
  * Methods which are required
diff --git a/sys/dev/netif/ath/ath_hal/ah_internal.h b/sys/dev/netif/ath/ath_hal/ah_internal.h
index 908f33eced..331093bddf 100644
--- a/sys/dev/netif/ath/ath_hal/ah_internal.h
+++ b/sys/dev/netif/ath/ath_hal/ah_internal.h
@@ -27,7 +27,7 @@
 #define	AH_MIN(a,b)	((a)<(b)?(a):(b))
 #define	AH_MAX(a,b)	((a)>(b)?(a):(b))
 
-#include <net80211/_ieee80211.h>
+#include <netproto/802_11/_ieee80211.h>
 #include "opt_ah.h"			/* needed for AH_SUPPORT_AR5416 */
 
 #ifndef	AH_SUPPORT_AR5416
diff --git a/sys/dev/netif/ath/ath_hal/ah_osdep.c b/sys/dev/netif/ath/ath_hal/ah_osdep.c
index 043ebed87f..c71cf75a26 100644
--- a/sys/dev/netif/ath/ath_hal/ah_osdep.c
+++ b/sys/dev/netif/ath/ath_hal/ah_osdep.c
@@ -46,8 +46,8 @@
 
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <dev/ath/ath_hal/ah.h>
-#include <dev/ath/ath_hal/ah_debug.h>
+#include <dev/netif/ath/ath_hal/ah.h>
+#include <dev/netif/ath/ath_hal/ah_debug.h>
 
 /*
  * WiSoC boards overload the bus tag with information about the
@@ -169,7 +169,7 @@ DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
  */
 #include <sys/alq.h>
 #include <sys/pcpu.h>
-#include <dev/ath/ath_hal/ah_decode.h>
+#include <dev/netif/ath/ath_hal/ah_decode.h>
 
 static	struct alq *ath_hal_alq;
 static	int ath_hal_alq_emitdev;	/* need to emit DEVICE record */
diff --git a/sys/dev/netif/ath/ath_hal/ah_osdep.h b/sys/dev/netif/ath/ath_hal/ah_osdep.h
index 50778f2a16..f28fb17ea0 100644
--- a/sys/dev/netif/ath/ath_hal/ah_osdep.h
+++ b/sys/dev/netif/ath/ath_hal/ah_osdep.h
@@ -39,8 +39,6 @@
 #include <sys/endian.h>
 #include <sys/linker_set.h>
 
-#include <machine/bus.h>
-
 /*
  * Bus i/o type definitions.
  */
diff --git a/sys/dev/netif/ath/ath_hal/ah_regdomain.c b/sys/dev/netif/ath/ath_hal/ah_regdomain.c
index 807db44710..e871cd7bc8 100644
--- a/sys/dev/netif/ath/ath_hal/ah_regdomain.c
+++ b/sys/dev/netif/ath/ath_hal/ah_regdomain.c
@@ -21,8 +21,8 @@
 
 #include "ah.h"
 
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211_regdomain.h>
+#include <netproto/802_11/_ieee80211.h>
+#include <netproto/802_11/ieee80211_regdomain.h>
 
 #include "ah_internal.h"
 #include "ah_eeprom.h"
diff --git a/sys/dev/netif/ath/ath_hal/ar5416/ar5416reg.h b/sys/dev/netif/ath/ath_hal/ar5416/ar5416reg.h
index 435599ce71..2602353140 100644
--- a/sys/dev/netif/ath/ath_hal/ar5416/ar5416reg.h
+++ b/sys/dev/netif/ath/ath_hal/ar5416/ar5416reg.h
@@ -19,7 +19,7 @@
 #ifndef _DEV_ATH_AR5416REG_H
 #define	_DEV_ATH_AR5416REG_H
 
-#include <dev/ath/ath_hal/ar5212/ar5212reg.h>
+#include <dev/netif/ath/ath_hal/ar5212/ar5212reg.h>
 
 /*
  * Register added starting with the AR5416
diff --git a/sys/dev/netif/ath/ath_rate/amrr/amrr.c b/sys/dev/netif/ath/ath_rate/amrr/amrr.c
index a6484599e3..1c3f342f4c 100644
--- a/sys/dev/netif/ath/ath_rate/amrr/amrr.c
+++ b/sys/dev/netif/ath/ath_rate/amrr/amrr.c
@@ -55,18 +55,14 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -75,9 +71,11 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/amrr/amrr.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/amrr/amrr.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
 
 static	int ath_rateinterval = 1000;		/* rate ctl interval (ms)  */
 static	int ath_rate_max_success_threshold = 10;
diff --git a/sys/dev/netif/ath/ath_rate/onoe/onoe.c b/sys/dev/netif/ath/ath_rate/onoe/onoe.c
index 8022cabb24..2dd0556491 100644
--- a/sys/dev/netif/ath/ath_rate/onoe/onoe.c
+++ b/sys/dev/netif/ath/ath_rate/onoe/onoe.c
@@ -43,11 +43,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -55,7 +51,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -64,9 +60,11 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/onoe/onoe.h>
-#include <dev/ath/ath_hal/ah_desc.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/onoe/onoe.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
 
 /*
  * Default parameters for the rate control algorithm.  These are
diff --git a/sys/dev/netif/ath/ath_rate/sample/sample.c b/sys/dev/netif/ath/ath_rate/sample/sample.c
index a48916d905..159593b069 100644
--- a/sys/dev/netif/ath/ath_rate/sample/sample.c
+++ b/sys/dev/netif/ath/ath_rate/sample/sample.c
@@ -53,11 +53,7 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/bus.h>
-
 #include <sys/socket.h>
  
 #include <net/if.h>
@@ -66,7 +62,7 @@
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
-#include <net80211/ieee80211_var.h>
+#include <netproto/802_11/ieee80211_var.h>
 
 #include <net/bpf.h>
 
@@ -75,10 +71,12 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <dev/ath/if_athvar.h>
-#include <dev/ath/ath_rate/sample/sample.h>
-#include <dev/ath/ath_hal/ah_desc.h>
-#include <dev/ath/ath_rate/sample/tx_schedules.h>
+#include <machine/resource.h>
+
+#include <dev/netif/ath/ath/if_athvar.h>
+#include <dev/netif/ath/ath_rate/sample/sample.h>
+#include <dev/netif/ath/ath_hal/ah_desc.h>
+#include <dev/netif/ath/ath_rate/sample/tx_schedules.h>
 
 /*
  * This file is an implementation of the SampleRate algorithm