Remove superfluous <rtems/system.h> includes

135 files changed, 6 insertions, 142 deletions

diff --git a/bsps/arm/shared/start/bsp-start-in-hyp-support.S b/bsps/arm/shared/start/bsp-start-in-hyp-support.S
index b608c59fa8..5d3d5921c5 100644
--- a/bsps/arm/shared/start/bsp-start-in-hyp-support.S
+++ b/bsps/arm/shared/start/bsp-start-in-hyp-support.S
@@ -18,7 +18,6 @@
  */
 
 #include <rtems/asm.h>
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 
 #include <bspopts.h>
diff --git a/bsps/arm/shared/start/bsp-start-memcpy.S b/bsps/arm/shared/start/bsp-start-memcpy.S
index cb97eb47f8..4d82f6fad6 100644
--- a/bsps/arm/shared/start/bsp-start-memcpy.S
+++ b/bsps/arm/shared/start/bsp-start-memcpy.S
@@ -19,7 +19,6 @@
  */
 
 #include <rtems/asm.h>
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 
 	.section	".bsp_start_text", "ax"
diff --git a/bsps/i386/shared/irq/irq_asm.S b/bsps/i386/shared/irq/irq_asm.S
index 181293351e..2d65a79fe2 100644
--- a/bsps/i386/shared/irq/irq_asm.S
+++ b/bsps/i386/shared/irq/irq_asm.S
@@ -14,7 +14,6 @@
  */
 
 #include <rtems/asm.h>
-#include <rtems/system.h>
 #include <bspopts.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/percpu.h>
diff --git a/bsps/m68k/csb360/start/idle-mcf5272.c b/bsps/m68k/csb360/start/idle-mcf5272.c
index c645b288b8..651b212539 100644
--- a/bsps/m68k/csb360/start/idle-mcf5272.c
+++ b/bsps/m68k/csb360/start/idle-mcf5272.c
@@ -15,7 +15,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <rtems/score/thread.h>
 
 void *_CPU_Thread_Idle_body( uintptr_t ignored )
diff --git a/bsps/m68k/shared/fpsp/rtems_fpsp.c b/bsps/m68k/shared/fpsp/rtems_fpsp.c
index 558dc044da..1758d918f3 100644
--- a/bsps/m68k/shared/fpsp/rtems_fpsp.c
+++ b/bsps/m68k/shared/fpsp/rtems_fpsp.c
@@ -1,7 +1,4 @@
-#include <rtems/system.h>
-/*
-#include <rtems/score/isr.h>
-*/
+#include <rtems/score/cpu.h>
 
 /*
  * User exception handlers
diff --git a/bsps/m68k/shared/m68kidle.c b/bsps/m68k/shared/m68kidle.c
index f43651f49e..474437e3e7 100644
--- a/bsps/m68k/shared/m68kidle.c
+++ b/bsps/m68k/shared/m68kidle.c
@@ -15,7 +15,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <rtems/score/thread.h>
 
 void *_CPU_Thread_Idle_body( uintptr_t ignored )
diff --git a/bsps/powerpc/beatnik/start/bspstart.c b/bsps/powerpc/beatnik/start/bspstart.c
index 4c1bb0e16f..1ddb457e05 100644
--- a/bsps/powerpc/beatnik/start/bspstart.c
+++ b/bsps/powerpc/beatnik/start/bspstart.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <rtems/system.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>
 #include <rtems/bspIo.h>
diff --git a/bsps/powerpc/include/libcpu/powerpc-utility.h b/bsps/powerpc/include/libcpu/powerpc-utility.h
index f833c0e850..60cfe85f60 100644
--- a/bsps/powerpc/include/libcpu/powerpc-utility.h
+++ b/bsps/powerpc/include/libcpu/powerpc-utility.h
@@ -52,7 +52,6 @@ extern "C" {
 #if !defined(ASM)
 
 #include <rtems/bspIo.h>
-#include <rtems/system.h>
 
 #include <libcpu/cpuIdent.h>
 
diff --git a/bsps/powerpc/motorola_powerpc/bootloader/misc.c b/bsps/powerpc/motorola_powerpc/bootloader/misc.c
index 0b8e42c83a..587bcffcff 100644
--- a/bsps/powerpc/motorola_powerpc/bootloader/misc.c
+++ b/bsps/powerpc/motorola_powerpc/bootloader/misc.c
@@ -13,7 +13,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <string.h>
diff --git a/bsps/powerpc/motorola_powerpc/console/polled_io.c b/bsps/powerpc/motorola_powerpc/console/polled_io.c
index db4dc8a044..ada6083b17 100644
--- a/bsps/powerpc/motorola_powerpc/console/polled_io.c
+++ b/bsps/powerpc/motorola_powerpc/console/polled_io.c
@@ -13,7 +13,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <libcpu/byteorder.h>
diff --git a/bsps/powerpc/mvme5500/irq/BSP_irq.c b/bsps/powerpc/mvme5500/irq/BSP_irq.c
index eb36cc2a80..5f677e2b6d 100644
--- a/bsps/powerpc/mvme5500/irq/BSP_irq.c
+++ b/bsps/powerpc/mvme5500/irq/BSP_irq.c
@@ -29,7 +29,6 @@
 
 #include <inttypes.h>
 #include <stdio.h>
-#include <rtems/system.h>
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <rtems/score/thread.h>
diff --git a/bsps/powerpc/mvme5500/start/bspstart.c b/bsps/powerpc/mvme5500/start/bspstart.c
index c79239e3c9..06a12d815f 100644
--- a/bsps/powerpc/mvme5500/start/bspstart.c
+++ b/bsps/powerpc/mvme5500/start/bspstart.c
@@ -26,7 +26,6 @@
 #include <ctype.h>
 
 #include <rtems/sysinit.h>
-#include <rtems/system.h>
 #include <rtems/powerpc/powerpc.h>
 
 #include <libcpu/spr.h>   /* registers.h is included here */
diff --git a/bsps/powerpc/shared/btimer/btimer-ppc-dec.c b/bsps/powerpc/shared/btimer/btimer-ppc-dec.c
index d161710732..1e65d49c6e 100644
--- a/bsps/powerpc/shared/btimer/btimer-ppc-dec.c
+++ b/bsps/powerpc/shared/btimer/btimer-ppc-dec.c
@@ -16,7 +16,6 @@
 
 #include <bsp.h>
 #include <rtems.h>
-#include <rtems/system.h>
 #include <rtems/btimer.h>
 #include <assert.h>
 #include <libcpu/powerpc-utility.h>
diff --git a/bsps/powerpc/shared/cpu.c b/bsps/powerpc/shared/cpu.c
index 7c37f0e0d8..a06b8c0868 100644
--- a/bsps/powerpc/shared/cpu.c
+++ b/bsps/powerpc/shared/cpu.c
@@ -30,7 +30,6 @@
 
 #include <string.h>
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/context.h>
 #include <rtems/score/thread.h>
diff --git a/bsps/powerpc/shared/exceptions/ppc_exc.S b/bsps/powerpc/shared/exceptions/ppc_exc.S
index c606c0da30..9ffb2ccca7 100644
--- a/bsps/powerpc/shared/exceptions/ppc_exc.S
+++ b/bsps/powerpc/shared/exceptions/ppc_exc.S
@@ -14,7 +14,6 @@
 
 /* Load macro definitions */
 #include <rtems/asm.h>
-#include <rtems/system.h>
 #include <rtems/score/percpu.h>
 
 /*
diff --git a/bsps/powerpc/virtex/include/bsp/opbintctrl.h b/bsps/powerpc/virtex/include/bsp/opbintctrl.h
index 4ade0e48f8..67b7f77c6e 100644
--- a/bsps/powerpc/virtex/include/bsp/opbintctrl.h
+++ b/bsps/powerpc/virtex/include/bsp/opbintctrl.h
@@ -15,7 +15,6 @@
 #define _INCLUDE_OPBINTCTRL_H
 
 #include <rtems.h>
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/irq.h>
 #include <bspopts.h>
diff --git a/bsps/sh/gensh1/start/cpu_asm.c b/bsps/sh/gensh1/start/cpu_asm.c
index 2556623c47..bd98602ee7 100644
--- a/bsps/sh/gensh1/start/cpu_asm.c
+++ b/bsps/sh/gensh1/start/cpu_asm.c
@@ -30,7 +30,6 @@
  *  implementation in assembly should include "cpu_asm.h"
  */
 
-#include <rtems/system.h>
 #include <rtems/score/percpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/bsps/sh/gensh2/start/cpu_asm.c b/bsps/sh/gensh2/start/cpu_asm.c
index 479b771d73..d483e2f065 100644
--- a/bsps/sh/gensh2/start/cpu_asm.c
+++ b/bsps/sh/gensh2/start/cpu_asm.c
@@ -29,7 +29,6 @@
  *  implementation in assembly should include "cpu_asm.h"
  */
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/bsps/sh/gensh4/start/cpu_asm.c b/bsps/sh/gensh4/start/cpu_asm.c
index 6b530fe8b7..a2738532ab 100644
--- a/bsps/sh/gensh4/start/cpu_asm.c
+++ b/bsps/sh/gensh4/start/cpu_asm.c
@@ -29,7 +29,6 @@
  *  implementation in assembly should include "cpu_asm.h"
  */
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/bsps/sh/gensh4/start/ispsh7750.c b/bsps/sh/gensh4/start/ispsh7750.c
index 5a1282f583..edce9569fc 100644
--- a/bsps/sh/gensh4/start/ispsh7750.c
+++ b/bsps/sh/gensh4/start/ispsh7750.c
@@ -35,7 +35,6 @@
  *	by the authors or by TGA Technologies.
  */
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 
 /*
diff --git a/bsps/sh/shsim/start/cpu_asm.c b/bsps/sh/shsim/start/cpu_asm.c
index 1b8135ee0a..db5171b17a 100644
--- a/bsps/sh/shsim/start/cpu_asm.c
+++ b/bsps/sh/shsim/start/cpu_asm.c
@@ -11,7 +11,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/percpu.h>
diff --git a/cpukit/include/rtems/posix/aio_misc.h b/cpukit/include/rtems/posix/aio_misc.h
index aeccbad98f..059753ef58 100644
--- a/cpukit/include/rtems/posix/aio_misc.h
+++ b/cpukit/include/rtems/posix/aio_misc.h
@@ -23,7 +23,6 @@
 #include <pthread.h>
 #include <rtems.h>
 #include <rtems/chain.h>
-#include <rtems/system.h>
 #include <rtems/seterr.h>
   
 #ifdef __cplusplus
diff --git a/cpukit/include/rtems/score/interr.h b/cpukit/include/rtems/score/interr.h
index a0ad7a5e36..16f3907b05 100644
--- a/cpukit/include/rtems/score/interr.h
+++ b/cpukit/include/rtems/score/interr.h
@@ -19,10 +19,7 @@
 #ifndef _RTEMS_SCORE_INTERR_H
 #define _RTEMS_SCORE_INTERR_H
 
-#include <stdbool.h>
-#include <stdint.h>
-
-#include <rtems/system.h>
+#include <rtems/score/cpu.h>
 
 /**
  *  @defgroup ScoreIntErr Internal Error Handler
diff --git a/cpukit/libcsupport/src/getegid.c b/cpukit/libcsupport/src/getegid.c
index 86f514eb8f..f224617d8b 100644
--- a/cpukit/libcsupport/src/getegid.c
+++ b/cpukit/libcsupport/src/getegid.c
@@ -11,7 +11,6 @@
 
 #include <unistd.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/userenv.h>
 
diff --git a/cpukit/libcsupport/src/geteuid.c b/cpukit/libcsupport/src/geteuid.c
index 85f2d575da..d71df9a18b 100644
--- a/cpukit/libcsupport/src/geteuid.c
+++ b/cpukit/libcsupport/src/geteuid.c
@@ -11,7 +11,6 @@
 
 #include <unistd.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 #include <rtems/userenv.h>
diff --git a/cpukit/libcsupport/src/getlogin.c b/cpukit/libcsupport/src/getlogin.c
index 1ec8285292..6fce31fa8b 100644
--- a/cpukit/libcsupport/src/getlogin.c
+++ b/cpukit/libcsupport/src/getlogin.c
@@ -14,7 +14,6 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/userenv.h>
 
diff --git a/cpukit/libcsupport/src/getppid.c b/cpukit/libcsupport/src/getppid.c
index f55bf77c04..ad2e88376e 100644
--- a/cpukit/libcsupport/src/getppid.c
+++ b/cpukit/libcsupport/src/getppid.c
@@ -11,7 +11,6 @@
 
 #include <unistd.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 pid_t _POSIX_types_Ppid = 0;
diff --git a/cpukit/libcsupport/src/setegid.c b/cpukit/libcsupport/src/setegid.c
index aa0a921b69..8975c137ec 100644
--- a/cpukit/libcsupport/src/setegid.c
+++ b/cpukit/libcsupport/src/setegid.c
@@ -20,7 +20,6 @@
 
 #include <unistd.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/userenv.h>
 
diff --git a/cpukit/libgnat/adasupp.c b/cpukit/libgnat/adasupp.c
index 662b1ccf7e..b8f3484f6b 100644
--- a/cpukit/libgnat/adasupp.c
+++ b/cpukit/libgnat/adasupp.c
@@ -5,7 +5,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/score/stackimpl.h>
diff --git a/cpukit/libmisc/shell/main_help.c b/cpukit/libmisc/shell/main_help.c
index e45e7f8791..611f2e0a62 100644
--- a/cpukit/libmisc/shell/main_help.c
+++ b/cpukit/libmisc/shell/main_help.c
@@ -17,7 +17,6 @@
 
 #include <rtems.h>
 #include <rtems/error.h>
-#include <rtems/system.h>
 #include <rtems/shell.h>
 
 #include "internal.h"
diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c
index d1fc9c65df..812a0b02bf 100644
--- a/cpukit/libmisc/shell/shell.c
+++ b/cpukit/libmisc/shell/shell.c
@@ -23,7 +23,6 @@
 #include <rtems/error.h>
 #include <rtems/libio.h>
 #include <rtems/libio_.h>
-#include <rtems/system.h>
 #include <rtems/shell.h>
 #include <rtems/shellconfig.h>
 #include <rtems/console.h>
diff --git a/cpukit/libmisc/shell/shell_getchar.c b/cpukit/libmisc/shell/shell_getchar.c
index 253b1a66c7..6b4de22f10 100644
--- a/cpukit/libmisc/shell/shell_getchar.c
+++ b/cpukit/libmisc/shell/shell_getchar.c
@@ -20,7 +20,6 @@
 
 #include <rtems.h>
 #include <rtems/error.h>
-#include <rtems/system.h>
 #include <rtems/shell.h>
 #include <rtems/shellconfig.h>
 #include "internal.h"
diff --git a/cpukit/libmisc/shell/shell_getprompt.c b/cpukit/libmisc/shell/shell_getprompt.c
index 51777f78c0..d496478e39 100644
--- a/cpukit/libmisc/shell/shell_getprompt.c
+++ b/cpukit/libmisc/shell/shell_getprompt.c
@@ -17,7 +17,6 @@
 #include <rtems/error.h>
 #include <rtems/libio.h>
 #include <rtems/libio_.h>
-#include <rtems/system.h>
 #include <rtems/shell.h>
 #include "internal.h"
 
diff --git a/cpukit/posix/src/aio_cancel.c b/cpukit/posix/src/aio_cancel.c
index cf84055c8e..2b6a2125d6 100644
--- a/cpukit/posix/src/aio_cancel.c
+++ b/cpukit/posix/src/aio_cancel.c
@@ -21,7 +21,6 @@
 #include <rtems/posix/aio_misc.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 int aio_cancel(int fildes, struct aiocb  *aiocbp)
diff --git a/cpukit/posix/src/aio_error.c b/cpukit/posix/src/aio_error.c
index 111c811050..4c30a8ba9c 100644
--- a/cpukit/posix/src/aio_error.c
+++ b/cpukit/posix/src/aio_error.c
@@ -20,7 +20,6 @@
 #include <aio.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 /*
diff --git a/cpukit/posix/src/aio_fsync.c b/cpukit/posix/src/aio_fsync.c
index df5432cd1c..62f516ba77 100644
--- a/cpukit/posix/src/aio_fsync.c
+++ b/cpukit/posix/src/aio_fsync.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <rtems/posix/aio_misc.h>
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 /*
diff --git a/cpukit/posix/src/aio_read.c b/cpukit/posix/src/aio_read.c
index a18345823a..a52cbdea01 100644
--- a/cpukit/posix/src/aio_read.c
+++ b/cpukit/posix/src/aio_read.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <rtems/posix/aio_misc.h>
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <stdlib.h>
 #include <limits.h>
diff --git a/cpukit/posix/src/aio_return.c b/cpukit/posix/src/aio_return.c
index 301d424897..9e733284b5 100644
--- a/cpukit/posix/src/aio_return.c
+++ b/cpukit/posix/src/aio_return.c
@@ -20,7 +20,6 @@
 #include <aio.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 /*
diff --git a/cpukit/posix/src/aio_suspend.c b/cpukit/posix/src/aio_suspend.c
index 2a3362a309..9739bac442 100644
--- a/cpukit/posix/src/aio_suspend.c
+++ b/cpukit/posix/src/aio_suspend.c
@@ -23,7 +23,7 @@
 #include <aio.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/basedefs.h>
 #include <rtems/seterr.h>
 
 int aio_suspend(
diff --git a/cpukit/posix/src/aio_write.c b/cpukit/posix/src/aio_write.c
index 6e8c8b7a5e..8e873a9ec2 100644
--- a/cpukit/posix/src/aio_write.c
+++ b/cpukit/posix/src/aio_write.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <rtems/posix/aio_misc.h>
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <stdlib.h>
 #include <limits.h>
diff --git a/cpukit/posix/src/barrierattrinit.c b/cpukit/posix/src/barrierattrinit.c
index 8a22c1bc28..5ee33436a2 100644
--- a/cpukit/posix/src/barrierattrinit.c
+++ b/cpukit/posix/src/barrierattrinit.c
@@ -21,8 +21,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
-
 int pthread_barrierattr_init(
   pthread_barrierattr_t *attr
 )
diff --git a/cpukit/posix/src/clockgetcpuclockid.c b/cpukit/posix/src/clockgetcpuclockid.c
index 51f8588e74..54f10baef6 100644
--- a/cpukit/posix/src/clockgetcpuclockid.c
+++ b/cpukit/posix/src/clockgetcpuclockid.c
@@ -21,7 +21,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
 
diff --git a/cpukit/posix/src/condattrgetpshared.c b/cpukit/posix/src/condattrgetpshared.c
index 92918cbcc1..d80af6eb97 100644
--- a/cpukit/posix/src/condattrgetpshared.c
+++ b/cpukit/posix/src/condattrgetpshared.c
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 
 int pthread_condattr_getpshared(
   const pthread_condattr_t *attr,
diff --git a/cpukit/posix/src/conddefaultattributes.c b/cpukit/posix/src/conddefaultattributes.c
index 7523f1a166..1aff37bd03 100644
--- a/cpukit/posix/src/conddefaultattributes.c
+++ b/cpukit/posix/src/conddefaultattributes.c
@@ -20,7 +20,6 @@
 
 #include <pthread.h>
 
-#include <rtems/system.h>
 
 /*
  *  The default condition variable attributes structure.
diff --git a/cpukit/posix/src/kill.c b/cpukit/posix/src/kill.c
index ee2c1b02d1..cc54c2203e 100644
--- a/cpukit/posix/src/kill.c
+++ b/cpukit/posix/src/kill.c
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
diff --git a/cpukit/posix/src/kill_r.c b/cpukit/posix/src/kill_r.c
index 97dcd43916..532e31ca9e 100644
--- a/cpukit/posix/src/kill_r.c
+++ b/cpukit/posix/src/kill_r.c
@@ -23,7 +23,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
diff --git a/cpukit/posix/src/lio_listio.c b/cpukit/posix/src/lio_listio.c
index fb3c3a26d1..bcbfb7dfe0 100644
--- a/cpukit/posix/src/lio_listio.c
+++ b/cpukit/posix/src/lio_listio.c
@@ -23,7 +23,7 @@
 #include <aio.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/basedefs.h>
 #include <rtems/seterr.h>
 
 int lio_listio(
diff --git a/cpukit/posix/src/mqueuesend.c b/cpukit/posix/src/mqueuesend.c
index 4843ae073d..dfb4bcffea 100644
--- a/cpukit/posix/src/mqueuesend.c
+++ b/cpukit/posix/src/mqueuesend.c
@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <mqueue.h>
 
-#include <rtems/system.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/mqueueimpl.h>
diff --git a/cpukit/posix/src/mutexattrsetprotocol.c b/cpukit/posix/src/mutexattrsetprotocol.c
index eecc04b7ce..0b272390dc 100644
--- a/cpukit/posix/src/mutexattrsetprotocol.c
+++ b/cpukit/posix/src/mutexattrsetprotocol.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <rtems/system.h>
 #include <rtems/score/coremuteximpl.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/posix/muteximpl.h>
diff --git a/cpukit/posix/src/mutexattrsetpshared.c b/cpukit/posix/src/mutexattrsetpshared.c
index bd94679b1a..412cbe48e0 100644
--- a/cpukit/posix/src/mutexattrsetpshared.c
+++ b/cpukit/posix/src/mutexattrsetpshared.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <rtems/system.h>
 #include <rtems/score/coremuteximpl.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/posix/muteximpl.h>
diff --git a/cpukit/posix/src/mutexattrsettype.c b/cpukit/posix/src/mutexattrsettype.c
index b188e463ef..a31a848ad5 100644
--- a/cpukit/posix/src/mutexattrsettype.c
+++ b/cpukit/posix/src/mutexattrsettype.c
@@ -21,7 +21,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <rtems/system.h>
 #include <rtems/score/coremuteximpl.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/posix/muteximpl.h>
diff --git a/cpukit/posix/src/psignalclearsignals.c b/cpukit/posix/src/psignalclearsignals.c
index 39ea41c77c..7d678ca135 100644
--- a/cpukit/posix/src/psignalclearsignals.c
+++ b/cpukit/posix/src/psignalclearsignals.c
@@ -22,7 +22,6 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/posix/src/psignalsetprocesssignals.c b/cpukit/posix/src/psignalsetprocesssignals.c
index b755c2db89..1fbe778bad 100644
--- a/cpukit/posix/src/psignalsetprocesssignals.c
+++ b/cpukit/posix/src/psignalsetprocesssignals.c
@@ -22,7 +22,6 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c
index d75e454655..46f1942e02 100644
--- a/cpukit/posix/src/psignalunblockthread.c
+++ b/cpukit/posix/src/psignalunblockthread.c
@@ -22,7 +22,6 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/threadimpl.h>
 #include <rtems/score/threadqimpl.h>
diff --git a/cpukit/posix/src/psxtimerdelete.c b/cpukit/posix/src/psxtimerdelete.c
index 7670838ac2..f84cba2ad1 100644
--- a/cpukit/posix/src/psxtimerdelete.c
+++ b/cpukit/posix/src/psxtimerdelete.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/watchdogimpl.h>
diff --git a/cpukit/posix/src/pthreadgetcpuclockid.c b/cpukit/posix/src/pthreadgetcpuclockid.c
index b7d9734e6f..cd7814b1a6 100644
--- a/cpukit/posix/src/pthreadgetcpuclockid.c
+++ b/cpukit/posix/src/pthreadgetcpuclockid.c
@@ -23,7 +23,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 
 int pthread_getcpuclockid(
diff --git a/cpukit/posix/src/pthreadinitthreads.c b/cpukit/posix/src/pthreadinitthreads.c
index 97ae5df70a..89163f43ab 100644
--- a/cpukit/posix/src/pthreadinitthreads.c
+++ b/cpukit/posix/src/pthreadinitthreads.c
@@ -22,7 +22,6 @@
 #include <pthread.h>
 #include <limits.h>
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/score/stack.h>
 #include <rtems/score/thread.h>
diff --git a/cpukit/posix/src/pthreadsigmask.c b/cpukit/posix/src/pthreadsigmask.c
index 908ffd010f..1681761cf7 100644
--- a/cpukit/posix/src/pthreadsigmask.c
+++ b/cpukit/posix/src/pthreadsigmask.c
@@ -26,7 +26,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
diff --git a/cpukit/posix/src/rwlockattrinit.c b/cpukit/posix/src/rwlockattrinit.c
index 65f8b2fd71..d3e6e65ca3 100644
--- a/cpukit/posix/src/rwlockattrinit.c
+++ b/cpukit/posix/src/rwlockattrinit.c
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 
 /*
  *  RWLock Attributes Initialization
diff --git a/cpukit/posix/src/sched_getparam.c b/cpukit/posix/src/sched_getparam.c
index 318f5b9c55..4817745ad2 100644
--- a/cpukit/posix/src/sched_getparam.c
+++ b/cpukit/posix/src/sched_getparam.c
@@ -21,7 +21,7 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <rtems/system.h>
+#include <rtems/score/basedefs.h>
 #include <rtems/seterr.h>
 
 /**
diff --git a/cpukit/posix/src/sched_getprioritymin.c b/cpukit/posix/src/sched_getprioritymin.c
index 422779218f..7b89534056 100644
--- a/cpukit/posix/src/sched_getprioritymin.c
+++ b/cpukit/posix/src/sched_getprioritymin.c
@@ -21,7 +21,6 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/priorityimpl.h>
 
diff --git a/cpukit/posix/src/sched_getscheduler.c b/cpukit/posix/src/sched_getscheduler.c
index 592a42c43c..396ceb5bc2 100644
--- a/cpukit/posix/src/sched_getscheduler.c
+++ b/cpukit/posix/src/sched_getscheduler.c
@@ -23,7 +23,6 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/score/thread.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/priorityimpl.h>
diff --git a/cpukit/posix/src/sched_setparam.c b/cpukit/posix/src/sched_setparam.c
index de5c26f467..14cd87099a 100644
--- a/cpukit/posix/src/sched_setparam.c
+++ b/cpukit/posix/src/sched_setparam.c
@@ -23,7 +23,6 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/score/thread.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/priorityimpl.h>
diff --git a/cpukit/posix/src/sched_setscheduler.c b/cpukit/posix/src/sched_setscheduler.c
index 9e3b01bc26..2e0134af8d 100644
--- a/cpukit/posix/src/sched_setscheduler.c
+++ b/cpukit/posix/src/sched_setscheduler.c
@@ -21,7 +21,6 @@
 #include <sched.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/score/thread.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/priorityimpl.h>
diff --git a/cpukit/posix/src/sigaddset.c b/cpukit/posix/src/sigaddset.c
index a8f2a7789b..4a934d37fe 100644
--- a/cpukit/posix/src/sigaddset.c
+++ b/cpukit/posix/src/sigaddset.c
@@ -22,7 +22,6 @@
 
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigdelset.c b/cpukit/posix/src/sigdelset.c
index 9b239bd956..e2989a4cde 100644
--- a/cpukit/posix/src/sigdelset.c
+++ b/cpukit/posix/src/sigdelset.c
@@ -22,7 +22,6 @@
 
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigemptyset.c b/cpukit/posix/src/sigemptyset.c
index 14f6e2a2de..23d7258cf7 100644
--- a/cpukit/posix/src/sigemptyset.c
+++ b/cpukit/posix/src/sigemptyset.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigfillset.c b/cpukit/posix/src/sigfillset.c
index 0652041805..45d6d5355e 100644
--- a/cpukit/posix/src/sigfillset.c
+++ b/cpukit/posix/src/sigfillset.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigismember.c b/cpukit/posix/src/sigismember.c
index 12a1dcc2b4..413b8b880a 100644
--- a/cpukit/posix/src/sigismember.c
+++ b/cpukit/posix/src/sigismember.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/sigset.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigpending.c b/cpukit/posix/src/sigpending.c
index 67a5c667ce..cf25cf8357 100644
--- a/cpukit/posix/src/sigpending.c
+++ b/cpukit/posix/src/sigpending.c
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
diff --git a/cpukit/posix/src/sigqueue.c b/cpukit/posix/src/sigqueue.c
index 56292bfd48..c97f50b481 100644
--- a/cpukit/posix/src/sigqueue.c
+++ b/cpukit/posix/src/sigqueue.c
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
diff --git a/cpukit/posix/src/timergetoverrun.c b/cpukit/posix/src/timergetoverrun.c
index 0a7b9fafa6..263aad83b1 100644
--- a/cpukit/posix/src/timergetoverrun.c
+++ b/cpukit/posix/src/timergetoverrun.c
@@ -21,7 +21,6 @@
 #include <time.h>
 #include <errno.h>
 
-#include <rtems/system.h>
 #include <rtems/seterr.h>
 #include <rtems/score/thread.h>
 #include <rtems/posix/timerimpl.h>
diff --git a/cpukit/rtems/src/barrierident.c b/cpukit/rtems/src/barrierident.c
index ccb264a5b6..8ba8c56f24 100644
--- a/cpukit/rtems/src/barrierident.c
+++ b/cpukit/rtems/src/barrierident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/options.h>
diff --git a/cpukit/rtems/src/dpmemident.c b/cpukit/rtems/src/dpmemident.c
index c6e64e192d..852a4a482c 100644
--- a/cpukit/rtems/src/dpmemident.c
+++ b/cpukit/rtems/src/dpmemident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/address.h>
diff --git a/cpukit/rtems/src/intrbody.c b/cpukit/rtems/src/intrbody.c
index 1fabd4cdd8..9d5980ee21 100644
--- a/cpukit/rtems/src/intrbody.c
+++ b/cpukit/rtems/src/intrbody.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/score/isr.h>
 #include <rtems/rtems/intr.h>
diff --git a/cpukit/rtems/src/modes.c b/cpukit/rtems/src/modes.c
index 198ce29329..5c926d92d6 100644
--- a/cpukit/rtems/src/modes.c
+++ b/cpukit/rtems/src/modes.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/score/stack.h>
 #include <rtems/rtems/modes.h>
diff --git a/cpukit/rtems/src/msgqident.c b/cpukit/rtems/src/msgqident.c
index 0d7439c469..89496deca5 100644
--- a/cpukit/rtems/src/msgqident.c
+++ b/cpukit/rtems/src/msgqident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/chain.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/rtems/src/partident.c b/cpukit/rtems/src/partident.c
index f18360b6b9..c5ea86dbce 100644
--- a/cpukit/rtems/src/partident.c
+++ b/cpukit/rtems/src/partident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/address.h>
diff --git a/cpukit/rtems/src/ratemonident.c b/cpukit/rtems/src/ratemonident.c
index a6d3e1a7f9..58989e2ae2 100644
--- a/cpukit/rtems/src/ratemonident.c
+++ b/cpukit/rtems/src/ratemonident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/rtems/src/regionident.c b/cpukit/rtems/src/regionident.c
index 70678a5a9e..9b6f57f213 100644
--- a/cpukit/rtems/src/regionident.c
+++ b/cpukit/rtems/src/regionident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/options.h>
diff --git a/cpukit/rtems/src/rtclock.c b/cpukit/rtems/src/rtclock.c
index 22bb9858dc..d9e7155f0e 100644
--- a/cpukit/rtems/src/rtclock.c
+++ b/cpukit/rtems/src/rtclock.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/clock.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/rtems/src/rtemsbuildname.c b/cpukit/rtems/src/rtemsbuildname.c
index 7ff27a624c..a442b68bc9 100644
--- a/cpukit/rtems/src/rtemsbuildname.c
+++ b/cpukit/rtems/src/rtemsbuildname.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/types.h>
 
 /*
diff --git a/cpukit/rtems/src/taskident.c b/cpukit/rtems/src/taskident.c
index 421c82789e..0f826b82b5 100644
--- a/cpukit/rtems/src/taskident.c
+++ b/cpukit/rtems/src/taskident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/modes.h>
diff --git a/cpukit/rtems/src/taskinitusers.c b/cpukit/rtems/src/taskinitusers.c
index c14d95d756..f72428d77c 100644
--- a/cpukit/rtems/src/taskinitusers.c
+++ b/cpukit/rtems/src/taskinitusers.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
diff --git a/cpukit/rtems/src/taskself.c b/cpukit/rtems/src/taskself.c
index 69b0967674..c699ee23ba 100644
--- a/cpukit/rtems/src/taskself.c
+++ b/cpukit/rtems/src/taskself.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/tasksimpl.h>
 
 rtems_id rtems_task_self(void)
diff --git a/cpukit/rtems/src/timerident.c b/cpukit/rtems/src/timerident.c
index 89db1c4221..b4e4f9b39c 100644
--- a/cpukit/rtems/src/timerident.c
+++ b/cpukit/rtems/src/timerident.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/thread.h>
diff --git a/cpukit/rtems/src/workspace.c b/cpukit/rtems/src/workspace.c
index e4e576c3bf..764280a43a 100644
--- a/cpukit/rtems/src/workspace.c
+++ b/cpukit/rtems/src/workspace.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/score/protectedheap.h>
 #include <rtems/score/interr.h>
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
index 6ec5a7662e..54e44515d3 100644
--- a/cpukit/sapi/src/exinit.c
+++ b/cpukit/sapi/src/exinit.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/extensionimpl.h>
 #include <rtems/init.h>
diff --git a/cpukit/sapi/src/extensionident.c b/cpukit/sapi/src/extensionident.c
index 10c8e696af..00ef83e330 100644
--- a/cpukit/sapi/src/extensionident.c
+++ b/cpukit/sapi/src/extensionident.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/rtems/statusimpl.h>
 #include <rtems/rtems/support.h>
 #include <rtems/score/thread.h>
diff --git a/cpukit/sapi/src/fatal.c b/cpukit/sapi/src/fatal.c
index 4a0314a548..54253fc218 100644
--- a/cpukit/sapi/src/fatal.c
+++ b/cpukit/sapi/src/fatal.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/fatal.h>
 #include <rtems/score/interr.h>
 
diff --git a/cpukit/sapi/src/getversionstring.c b/cpukit/sapi/src/getversionstring.c
index 7c57f5c78a..ced3103640 100644
--- a/cpukit/sapi/src/getversionstring.c
+++ b/cpukit/sapi/src/getversionstring.c
@@ -20,7 +20,6 @@
 #endif
 
 #include <rtems.h>
-#include <rtems/system.h>
 
 const char *rtems_get_version_string(void)
 {
diff --git a/cpukit/score/cpu/arm/arm_exc_abort.S b/cpukit/score/cpu/arm/arm_exc_abort.S
index 0f5d414c42..35f08ee84f 100644
--- a/cpukit/score/cpu/arm/arm_exc_abort.S
+++ b/cpukit/score/cpu/arm/arm_exc_abort.S
@@ -24,7 +24,6 @@
 #endif
 
 #include <rtems/asm.h>
-#include <rtems/system.h>
 
 #ifdef ARM_MULTILIB_ARCH_V4
 
diff --git a/cpukit/score/cpu/arm/armv4-exception-default.S b/cpukit/score/cpu/arm/armv4-exception-default.S
index a10de301b0..efa8d13989 100644
--- a/cpukit/score/cpu/arm/armv4-exception-default.S
+++ b/cpukit/score/cpu/arm/armv4-exception-default.S
@@ -17,7 +17,6 @@
 #endif
 
 #include <rtems/asm.h>
-#include <rtems/system.h>
 
 #ifdef ARM_MULTILIB_ARCH_V4
 
diff --git a/cpukit/score/cpu/bfin/cpu.c b/cpukit/score/cpu/bfin/cpu.c
index f658d1f353..86a3a5e436 100644
--- a/cpukit/score/cpu/bfin/cpu.c
+++ b/cpukit/score/cpu/bfin/cpu.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/score/bfin.h>
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c
index a90eb7a288..77b7a7161c 100644
--- a/cpukit/score/cpu/i386/cpu.c
+++ b/cpukit/score/cpu/i386/cpu.c
@@ -20,7 +20,6 @@
 #include <inttypes.h>
 
 #include <rtems.h>
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/idtr.h>
 #include <rtems/score/tls.h>
diff --git a/cpukit/score/cpu/lm32/cpu.c b/cpukit/score/cpu/lm32/cpu.c
index c1cbe769f6..78e870362d 100644
--- a/cpukit/score/cpu/lm32/cpu.c
+++ b/cpukit/score/cpu/lm32/cpu.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/cpu/mips/cpu.c b/cpukit/score/cpu/mips/cpu.c
index 7f48d090f9..2e45959221 100644
--- a/cpukit/score/cpu/mips/cpu.c
+++ b/cpukit/score/cpu/mips/cpu.c
@@ -50,7 +50,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/cpu/mips/include/rtems/asm.h b/cpukit/score/cpu/mips/include/rtems/asm.h
index 9c84f61990..c8db31cc17 100644
--- a/cpukit/score/cpu/mips/include/rtems/asm.h
+++ b/cpukit/score/cpu/mips/include/rtems/asm.h
@@ -37,7 +37,6 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/system.h>
 #include <rtems/score/cpuopts.h>
 #include <rtems/score/mips.h>
 
diff --git a/cpukit/score/cpu/moxie/cpu.c b/cpukit/score/cpu/moxie/cpu.c
index 9197797d25..2f4e823a97 100644
--- a/cpukit/score/cpu/moxie/cpu.c
+++ b/cpukit/score/cpu/moxie/cpu.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/cpu/nios2/nios2-iic-irq.c b/cpukit/score/cpu/nios2/nios2-iic-irq.c
index cec24fd5dc..665649f9d8 100644
--- a/cpukit/score/cpu/nios2/nios2-iic-irq.c
+++ b/cpukit/score/cpu/nios2/nios2-iic-irq.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/cpukit/score/cpu/nios2/nios2-thread-dispatch-disabled.c b/cpukit/score/cpu/nios2/nios2-thread-dispatch-disabled.c
index 106254d101..b5f7b94753 100644
--- a/cpukit/score/cpu/nios2/nios2-thread-dispatch-disabled.c
+++ b/cpukit/score/cpu/nios2/nios2-thread-dispatch-disabled.c
@@ -22,7 +22,7 @@
   #include "config.h"
 #endif
 
-#include <rtems/system.h>
+#include <rtems/score/cpu.h>
 #include <rtems/score/nios2-utility.h>
 
 #define NIOS2_ASSERT_OFFSET(field, off) \
diff --git a/cpukit/score/cpu/no_cpu/cpu.c b/cpukit/score/cpu/no_cpu/cpu.c
index 62027089b8..f22725c7c7 100644
--- a/cpukit/score/cpu/no_cpu/cpu.c
+++ b/cpukit/score/cpu/no_cpu/cpu.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/cpu/no_cpu/cpu_asm.c b/cpukit/score/cpu/no_cpu/cpu_asm.c
index a1fbf9cb16..1583cb4a40 100644
--- a/cpukit/score/cpu/no_cpu/cpu_asm.c
+++ b/cpukit/score/cpu/no_cpu/cpu_asm.c
@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 /* #include "cpu_asm.h> */
 
diff --git a/cpukit/score/cpu/or1k/cpu.c b/cpukit/score/cpu/or1k/cpu.c
index 75abb2f3f0..3d9aa749af 100644
--- a/cpukit/score/cpu/or1k/cpu.c
+++ b/cpukit/score/cpu/or1k/cpu.c
@@ -11,7 +11,6 @@
  *
  */
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/score/cpu.h>
diff --git a/cpukit/score/cpu/riscv/include/libcpu/access.h b/cpukit/score/cpu/riscv/include/libcpu/access.h
index cdf6b77122..4f2a780895 100644
--- a/cpukit/score/cpu/riscv/include/libcpu/access.h
+++ b/cpukit/score/cpu/riscv/include/libcpu/access.h
@@ -12,7 +12,6 @@
 #ifndef _LIBCPU_ACCESS_H
 #define _LIBCPU_ACCESS_H
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/sh/context.c b/cpukit/score/cpu/sh/context.c
index dfa12c32ac..1505f0217e 100644
--- a/cpukit/score/cpu/sh/context.c
+++ b/cpukit/score/cpu/sh/context.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
diff --git a/cpukit/score/cpu/sh/cpu.c b/cpukit/score/cpu/sh/cpu.c
index 9f8be46b93..c10086534b 100644
--- a/cpukit/score/cpu/sh/cpu.c
+++ b/cpukit/score/cpu/sh/cpu.c
@@ -30,7 +30,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/sh_io.h>
 #include <rtems/score/cpu.h>
diff --git a/cpukit/score/cpu/sparc/cpu.c b/cpukit/score/cpu/sparc/cpu.c
index 40f85b9c4f..9f84c28fc5 100644
--- a/cpukit/score/cpu/sparc/cpu.c
+++ b/cpukit/score/cpu/sparc/cpu.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/percpu.h>
 #include <rtems/score/tls.h>
diff --git a/cpukit/score/cpu/sparc/include/libcpu/access.h b/cpukit/score/cpu/sparc/include/libcpu/access.h
index cdf6b77122..4f2a780895 100644
--- a/cpukit/score/cpu/sparc/include/libcpu/access.h
+++ b/cpukit/score/cpu/sparc/include/libcpu/access.h
@@ -12,7 +12,6 @@
 #ifndef _LIBCPU_ACCESS_H
 #define _LIBCPU_ACCESS_H
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/sparc/include/libcpu/byteorder.h b/cpukit/score/cpu/sparc/include/libcpu/byteorder.h
index 10b4239480..6726a785f8 100644
--- a/cpukit/score/cpu/sparc/include/libcpu/byteorder.h
+++ b/cpukit/score/cpu/sparc/include/libcpu/byteorder.h
@@ -12,7 +12,6 @@
 #ifndef _LIBCPU_BYTEORDER_H
 #define _LIBCPU_BYTEORDER_H
 
-#include <rtems/system.h>
 #include <rtems/score/cpu.h>
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/sparc64/cpu.c b/cpukit/score/cpu/sparc64/cpu.c
index eb7e7348b5..2d92aa7286 100644
--- a/cpukit/score/cpu/sparc64/cpu.c
+++ b/cpukit/score/cpu/sparc64/cpu.c
@@ -16,7 +16,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/tls.h>
 #include <rtems/rtems/cache.h>
diff --git a/cpukit/score/cpu/v850/cpu.c b/cpukit/score/cpu/v850/cpu.c
index f1be752002..d203078bd4 100644
--- a/cpukit/score/cpu/v850/cpu.c
+++ b/cpukit/score/cpu/v850/cpu.c
@@ -17,7 +17,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/cpu/x86_64/cpu.c b/cpukit/score/cpu/x86_64/cpu.c
index a438d31df5..eb10c0d427 100644
--- a/cpukit/score/cpu/x86_64/cpu.c
+++ b/cpukit/score/cpu/x86_64/cpu.c
@@ -37,7 +37,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/idt.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/coremsgflushwait.c b/cpukit/score/src/coremsgflushwait.c
index c49e436185..a53f922cb4 100644
--- a/cpukit/score/src/coremsgflushwait.c
+++ b/cpukit/score/src/coremsgflushwait.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/chain.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index 04849dcea4..7e7cb8f131 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/chain.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/coremsgimpl.h>
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index 77ed582ce1..e1ea68e5e4 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/heapimpl.h>
 
 #ifndef HEAP_PROTECTION
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 00e402a5b2..6dde6b23c5 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/heapimpl.h>
 
 static void _Heap_Free_block( Heap_Control *heap, Heap_Block *block )
diff --git a/cpukit/score/src/heapgetfreeinfo.c b/cpukit/score/src/heapgetfreeinfo.c
index e90237cb1c..b0480b8b63 100644
--- a/cpukit/score/src/heapgetfreeinfo.c
+++ b/cpukit/score/src/heapgetfreeinfo.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/heapimpl.h>
 
 void _Heap_Get_free_information(
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index 944bfb2fe3..79d13a1954 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/heapimpl.h>
 
 static Heap_Resize_status _Heap_Resize_block_checked(
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index 13779fdd5f..d0d0303237 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/heapimpl.h>
 
 bool _Heap_Size_of_alloc_area(
diff --git a/cpukit/score/src/heapwalk.c b/cpukit/score/src/heapwalk.c
index 6c54f42ab4..f1ac20ddb5 100644
--- a/cpukit/score/src/heapwalk.c
+++ b/cpukit/score/src/heapwalk.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/address.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/heapimpl.h>
diff --git a/cpukit/score/src/pheapallocate.c b/cpukit/score/src/pheapallocate.c
index 4fefb85ac2..00c3865b50 100644
--- a/cpukit/score/src/pheapallocate.c
+++ b/cpukit/score/src/pheapallocate.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 void *_Protected_heap_Allocate_aligned_with_boundary(
diff --git a/cpukit/score/src/pheapextend.c b/cpukit/score/src/pheapextend.c
index 18f19922dd..118a9e6c93 100644
--- a/cpukit/score/src/pheapextend.c
+++ b/cpukit/score/src/pheapextend.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Extend(
diff --git a/cpukit/score/src/pheapfree.c b/cpukit/score/src/pheapfree.c
index f87b824faa..f1c1776b21 100644
--- a/cpukit/score/src/pheapfree.c
+++ b/cpukit/score/src/pheapfree.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Free(
diff --git a/cpukit/score/src/pheapgetblocksize.c b/cpukit/score/src/pheapgetblocksize.c
index 5a6f7032e0..85a5e9ce6c 100644
--- a/cpukit/score/src/pheapgetblocksize.c
+++ b/cpukit/score/src/pheapgetblocksize.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Get_block_size(
diff --git a/cpukit/score/src/pheapgetfreeinfo.c b/cpukit/score/src/pheapgetfreeinfo.c
index e442ba9fe8..326b57739a 100644
--- a/cpukit/score/src/pheapgetfreeinfo.c
+++ b/cpukit/score/src/pheapgetfreeinfo.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Get_free_information(
diff --git a/cpukit/score/src/pheapgetinfo.c b/cpukit/score/src/pheapgetinfo.c
index 6ece4e4c38..27dea965cb 100644
--- a/cpukit/score/src/pheapgetinfo.c
+++ b/cpukit/score/src/pheapgetinfo.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Get_information(
diff --git a/cpukit/score/src/pheapgetsize.c b/cpukit/score/src/pheapgetsize.c
index e5093c31c2..d60986b996 100644
--- a/cpukit/score/src/pheapgetsize.c
+++ b/cpukit/score/src/pheapgetsize.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 uintptr_t _Protected_heap_Get_size(
diff --git a/cpukit/score/src/pheapinit.c b/cpukit/score/src/pheapinit.c
index 05eba46972..e5a65966bd 100644
--- a/cpukit/score/src/pheapinit.c
+++ b/cpukit/score/src/pheapinit.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 
diff --git a/cpukit/score/src/pheapresizeblock.c b/cpukit/score/src/pheapresizeblock.c
index c733ddc2b4..de8b5b94eb 100644
--- a/cpukit/score/src/pheapresizeblock.c
+++ b/cpukit/score/src/pheapresizeblock.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/score/protectedheap.h>
 
 bool _Protected_heap_Resize_block(
diff --git a/cpukit/score/src/schedulercbsgetapprovedbudget.c b/cpukit/score/src/schedulercbsgetapprovedbudget.c
index d1ea5ce0ed..1377ea0847 100644
--- a/cpukit/score/src/schedulercbsgetapprovedbudget.c
+++ b/cpukit/score/src/schedulercbsgetapprovedbudget.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
diff --git a/cpukit/score/src/schedulercbsgetparameters.c b/cpukit/score/src/schedulercbsgetparameters.c
index 18dbc0ef1a..f4adae34d9 100644
--- a/cpukit/score/src/schedulercbsgetparameters.c
+++ b/cpukit/score/src/schedulercbsgetparameters.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
diff --git a/cpukit/score/src/schedulercbsgetserverid.c b/cpukit/score/src/schedulercbsgetserverid.c
index 235b559d34..8ceff89fcc 100644
--- a/cpukit/score/src/schedulercbsgetserverid.c
+++ b/cpukit/score/src/schedulercbsgetserverid.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
diff --git a/cpukit/score/src/timespeclessthan.c b/cpukit/score/src/timespeclessthan.c
index a1615fbcce..64328216ab 100644
--- a/cpukit/score/src/timespeclessthan.c
+++ b/cpukit/score/src/timespeclessthan.c
@@ -20,7 +20,6 @@
 
 #include <sys/types.h>
 
-#include <rtems/system.h>
 #include <rtems/score/timespec.h>
 
 bool _Timespec_Less_than(
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
index 671ecd7197..ac674d89ad 100644
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
 #include <rtems/config.h>
 #include <rtems/score/copyrt.h>
 #include <rtems/rtems/clock.h>