Rename rtems-bsd-config.h

Rename rtems-bsd-config.h in rtems-bsd-kernel-space.h.

55 files changed, 67 insertions, 67 deletions

diff --git a/rtemsbsd/include/machine/atomic.h b/rtemsbsd/include/machine/atomic.h
index 3ab06579..20ca8e29 100644
--- a/rtemsbsd/include/machine/atomic.h
+++ b/rtemsbsd/include/machine/atomic.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_ATOMIC_H_
 #define _RTEMS_BSD_MACHINE_ATOMIC_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #include <rtems.h>
diff --git a/rtemsbsd/include/machine/bus.h b/rtemsbsd/include/machine/bus.h
index 64616d30..01731701 100644
--- a/rtemsbsd/include/machine/bus.h
+++ b/rtemsbsd/include/machine/bus.h
@@ -118,8 +118,8 @@
 #ifndef _RTEMS_BSD_MACHINE_BUS_H_
 #define _RTEMS_BSD_MACHINE_BUS_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 /*
diff --git a/rtemsbsd/include/machine/bus_dma.h b/rtemsbsd/include/machine/bus_dma.h
index d4a1cfb8..c83b1580 100644
--- a/rtemsbsd/include/machine/bus_dma.h
+++ b/rtemsbsd/include/machine/bus_dma.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_BUS_DMA_H_
 #define _RTEMS_BSD_MACHINE_BUS_DMA_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #include <sys/bus_dma.h>
diff --git a/rtemsbsd/include/machine/clock.h b/rtemsbsd/include/machine/clock.h
index 9f40d413..be73d490 100644
--- a/rtemsbsd/include/machine/clock.h
+++ b/rtemsbsd/include/machine/clock.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_CLOCK_H_
 #define _RTEMS_BSD_MACHINE_CLOCK_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #ifdef _KERNEL
diff --git a/rtemsbsd/include/machine/cpu.h b/rtemsbsd/include/machine/cpu.h
index 7ac6e33d..32881325 100644
--- a/rtemsbsd/include/machine/cpu.h
+++ b/rtemsbsd/include/machine/cpu.h
@@ -18,8 +18,8 @@
 #ifndef _RTEMS_BSD_MACHINE_CPU_H_
 #define _RTEMS_BSD_MACHINE_CPU_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #define cpu_spinwait() do { } while (0)
diff --git a/rtemsbsd/include/machine/proc.h b/rtemsbsd/include/machine/proc.h
index 6873e087..6f27bd54 100644
--- a/rtemsbsd/include/machine/proc.h
+++ b/rtemsbsd/include/machine/proc.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_PROC_H_
 #define _RTEMS_BSD_MACHINE_PROC_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 struct mdthread {
diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
index 066bcdfb..906613f1 100644
--- a/rtemsbsd/include/machine/rtems-bsd-config.h.in
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in
@@ -37,8 +37,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#define _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#define _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
 
 /* FIXME: Update Newlib */
 #define MSIZE 256
@@ -80,4 +80,4 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c
 
 #define BSD_DEFAULT_PRISON (&prison0)
 
-#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ */
+#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ */
diff --git a/rtemsbsd/include/machine/runq.h b/rtemsbsd/include/machine/runq.h
index affc070d..98a51a47 100644
--- a/rtemsbsd/include/machine/runq.h
+++ b/rtemsbsd/include/machine/runq.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_RUNQ_H_
 #define _RTEMS_BSD_MACHINE_RUNQ_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #define RQB_LEN 0
diff --git a/rtemsbsd/include/machine/signal.h b/rtemsbsd/include/machine/signal.h
index 0e71cabb..6d3f3927 100644
--- a/rtemsbsd/include/machine/signal.h
+++ b/rtemsbsd/include/machine/signal.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_SIGNAL_H_
 #define _RTEMS_BSD_MACHINE_SIGNAL_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #endif /* _RTEMS_BSD_MACHINE_SIGNAL_H_ */
diff --git a/rtemsbsd/include/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h
index 7535272e..ad7f2eff 100644
--- a/rtemsbsd/include/machine/stdarg.h
+++ b/rtemsbsd/include/machine/stdarg.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_STDARG_H_
 #define _RTEMS_BSD_MACHINE_STDARG_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 #endif /* _RTEMS_BSD_MACHINE_STDARG_H_ */
diff --git a/rtemsbsd/include/machine/ucontext.h b/rtemsbsd/include/machine/ucontext.h
index 92d2b5d2..9845bf3e 100644
--- a/rtemsbsd/include/machine/ucontext.h
+++ b/rtemsbsd/include/machine/ucontext.h
@@ -23,8 +23,8 @@
 #ifndef _RTEMS_BSD_MACHINE_UCONTEXT_H_
 #define _RTEMS_BSD_MACHINE_UCONTEXT_H_
 
-#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_
-#error "the header file <freebsd/machine/rtems-bsd-config.h> must be included first"
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_
+#error "the header file <machine/rtems-bsd-kernel-space.h> must be included first"
 #endif
 
 typedef int mcontext_t;
diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
index f758bf4d..31259ce6 100644
--- a/rtemsbsd/local/bus_if.c
+++ b/rtemsbsd/local/bus_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/cryptodev_if.c b/rtemsbsd/local/cryptodev_if.c
index 6b252130..9b948816 100644
--- a/rtemsbsd/local/cryptodev_if.c
+++ b/rtemsbsd/local/cryptodev_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/device_if.c b/rtemsbsd/local/device_if.c
index 3bdedbc5..1c04d55d 100644
--- a/rtemsbsd/local/device_if.c
+++ b/rtemsbsd/local/device_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/miibus_if.c b/rtemsbsd/local/miibus_if.c
index 6fbdd911..433e7a67 100644
--- a/rtemsbsd/local/miibus_if.c
+++ b/rtemsbsd/local/miibus_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/pci_if.c b/rtemsbsd/local/pci_if.c
index fddebdca..7531ee15 100644
--- a/rtemsbsd/local/pci_if.c
+++ b/rtemsbsd/local/pci_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/pcib_if.c b/rtemsbsd/local/pcib_if.c
index 82a5965c..cc036b4f 100644
--- a/rtemsbsd/local/pcib_if.c
+++ b/rtemsbsd/local/pcib_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/local/usb_if.c b/rtemsbsd/local/usb_if.c
index 5277e529..d88ab545 100644
--- a/rtemsbsd/local/usb_if.c
+++ b/rtemsbsd/local/usb_if.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  * This file is produced automatically.
diff --git a/rtemsbsd/rtems/rtems-bsd-assert.c b/rtemsbsd/rtems/rtems-bsd-assert.c
index 410f1026..3ebe19e7 100644
--- a/rtemsbsd/rtems/rtems-bsd-assert.c
+++ b/rtemsbsd/rtems/rtems-bsd-assert.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-autoconf.c b/rtemsbsd/rtems/rtems-bsd-autoconf.c
index 5febcbcc..ea250c05 100644
--- a/rtemsbsd/rtems/rtems-bsd-autoconf.c
+++ b/rtemsbsd/rtems/rtems-bsd-autoconf.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c b/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
index 9056b489..c435fd74 100644
--- a/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
+++ b/rtemsbsd/rtems/rtems-bsd-bus-dma-mbuf.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-bus-dma.h>
 
 #include <sys/mbuf.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-bus-dma.c b/rtemsbsd/rtems/rtems-bsd-bus-dma.c
index 34f46eed..1d4d120a 100644
--- a/rtemsbsd/rtems/rtems-bsd-bus-dma.c
+++ b/rtemsbsd/rtems/rtems-bsd-bus-dma.c
@@ -45,7 +45,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-cache.h>
 #include <machine/rtems-bsd-bus-dma.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-cam.c b/rtemsbsd/rtems/rtems-bsd-cam.c
index e401d24e..ab15f426 100644
--- a/rtemsbsd/rtems/rtems-bsd-cam.c
+++ b/rtemsbsd/rtems/rtems-bsd-cam.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-chunk.c b/rtemsbsd/rtems/rtems-bsd-chunk.c
index b70eedfe..2e64d87b 100644
--- a/rtemsbsd/rtems/rtems-bsd-chunk.c
+++ b/rtemsbsd/rtems/rtems-bsd-chunk.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-chunk.h>
 
 #include <sys/malloc.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-condvar.c b/rtemsbsd/rtems/rtems-bsd-condvar.c
index 924de070..a657a7d2 100644
--- a/rtemsbsd/rtems/rtems-bsd-condvar.c
+++ b/rtemsbsd/rtems/rtems-bsd-condvar.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-conf.c b/rtemsbsd/rtems/rtems-bsd-conf.c
index bb1666c2..d52ad198 100644
--- a/rtemsbsd/rtems/rtems-bsd-conf.c
+++ b/rtemsbsd/rtems/rtems-bsd-conf.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <stdio.h>
 #include <rtems.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-delay.c b/rtemsbsd/rtems/rtems-bsd-delay.c
index b8e0eb33..a698117c 100644
--- a/rtemsbsd/rtems/rtems-bsd-delay.c
+++ b/rtemsbsd/rtems/rtems-bsd-delay.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-generic.c b/rtemsbsd/rtems/rtems-bsd-generic.c
index b7d7e110..6ac02053 100644
--- a/rtemsbsd/rtems/rtems-bsd-generic.c
+++ b/rtemsbsd/rtems/rtems-bsd-generic.c
@@ -38,7 +38,7 @@
  */
 
 #include <rtems/bsd/sys/types.h> //needed for fd_mask and such
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-get-file.c b/rtemsbsd/rtems/rtems-bsd-get-file.c
index 738a62cb..6d321c30 100644
--- a/rtemsbsd/rtems/rtems-bsd-get-file.c
+++ b/rtemsbsd/rtems/rtems-bsd-get-file.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <sys/file.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-init-with-irq.c b/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
index c2966d66..0f472528 100644
--- a/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
+++ b/rtemsbsd/rtems/rtems-bsd-init-with-irq.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 
 #include <rtems/irq-extension.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-init.c b/rtemsbsd/rtems/rtems-bsd-init.c
index f970902b..613cab3d 100644
--- a/rtemsbsd/rtems/rtems-bsd-init.c
+++ b/rtemsbsd/rtems/rtems-bsd-init.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-jail.c b/rtemsbsd/rtems/rtems-bsd-jail.c
index 819d48d8..0c7ab4f9 100644
--- a/rtemsbsd/rtems/rtems-bsd-jail.c
+++ b/rtemsbsd/rtems/rtems-bsd-jail.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*#include <rtems/bsd/sys/types.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-kern_synch.c b/rtemsbsd/rtems/rtems-bsd-kern_synch.c
index 40f3280a..68bc5f9d 100644
--- a/rtemsbsd/rtems/rtems-bsd-kern_synch.c
+++ b/rtemsbsd/rtems/rtems-bsd-kern_synch.c
@@ -53,7 +53,7 @@
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 
 #include <rtems/score/statesimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-lock.c b/rtemsbsd/rtems/rtems-bsd-lock.c
index fbcc6710..9dce5811 100644
--- a/rtemsbsd/rtems/rtems-bsd-lock.c
+++ b/rtemsbsd/rtems/rtems-bsd-lock.c
@@ -40,7 +40,7 @@
 /* Necessary to obtain some internal functions */
 #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-log.c b/rtemsbsd/rtems/rtems-bsd-log.c
index fee0b1cc..4afc16b9 100644
--- a/rtemsbsd/rtems/rtems-bsd-log.c
+++ b/rtemsbsd/rtems/rtems-bsd-log.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-malloc.c b/rtemsbsd/rtems/rtems-bsd-malloc.c
index 4cf930ef..fe0d01db 100644
--- a/rtemsbsd/rtems/rtems-bsd-malloc.c
+++ b/rtemsbsd/rtems/rtems-bsd-malloc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-mutex.c b/rtemsbsd/rtems/rtems-bsd-mutex.c
index 02960f9a..0a3c7fbd 100644
--- a/rtemsbsd/rtems/rtems-bsd-mutex.c
+++ b/rtemsbsd/rtems/rtems-bsd-mutex.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 #include <machine/rtems-bsd-support.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-nexus.c b/rtemsbsd/rtems/rtems-bsd-nexus.c
index 1c2ef7a3..a23f5abe 100644
--- a/rtemsbsd/rtems/rtems-bsd-nexus.c
+++ b/rtemsbsd/rtems/rtems-bsd-nexus.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-sysinit.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-panic.c b/rtemsbsd/rtems/rtems-bsd-panic.c
index 859c34e0..9634e193 100644
--- a/rtemsbsd/rtems/rtems-bsd-panic.c
+++ b/rtemsbsd/rtems/rtems-bsd-panic.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-pci_bus.c b/rtemsbsd/rtems/rtems-bsd-pci_bus.c
index 51ae99c1..f673083b 100644
--- a/rtemsbsd/rtems/rtems-bsd-pci_bus.c
+++ b/rtemsbsd/rtems/rtems-bsd-pci_bus.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /**
  * @file
diff --git a/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c b/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
index 15c56b8b..f126c31f 100644
--- a/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
+++ b/rtemsbsd/rtems/rtems-bsd-pci_cfgreg.c
@@ -1,4 +1,4 @@
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 /**
  * @file
diff --git a/rtemsbsd/rtems/rtems-bsd-program.c b/rtemsbsd/rtems/rtems-bsd-program.c
index f6a63ff7..8edd8f93 100644
--- a/rtemsbsd/rtems/rtems-bsd-program.c
+++ b/rtemsbsd/rtems/rtems-bsd-program.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 
 #include <rtems/bsd/sys/param.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-rwlock.c b/rtemsbsd/rtems/rtems-bsd-rwlock.c
index 5817aae9..58e44392 100644
--- a/rtemsbsd/rtems/rtems-bsd-rwlock.c
+++ b/rtemsbsd/rtems/rtems-bsd-rwlock.c
@@ -45,7 +45,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 #include <machine/rtems-bsd-support.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-shell.c b/rtemsbsd/rtems/rtems-bsd-shell.c
index 014f825c..2fa1aaa3 100644
--- a/rtemsbsd/rtems/rtems-bsd-shell.c
+++ b/rtemsbsd/rtems/rtems-bsd-shell.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 #include <machine/rtems-bsd-support.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-signal.c b/rtemsbsd/rtems/rtems-bsd-signal.c
index 1d431eb6..44fa8167 100644
--- a/rtemsbsd/rtems/rtems-bsd-signal.c
+++ b/rtemsbsd/rtems/rtems-bsd-signal.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-support.c b/rtemsbsd/rtems/rtems-bsd-support.c
index c86365da..1d1baa45 100644
--- a/rtemsbsd/rtems/rtems-bsd-support.c
+++ b/rtemsbsd/rtems/rtems-bsd-support.c
@@ -39,7 +39,7 @@
 
 /* FIXME: This file needs careful review. */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems/score/threaddispatch.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-sx.c b/rtemsbsd/rtems/rtems-bsd-sx.c
index f847cfb8..948297f9 100644
--- a/rtemsbsd/rtems/rtems-bsd-sx.c
+++ b/rtemsbsd/rtems/rtems-bsd-sx.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctl.c b/rtemsbsd/rtems/rtems-bsd-sysctl.c
index c97ef07f..f9ecab81 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctl.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-syscall-api.h>
 
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c b/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
index 37a4f8df..ced85f7c 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctlbyname.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-syscall-api.h>
 
 #include <sys/cdefs.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c b/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
index 496cafae..62ce6b80 100644
--- a/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
+++ b/rtemsbsd/rtems/rtems-bsd-sysctlnametomib.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-syscall-api.h>
 
 #include <sys/cdefs.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-thread.c b/rtemsbsd/rtems/rtems-bsd-thread.c
index 0d893a32..8cb09d7e 100644
--- a/rtemsbsd/rtems/rtems-bsd-thread.c
+++ b/rtemsbsd/rtems/rtems-bsd-thread.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 #include <machine/rtems-bsd-thread.h>
 #include <machine/rtems-bsd-support.h>
 
diff --git a/rtemsbsd/rtems/rtems-bsd-timesupport.c b/rtemsbsd/rtems/rtems-bsd-timesupport.c
index 7090dfcf..a7eedee1 100644
--- a/rtemsbsd/rtems/rtems-bsd-timesupport.c
+++ b/rtemsbsd/rtems/rtems-bsd-timesupport.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <sys/time.h>
 
diff --git a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
index b9bc7244..b7e3188e 100644
--- a/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c
@@ -12,7 +12,7 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
index 72077906..bfb3c8c7 100644
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc24xx.c
@@ -12,7 +12,7 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 
diff --git a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
index ee3a0ebf..264f9619 100644
--- a/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
+++ b/rtemsbsd/sys/dev/usb/controller/ohci_lpc32xx.c
@@ -12,7 +12,7 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>