[rtems commit] Remove superfluous <rtems/system.h> includes

Sebastian Huber sebh at rtems.org
Thu Mar 14 12:15:41 UTC 2019


Module:    rtems
Branch:    master
Commit:    3fe215502a11b318ad05c45f103272a6e8c8eb97
Changeset: http://git.rtems.org/rtems/commit/?id=3fe215502a11b318ad05c45f103272a6e8c8eb97

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Feb  1 10:00:36 2019 +0100

Remove superfluous <rtems/system.h> includes

---

 bsps/arm/shared/start/bsp-start-in-hyp-support.S        | 1 -
 bsps/arm/shared/start/bsp-start-memcpy.S                | 1 -
 bsps/i386/shared/irq/irq_asm.S                          | 1 -
 bsps/m68k/csb360/start/idle-mcf5272.c                   | 1 -
 bsps/m68k/shared/fpsp/rtems_fpsp.c                      | 5 +----
 bsps/m68k/shared/m68kidle.c                             | 1 -
 bsps/powerpc/beatnik/start/bspstart.c                   | 1 -
 bsps/powerpc/include/libcpu/powerpc-utility.h           | 1 -
 bsps/powerpc/motorola_powerpc/bootloader/misc.c         | 1 -
 bsps/powerpc/motorola_powerpc/console/polled_io.c       | 1 -
 bsps/powerpc/mvme5500/irq/BSP_irq.c                     | 1 -
 bsps/powerpc/mvme5500/start/bspstart.c                  | 1 -
 bsps/powerpc/shared/btimer/btimer-ppc-dec.c             | 1 -
 bsps/powerpc/shared/cpu.c                               | 1 -
 bsps/powerpc/shared/exceptions/ppc_exc.S                | 1 -
 bsps/powerpc/virtex/include/bsp/opbintctrl.h            | 1 -
 bsps/sh/gensh1/start/cpu_asm.c                          | 1 -
 bsps/sh/gensh2/start/cpu_asm.c                          | 1 -
 bsps/sh/gensh4/start/cpu_asm.c                          | 1 -
 bsps/sh/gensh4/start/ispsh7750.c                        | 1 -
 bsps/sh/shsim/start/cpu_asm.c                           | 1 -
 cpukit/include/rtems/posix/aio_misc.h                   | 1 -
 cpukit/include/rtems/score/interr.h                     | 5 +----
 cpukit/libcsupport/src/getegid.c                        | 1 -
 cpukit/libcsupport/src/geteuid.c                        | 1 -
 cpukit/libcsupport/src/getlogin.c                       | 1 -
 cpukit/libcsupport/src/getppid.c                        | 1 -
 cpukit/libcsupport/src/setegid.c                        | 1 -
 cpukit/libgnat/adasupp.c                                | 1 -
 cpukit/libmisc/shell/main_help.c                        | 1 -
 cpukit/libmisc/shell/shell.c                            | 1 -
 cpukit/libmisc/shell/shell_getchar.c                    | 1 -
 cpukit/libmisc/shell/shell_getprompt.c                  | 1 -
 cpukit/posix/src/aio_cancel.c                           | 1 -
 cpukit/posix/src/aio_error.c                            | 1 -
 cpukit/posix/src/aio_fsync.c                            | 1 -
 cpukit/posix/src/aio_read.c                             | 1 -
 cpukit/posix/src/aio_return.c                           | 1 -
 cpukit/posix/src/aio_suspend.c                          | 2 +-
 cpukit/posix/src/aio_write.c                            | 1 -
 cpukit/posix/src/barrierattrinit.c                      | 2 --
 cpukit/posix/src/clockgetcpuclockid.c                   | 1 -
 cpukit/posix/src/condattrgetpshared.c                   | 1 -
 cpukit/posix/src/conddefaultattributes.c                | 1 -
 cpukit/posix/src/kill.c                                 | 1 -
 cpukit/posix/src/kill_r.c                               | 1 -
 cpukit/posix/src/lio_listio.c                           | 2 +-
 cpukit/posix/src/mqueuesend.c                           | 1 -
 cpukit/posix/src/mutexattrsetprotocol.c                 | 1 -
 cpukit/posix/src/mutexattrsetpshared.c                  | 1 -
 cpukit/posix/src/mutexattrsettype.c                     | 1 -
 cpukit/posix/src/psignalclearsignals.c                  | 1 -
 cpukit/posix/src/psignalsetprocesssignals.c             | 1 -
 cpukit/posix/src/psignalunblockthread.c                 | 1 -
 cpukit/posix/src/psxtimerdelete.c                       | 1 -
 cpukit/posix/src/pthreadgetcpuclockid.c                 | 1 -
 cpukit/posix/src/pthreadinitthreads.c                   | 1 -
 cpukit/posix/src/pthreadsigmask.c                       | 1 -
 cpukit/posix/src/rwlockattrinit.c                       | 1 -
 cpukit/posix/src/sched_getparam.c                       | 2 +-
 cpukit/posix/src/sched_getprioritymin.c                 | 1 -
 cpukit/posix/src/sched_getscheduler.c                   | 1 -
 cpukit/posix/src/sched_setparam.c                       | 1 -
 cpukit/posix/src/sched_setscheduler.c                   | 1 -
 cpukit/posix/src/sigaddset.c                            | 1 -
 cpukit/posix/src/sigdelset.c                            | 1 -
 cpukit/posix/src/sigemptyset.c                          | 1 -
 cpukit/posix/src/sigfillset.c                           | 1 -
 cpukit/posix/src/sigismember.c                          | 1 -
 cpukit/posix/src/sigpending.c                           | 1 -
 cpukit/posix/src/sigqueue.c                             | 1 -
 cpukit/posix/src/timergetoverrun.c                      | 1 -
 cpukit/rtems/src/barrierident.c                         | 1 -
 cpukit/rtems/src/dpmemident.c                           | 1 -
 cpukit/rtems/src/intrbody.c                             | 1 -
 cpukit/rtems/src/modes.c                                | 1 -
 cpukit/rtems/src/msgqident.c                            | 1 -
 cpukit/rtems/src/partident.c                            | 1 -
 cpukit/rtems/src/ratemonident.c                         | 1 -
 cpukit/rtems/src/regionident.c                          | 1 -
 cpukit/rtems/src/rtclock.c                              | 1 -
 cpukit/rtems/src/rtemsbuildname.c                       | 1 -
 cpukit/rtems/src/taskident.c                            | 1 -
 cpukit/rtems/src/taskinitusers.c                        | 1 -
 cpukit/rtems/src/taskself.c                             | 1 -
 cpukit/rtems/src/timerident.c                           | 1 -
 cpukit/rtems/src/workspace.c                            | 1 -
 cpukit/sapi/src/exinit.c                                | 1 -
 cpukit/sapi/src/extensionident.c                        | 1 -
 cpukit/sapi/src/fatal.c                                 | 1 -
 cpukit/sapi/src/getversionstring.c                      | 1 -
 cpukit/score/cpu/arm/arm_exc_abort.S                    | 1 -
 cpukit/score/cpu/arm/armv4-exception-default.S          | 1 -
 cpukit/score/cpu/bfin/cpu.c                             | 1 -
 cpukit/score/cpu/i386/cpu.c                             | 1 -
 cpukit/score/cpu/lm32/cpu.c                             | 1 -
 cpukit/score/cpu/mips/cpu.c                             | 1 -
 cpukit/score/cpu/mips/include/rtems/asm.h               | 1 -
 cpukit/score/cpu/moxie/cpu.c                            | 1 -
 cpukit/score/cpu/nios2/nios2-iic-irq.c                  | 1 -
 cpukit/score/cpu/nios2/nios2-thread-dispatch-disabled.c | 2 +-
 cpukit/score/cpu/no_cpu/cpu.c                           | 1 -
 cpukit/score/cpu/no_cpu/cpu_asm.c                       | 1 -
 cpukit/score/cpu/or1k/cpu.c                             | 1 -
 cpukit/score/cpu/riscv/include/libcpu/access.h          | 1 -
 cpukit/score/cpu/sh/context.c                           | 1 -
 cpukit/score/cpu/sh/cpu.c                               | 1 -
 cpukit/score/cpu/sparc/cpu.c                            | 1 -
 cpukit/score/cpu/sparc/include/libcpu/access.h          | 1 -
 cpukit/score/cpu/sparc/include/libcpu/byteorder.h       | 1 -
 cpukit/score/cpu/sparc64/cpu.c                          | 1 -
 cpukit/score/cpu/v850/cpu.c                             | 1 -
 cpukit/score/cpu/x86_64/cpu.c                           | 1 -
 cpukit/score/src/coremsgflushwait.c                     | 1 -
 cpukit/score/src/coremsgseize.c                         | 1 -
 cpukit/score/src/heapallocate.c                         | 1 -
 cpukit/score/src/heapextend.c                           | 1 -
 cpukit/score/src/heapgetfreeinfo.c                      | 1 -
 cpukit/score/src/heapresizeblock.c                      | 1 -
 cpukit/score/src/heapsizeofuserarea.c                   | 1 -
 cpukit/score/src/heapwalk.c                             | 1 -
 cpukit/score/src/pheapallocate.c                        | 1 -
 cpukit/score/src/pheapextend.c                          | 1 -
 cpukit/score/src/pheapfree.c                            | 1 -
 cpukit/score/src/pheapgetblocksize.c                    | 1 -
 cpukit/score/src/pheapgetfreeinfo.c                     | 1 -
 cpukit/score/src/pheapgetinfo.c                         | 1 -
 cpukit/score/src/pheapgetsize.c                         | 1 -
 cpukit/score/src/pheapinit.c                            | 1 -
 cpukit/score/src/pheapresizeblock.c                     | 1 -
 cpukit/score/src/schedulercbsgetapprovedbudget.c        | 1 -
 cpukit/score/src/schedulercbsgetparameters.c            | 1 -
 cpukit/score/src/schedulercbsgetserverid.c              | 1 -
 cpukit/score/src/timespeclessthan.c                     | 1 -
 testsuites/sptests/spsize/size.c                        | 1 -
 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 b608c59..5d3d592 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 cb97eb4..4d82f6f 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 1812933..2d65a79 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 c645b28..651b212 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 558dc04..1758d91 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 f43651f..474437e 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 4c1bb0e..1ddb457 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 f833c0e..60cfe85 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 0b8e42c..587bcff 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 db4dc8a..ada6083 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 eb36cc2..5f677e2 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 c79239e..06a12d8 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 d161710..1e65d49 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 7c37f0e..a06b8c0 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 c606c0d..9ffb2cc 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 4ade0e4..67b7f77 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 2556623..bd98602 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 479b771..d483e2f 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 6b530fe..a273853 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 5a1282f..edce956 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 1b8135e..db5171b 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 aeccbad..059753e 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 a0ad7a5..16f3907 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 86f514e..f224617 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 85f2d57..d71df9a 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 1ec8285..6fce31f 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 f55bf77..ad2e883 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 aa0a921..8975c13 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 662b1cc..b8f3484 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 e45e7f8..611f2e0 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 d1fc9c6..812a0b0 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 253b1a6..6b4de22 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 51777f7..d496478 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 cf84055..2b6a212 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 111c811..4c30a8b 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 df5432c..62f516b 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 a183458..a52cbde 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 301d424..9e73328 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 2a3362a..9739bac 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 6e8c8b7..8e873a9 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 8a22c1b..5ee3343 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 51f8588..54f10ba 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 92918cb..d80af6e 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 7523f1a..1aff37b 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 ee2c1b0..cc54c22 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 97dcd43..532e31c 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 fb3c3a2..bcbfb7d 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 4843ae0..dfb4bcf 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 eecc04b..0b27239 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 bd94679..412cbe4 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 b188e46..a31a848 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 39ea41c..7d678ca 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 b755c2d..1fbe778 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 d75e454..46f1942 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 7670838..f84cba2 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 b7d9734..cd7814b 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 97ae5df..89163f4 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 908ffd0..1681761 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 65f8b2f..d3e6e65 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 318f5b9..4817745 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 4227792..7b89534 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 592a42c..396ceb5 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 de5c26f..14cd870 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 9e3b01b..2e0134a 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 a8f2a77..4a934d3 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 9b239bd..e2989a4 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 14f6e2a..23d7258 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 0652041..45d6d53 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 12a1dcc..413b8b8 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 67a5c66..cf25cf8 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 56292bf..c97f50b 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 0a7b9fa..263aad8 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 ccb264a..8ba8c56 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 c6e64e1..852a4a4 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 1fabd4c..9d5980e 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 198ce29..5c926d9 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 0d7439c..89496de 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 f18360b..c5ea86d 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 a6d3e1a..58989e2 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 70678a5..9b6f57f 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 22bb985..d9e7155 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 7ff27a6..a442b68 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 421c827..0f826b8 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 c14d95d..f72428d 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 69b0967..c699ee2 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 89db1c4..b4e4f9b 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 e4e576c..764280a 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 6ec5a76..54e4451 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 10c8e69..00ef83e 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 4a0314a..54253fc 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 7c57f5c..ced3103 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 0f5d414..35f08ee 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 a10de30..efa8d13 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 f658d1f..86a3a5e 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 a90eb7a..77b7a71 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 c1cbe76..78e8703 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 7f48d09..2e45959 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 9c84f61..c8db31c 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 9197797..2f4e823 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 cec24fd..665649f 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 106254d..b5f7b94 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 6202708..f22725c 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 a1fbf9c..1583cb4 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 75abb2f..3d9aa74 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 cdf6b77..4f2a780 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 dfa12c3..1505f02 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 9f8be46..c100865 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 40f85b9..9f84c28 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 cdf6b77..4f2a780 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 10b4239..6726a78 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 eb7e734..2d92aa7 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 f1be752..d203078 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 a438d31..eb10c0d 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 c49e436..a53f922 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 04849dc..7e7cb8f 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 77ed582..e1ea68e 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 00e402a..6dde6b2 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 e90237c..b0480b8 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 944bfb2..79d13a1 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 13779fd..d0d0303 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 6c54f42..f1ac20d 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 4fefb85..00c3865 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 18f1992..118a9e6 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 f87b824..f1c1776 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 5a6f703..85a5e9c 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 e442ba9..326b577 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 6ece4e4..27dea96 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 e5093c3..d60986b 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 05eba46..e5a6596 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 c733ddc..de8b5b9 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 d1ea5ce..1377ea0 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 18dbc0e..f4adae3 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 235b559..8ceff89 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 a1615fb..6432821 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 671ecd7..ac674d8 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>



More information about the vc mailing list