18 files changed, 22 insertions, 22 deletions

diff --git a/sys/dev/hfa/hfa_sbus.c b/sys/dev/hfa/hfa_sbus.c
index c882111d5effa..3e769d2215aea 100644
--- a/sys/dev/hfa/hfa_sbus.c
+++ b/sys/dev/hfa/hfa_sbus.c
@@ -73,7 +73,7 @@
 
 #include <sys/rman.h> 
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <sparc64/sbus/sbusreg.h>
 #include <sparc64/sbus/sbusvar.h>
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 782c41ffb13aa..8acba124609ca 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -55,7 +55,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 47bb9ef0f1239..30b022501ba25 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -37,7 +37,7 @@
 #include <machine/ofw_machdep.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/sbus/sbusvar.h>
 
 #include <dev/isp/isp_freebsd.h>
diff --git a/sys/dev/sab/sab.c b/sys/dev/sab/sab.c
index 8989a2fda1b88..fbdc5b7bd8424 100644
--- a/sys/dev/sab/sab.c
+++ b/sys/dev/sab/sab.c
@@ -63,7 +63,7 @@
 
 #include <ddb/ddb.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/ebus/ebusvar.h>
 
 #include <dev/sab/sab82532reg.h>
diff --git a/sys/dev/sio/sio_ebus.c b/sys/dev/sio/sio_ebus.c
index 2a389387b998d..54f1c9361c326 100644
--- a/sys/dev/sio/sio_ebus.c
+++ b/sys/dev/sio/sio_ebus.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/sio/siovar.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <sparc64/ebus/ebusvar.h>
 
 int	sio_ofw_inlist(char *name, char *list[]);
diff --git a/sys/dev/zs/zs_macio.c b/sys/dev/zs/zs_macio.c
index 367c563f63937..21746cdd045af 100644
--- a/sys/dev/zs/zs_macio.c
+++ b/sys/dev/zs/zs_macio.c
@@ -35,7 +35,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 #include <powerpc/powermac/maciovar.h>
 
 #include <dev/zs/z8530reg.h>
diff --git a/sys/dev/zs/zs_sbus.c b/sys/dev/zs/zs_sbus.c
index a1b266637fb66..f76d59a3f9b0c 100644
--- a/sys/dev/zs/zs_sbus.c
+++ b/sys/dev/zs/zs_sbus.c
@@ -36,7 +36,7 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <sparc64/fhc/fhcreg.h>
 #include <sparc64/fhc/fhcvar.h>
diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 3ed6bbdcdbb20..247a4d3c0113c 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -56,8 +56,8 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/ofw_bus.h>
diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c
index 1ec1f90ff8fb2..502e9b1aed72e 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -49,8 +49,8 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <ofw/ofw_pci.h>
-#include <ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/intr_machdep.h>
 #include <machine/ofw_bus.h>
diff --git a/sys/sparc64/isa/ofw_isa.c b/sys/sparc64/isa/ofw_isa.c
index 986220d4b7a10..b5e746c22c9aa 100644
--- a/sys/sparc64/isa/ofw_isa.c
+++ b/sys/sparc64/isa/ofw_isa.c
@@ -41,8 +41,8 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 773ce7c2da5ad..2752ca47985b9 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -46,8 +46,8 @@
 #include <sys/malloc.h>
 #include <sys/pcpu.h>
 
-#include <ofw/openfirm.h>
-#include <ofw/ofw_pci.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_pci.h>
 
 #include <machine/bus.h>
 #include <machine/bus_private.h>
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 028933e2d69fb..3d4e110faee20 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -114,7 +114,7 @@
 #include <sys/pcpu.h>
 #include <sys/reboot.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
 #include <machine/bus_private.h>
diff --git a/sys/sparc64/sparc64/eeprom.c b/sys/sparc64/sparc64/eeprom.c
index 523dfbd81829e..83db53dcc3342 100644
--- a/sys/sparc64/sparc64/eeprom.c
+++ b/sys/sparc64/sparc64/eeprom.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_ebus.c b/sys/sparc64/sparc64/eeprom_ebus.c
index 237cf2f271654..211878fc2dab3 100644
--- a/sys/sparc64/sparc64/eeprom_ebus.c
+++ b/sys/sparc64/sparc64/eeprom_ebus.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_fhc.c b/sys/sparc64/sparc64/eeprom_fhc.c
index 2dffc9f9c49cf..d4535a1e5e615 100644
--- a/sys/sparc64/sparc64/eeprom_fhc.c
+++ b/sys/sparc64/sparc64/eeprom_fhc.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/eeprom_sbus.c b/sys/sparc64/sparc64/eeprom_sbus.c
index e98c43b75aac9..49116394d95cb 100644
--- a/sys/sparc64/sparc64/eeprom_sbus.c
+++ b/sys/sparc64/sparc64/eeprom_sbus.c
@@ -67,7 +67,7 @@
 
 #include <sys/rman.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/eeprom.h>
 
diff --git a/sys/sparc64/sparc64/ofw_bus.c b/sys/sparc64/sparc64/ofw_bus.c
index 359da41810628..6c894b6a4f151 100644
--- a/sys/sparc64/sparc64/ofw_bus.c
+++ b/sys/sparc64/sparc64/ofw_bus.c
@@ -70,7 +70,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/ofw_bus.h>
 
diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 13be00511b1d1..9cd4c02e73d31 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.c
@@ -34,7 +34,7 @@
 
 #include <net/ethernet.h>
 
-#include <ofw/openfirm.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/idprom.h>
 #include <machine/ofw_machdep.h>