posix support initially added

82 files changed, 271 insertions, 271 deletions

diff --git a/c/src/exec/rtems/headers/clock.h b/c/src/exec/rtems/headers/clock.h
index 595dfcdbaf..d7c032a282 100644
--- a/c/src/exec/rtems/headers/clock.h
+++ b/c/src/exec/rtems/headers/clock.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/tod.h>
+#include <rtems/score/tod.h>
 #include <rtems/rtems/types.h>
 
 /*
diff --git a/c/src/exec/rtems/headers/dpmem.h b/c/src/exec/rtems/headers/dpmem.h
index 801d5f3864..576a338187 100644
--- a/c/src/exec/rtems/headers/dpmem.h
+++ b/c/src/exec/rtems/headers/dpmem.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 
 /*
  *  The following structure defines the port control block.  Each port
diff --git a/c/src/exec/rtems/headers/event.h b/c/src/exec/rtems/headers/event.h
index 05020b9926..02cd5ea0c2 100644
--- a/c/src/exec/rtems/headers/event.h
+++ b/c/src/exec/rtems/headers/event.h
@@ -28,11 +28,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/eventset.h>
 
 /*
diff --git a/c/src/exec/rtems/headers/eventmp.h b/c/src/exec/rtems/headers/eventmp.h
index 86587adc4a..a6f5b912b0 100644
--- a/c/src/exec/rtems/headers/eventmp.h
+++ b/c/src/exec/rtems/headers/eventmp.h
@@ -22,10 +22,10 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/event.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/headers/intr.h b/c/src/exec/rtems/headers/intr.h
index 08c249d085..d826d32bf4 100644
--- a/c/src/exec/rtems/headers/intr.h
+++ b/c/src/exec/rtems/headers/intr.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*
  *  Interrupt level type
diff --git a/c/src/exec/rtems/headers/message.h b/c/src/exec/rtems/headers/message.h
index 60592b5f3c..40b04ed21c 100644
--- a/c/src/exec/rtems/headers/message.h
+++ b/c/src/exec/rtems/headers/message.h
@@ -35,11 +35,11 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/types.h>
-#include <rtems/core/chain.h>
-#include <rtems/core/object.h>
+#include <rtems/score/chain.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/coremsg.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/coremsg.h>
 
 /*
  *  The following enumerated type details the modes in which a message
diff --git a/c/src/exec/rtems/headers/modes.h b/c/src/exec/rtems/headers/modes.h
index 115898e503..bf60aacf1f 100644
--- a/c/src/exec/rtems/headers/modes.h
+++ b/c/src/exec/rtems/headers/modes.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*
  *  The following type defines the control block used to manage
diff --git a/c/src/exec/rtems/headers/msgmp.h b/c/src/exec/rtems/headers/msgmp.h
index 2cc6bc1367..070ed6fcaa 100644
--- a/c/src/exec/rtems/headers/msgmp.h
+++ b/c/src/exec/rtems/headers/msgmp.h
@@ -22,11 +22,11 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/message.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/headers/part.h b/c/src/exec/rtems/headers/part.h
index da163c6beb..95a7ce692e 100644
--- a/c/src/exec/rtems/headers/part.h
+++ b/c/src/exec/rtems/headers/part.h
@@ -31,8 +31,8 @@
 extern "C" {
 #endif
 
-#include <rtems/core/address.h>
-#include <rtems/core/object.h>
+#include <rtems/score/address.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/types.h>
 
diff --git a/c/src/exec/rtems/headers/partmp.h b/c/src/exec/rtems/headers/partmp.h
index 980eaea853..fd7d442dd3 100644
--- a/c/src/exec/rtems/headers/partmp.h
+++ b/c/src/exec/rtems/headers/partmp.h
@@ -21,10 +21,10 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/part.h>
 
diff --git a/c/src/exec/rtems/headers/ratemon.h b/c/src/exec/rtems/headers/ratemon.h
index 6b401ba5b0..4e85ab1ac2 100644
--- a/c/src/exec/rtems/headers/ratemon.h
+++ b/c/src/exec/rtems/headers/ratemon.h
@@ -29,9 +29,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the states in which a
diff --git a/c/src/exec/rtems/headers/region.h b/c/src/exec/rtems/headers/region.h
index 077d2b76e7..054698caa3 100644
--- a/c/src/exec/rtems/headers/region.h
+++ b/c/src/exec/rtems/headers/region.h
@@ -30,9 +30,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/heap.h>
+#include <rtems/score/object.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/heap.h>
 #include <rtems/debug.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/types.h>
diff --git a/c/src/exec/rtems/headers/regionmp.h b/c/src/exec/rtems/headers/regionmp.h
index 91ac5227f2..b59fe9235e 100644
--- a/c/src/exec/rtems/headers/regionmp.h
+++ b/c/src/exec/rtems/headers/regionmp.h
@@ -21,9 +21,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
diff --git a/c/src/exec/rtems/headers/rtems.h b/c/src/exec/rtems/headers/rtems.h
index dd6350c9d8..8c507d45ff 100644
--- a/c/src/exec/rtems/headers/rtems.h
+++ b/c/src/exec/rtems/headers/rtems.h
@@ -48,7 +48,7 @@ extern "C" {
 #include <rtems/rtems/mp.h>
 
 #include <rtems/rtems/support.h>
-#include <rtems/core/sysstate.h>
+#include <rtems/score/sysstate.h>
 
 #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
 
diff --git a/c/src/exec/rtems/headers/sem.h b/c/src/exec/rtems/headers/sem.h
index 1faf3b13e9..e9760ac4e1 100644
--- a/c/src/exec/rtems/headers/sem.h
+++ b/c/src/exec/rtems/headers/sem.h
@@ -35,10 +35,10 @@ extern "C" {
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/coremutex.h>
-#include <rtems/core/object.h>
-#include <rtems/core/coresem.h>
-#include <rtems/core/threadq.h>
+#include <rtems/score/coremutex.h>
+#include <rtems/score/object.h>
+#include <rtems/score/coresem.h>
+#include <rtems/score/threadq.h>
 
 /*
  *  The following defines the control block used to manage each semaphore.
diff --git a/c/src/exec/rtems/headers/semmp.h b/c/src/exec/rtems/headers/semmp.h
index a796f6ad6b..4d9618256d 100644
--- a/c/src/exec/rtems/headers/semmp.h
+++ b/c/src/exec/rtems/headers/semmp.h
@@ -21,12 +21,12 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/sem.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/headers/signal.h b/c/src/exec/rtems/headers/signal.h
index 3dcb84513b..e72bcb2dbc 100644
--- a/c/src/exec/rtems/headers/signal.h
+++ b/c/src/exec/rtems/headers/signal.h
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <rtems/rtems/asr.h>
 #include <rtems/rtems/modes.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
 
diff --git a/c/src/exec/rtems/headers/signalmp.h b/c/src/exec/rtems/headers/signalmp.h
index fb25c5a62f..91d36b729f 100644
--- a/c/src/exec/rtems/headers/signalmp.h
+++ b/c/src/exec/rtems/headers/signalmp.h
@@ -22,10 +22,10 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/asr.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/headers/taskmp.h b/c/src/exec/rtems/headers/taskmp.h
index 2010485aba..032d5645d1 100644
--- a/c/src/exec/rtems/headers/taskmp.h
+++ b/c/src/exec/rtems/headers/taskmp.h
@@ -21,12 +21,12 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/priority.h>
+#include <rtems/score/priority.h>
 #include <rtems/rtems/tasks.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/headers/tasks.h b/c/src/exec/rtems/headers/tasks.h
index f3abd875fc..2c75cb3824 100644
--- a/c/src/exec/rtems/headers/tasks.h
+++ b/c/src/exec/rtems/headers/tasks.h
@@ -38,9 +38,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/object.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/eventset.h>
 #include <rtems/rtems/asr.h>
diff --git a/c/src/exec/rtems/headers/timer.h b/c/src/exec/rtems/headers/timer.h
index 21e88a4baf..d55d43df10 100644
--- a/c/src/exec/rtems/headers/timer.h
+++ b/c/src/exec/rtems/headers/timer.h
@@ -33,9 +33,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/object.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type details the classes to which a timer
diff --git a/c/src/exec/rtems/headers/types.h b/c/src/exec/rtems/headers/types.h
index 3b7a4a5e12..48a0c247ed 100644
--- a/c/src/exec/rtems/headers/types.h
+++ b/c/src/exec/rtems/headers/types.h
@@ -20,11 +20,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/priority.h>
+#include <rtems/score/object.h>
+#include <rtems/score/priority.h>
 #include <rtems/rtems/modes.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
 
 /*
  *  RTEMS basic type definitions
diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h
index dd6350c9d8..8c507d45ff 100644
--- a/c/src/exec/rtems/include/rtems.h
+++ b/c/src/exec/rtems/include/rtems.h
@@ -48,7 +48,7 @@ extern "C" {
 #include <rtems/rtems/mp.h>
 
 #include <rtems/rtems/support.h>
-#include <rtems/core/sysstate.h>
+#include <rtems/score/sysstate.h>
 
 #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP
 
diff --git a/c/src/exec/rtems/include/rtems/rtems/clock.h b/c/src/exec/rtems/include/rtems/rtems/clock.h
index 595dfcdbaf..d7c032a282 100644
--- a/c/src/exec/rtems/include/rtems/rtems/clock.h
+++ b/c/src/exec/rtems/include/rtems/rtems/clock.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/tod.h>
+#include <rtems/score/tod.h>
 #include <rtems/rtems/types.h>
 
 /*
diff --git a/c/src/exec/rtems/include/rtems/rtems/dpmem.h b/c/src/exec/rtems/include/rtems/rtems/dpmem.h
index 801d5f3864..576a338187 100644
--- a/c/src/exec/rtems/include/rtems/rtems/dpmem.h
+++ b/c/src/exec/rtems/include/rtems/rtems/dpmem.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 
 /*
  *  The following structure defines the port control block.  Each port
diff --git a/c/src/exec/rtems/include/rtems/rtems/event.h b/c/src/exec/rtems/include/rtems/rtems/event.h
index 05020b9926..02cd5ea0c2 100644
--- a/c/src/exec/rtems/include/rtems/rtems/event.h
+++ b/c/src/exec/rtems/include/rtems/rtems/event.h
@@ -28,11 +28,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/eventset.h>
 
 /*
diff --git a/c/src/exec/rtems/include/rtems/rtems/eventmp.h b/c/src/exec/rtems/include/rtems/rtems/eventmp.h
index 86587adc4a..a6f5b912b0 100644
--- a/c/src/exec/rtems/include/rtems/rtems/eventmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/eventmp.h
@@ -22,10 +22,10 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/event.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/include/rtems/rtems/intr.h b/c/src/exec/rtems/include/rtems/rtems/intr.h
index 08c249d085..d826d32bf4 100644
--- a/c/src/exec/rtems/include/rtems/rtems/intr.h
+++ b/c/src/exec/rtems/include/rtems/rtems/intr.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*
  *  Interrupt level type
diff --git a/c/src/exec/rtems/include/rtems/rtems/message.h b/c/src/exec/rtems/include/rtems/rtems/message.h
index 60592b5f3c..40b04ed21c 100644
--- a/c/src/exec/rtems/include/rtems/rtems/message.h
+++ b/c/src/exec/rtems/include/rtems/rtems/message.h
@@ -35,11 +35,11 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/types.h>
-#include <rtems/core/chain.h>
-#include <rtems/core/object.h>
+#include <rtems/score/chain.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/coremsg.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/coremsg.h>
 
 /*
  *  The following enumerated type details the modes in which a message
diff --git a/c/src/exec/rtems/include/rtems/rtems/modes.h b/c/src/exec/rtems/include/rtems/rtems/modes.h
index 115898e503..bf60aacf1f 100644
--- a/c/src/exec/rtems/include/rtems/rtems/modes.h
+++ b/c/src/exec/rtems/include/rtems/rtems/modes.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*
  *  The following type defines the control block used to manage
diff --git a/c/src/exec/rtems/include/rtems/rtems/msgmp.h b/c/src/exec/rtems/include/rtems/rtems/msgmp.h
index 2cc6bc1367..070ed6fcaa 100644
--- a/c/src/exec/rtems/include/rtems/rtems/msgmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/msgmp.h
@@ -22,11 +22,11 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/message.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/include/rtems/rtems/part.h b/c/src/exec/rtems/include/rtems/rtems/part.h
index da163c6beb..95a7ce692e 100644
--- a/c/src/exec/rtems/include/rtems/rtems/part.h
+++ b/c/src/exec/rtems/include/rtems/rtems/part.h
@@ -31,8 +31,8 @@
 extern "C" {
 #endif
 
-#include <rtems/core/address.h>
-#include <rtems/core/object.h>
+#include <rtems/score/address.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/types.h>
 
diff --git a/c/src/exec/rtems/include/rtems/rtems/partmp.h b/c/src/exec/rtems/include/rtems/rtems/partmp.h
index 980eaea853..fd7d442dd3 100644
--- a/c/src/exec/rtems/include/rtems/rtems/partmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/partmp.h
@@ -21,10 +21,10 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/part.h>
 
diff --git a/c/src/exec/rtems/include/rtems/rtems/ratemon.h b/c/src/exec/rtems/include/rtems/rtems/ratemon.h
index 6b401ba5b0..4e85ab1ac2 100644
--- a/c/src/exec/rtems/include/rtems/rtems/ratemon.h
+++ b/c/src/exec/rtems/include/rtems/rtems/ratemon.h
@@ -29,9 +29,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the states in which a
diff --git a/c/src/exec/rtems/include/rtems/rtems/region.h b/c/src/exec/rtems/include/rtems/rtems/region.h
index 077d2b76e7..054698caa3 100644
--- a/c/src/exec/rtems/include/rtems/rtems/region.h
+++ b/c/src/exec/rtems/include/rtems/rtems/region.h
@@ -30,9 +30,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/heap.h>
+#include <rtems/score/object.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/heap.h>
 #include <rtems/debug.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/types.h>
diff --git a/c/src/exec/rtems/include/rtems/rtems/regionmp.h b/c/src/exec/rtems/include/rtems/rtems/regionmp.h
index 91ac5227f2..b59fe9235e 100644
--- a/c/src/exec/rtems/include/rtems/rtems/regionmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/regionmp.h
@@ -21,9 +21,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
diff --git a/c/src/exec/rtems/include/rtems/rtems/sem.h b/c/src/exec/rtems/include/rtems/rtems/sem.h
index 1faf3b13e9..e9760ac4e1 100644
--- a/c/src/exec/rtems/include/rtems/rtems/sem.h
+++ b/c/src/exec/rtems/include/rtems/rtems/sem.h
@@ -35,10 +35,10 @@ extern "C" {
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/tasks.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/coremutex.h>
-#include <rtems/core/object.h>
-#include <rtems/core/coresem.h>
-#include <rtems/core/threadq.h>
+#include <rtems/score/coremutex.h>
+#include <rtems/score/object.h>
+#include <rtems/score/coresem.h>
+#include <rtems/score/threadq.h>
 
 /*
  *  The following defines the control block used to manage each semaphore.
diff --git a/c/src/exec/rtems/include/rtems/rtems/semmp.h b/c/src/exec/rtems/include/rtems/rtems/semmp.h
index a796f6ad6b..4d9618256d 100644
--- a/c/src/exec/rtems/include/rtems/rtems/semmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/semmp.h
@@ -21,12 +21,12 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/sem.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/include/rtems/rtems/signal.h b/c/src/exec/rtems/include/rtems/rtems/signal.h
index 3dcb84513b..e72bcb2dbc 100644
--- a/c/src/exec/rtems/include/rtems/rtems/signal.h
+++ b/c/src/exec/rtems/include/rtems/rtems/signal.h
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <rtems/rtems/asr.h>
 #include <rtems/rtems/modes.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
 
diff --git a/c/src/exec/rtems/include/rtems/rtems/signalmp.h b/c/src/exec/rtems/include/rtems/rtems/signalmp.h
index fb25c5a62f..91d36b729f 100644
--- a/c/src/exec/rtems/include/rtems/rtems/signalmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/signalmp.h
@@ -22,10 +22,10 @@ extern "C" {
 #endif
 
 #include <rtems/rtems/asr.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/include/rtems/rtems/taskmp.h b/c/src/exec/rtems/include/rtems/rtems/taskmp.h
index 2010485aba..032d5645d1 100644
--- a/c/src/exec/rtems/include/rtems/rtems/taskmp.h
+++ b/c/src/exec/rtems/include/rtems/rtems/taskmp.h
@@ -21,12 +21,12 @@
 extern "C" {
 #endif
 
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/priority.h>
+#include <rtems/score/priority.h>
 #include <rtems/rtems/tasks.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 /*
  *  The following enumerated type defines the list of
diff --git a/c/src/exec/rtems/include/rtems/rtems/tasks.h b/c/src/exec/rtems/include/rtems/rtems/tasks.h
index f3abd875fc..2c75cb3824 100644
--- a/c/src/exec/rtems/include/rtems/rtems/tasks.h
+++ b/c/src/exec/rtems/include/rtems/rtems/tasks.h
@@ -38,9 +38,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/object.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/eventset.h>
 #include <rtems/rtems/asr.h>
diff --git a/c/src/exec/rtems/include/rtems/rtems/timer.h b/c/src/exec/rtems/include/rtems/rtems/timer.h
index 21e88a4baf..d55d43df10 100644
--- a/c/src/exec/rtems/include/rtems/rtems/timer.h
+++ b/c/src/exec/rtems/include/rtems/rtems/timer.h
@@ -33,9 +33,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/object.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*
  *  The following enumerated type details the classes to which a timer
diff --git a/c/src/exec/rtems/include/rtems/rtems/types.h b/c/src/exec/rtems/include/rtems/rtems/types.h
index 3b7a4a5e12..48a0c247ed 100644
--- a/c/src/exec/rtems/include/rtems/rtems/types.h
+++ b/c/src/exec/rtems/include/rtems/rtems/types.h
@@ -20,11 +20,11 @@
 extern "C" {
 #endif
 
-#include <rtems/core/object.h>
-#include <rtems/core/priority.h>
+#include <rtems/score/object.h>
+#include <rtems/score/priority.h>
 #include <rtems/rtems/modes.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
 
 /*
  *  RTEMS basic type definitions
diff --git a/c/src/exec/rtems/inline/asr.inl b/c/src/exec/rtems/inline/asr.inl
index fb1d7a8efc..611ac930db 100644
--- a/c/src/exec/rtems/inline/asr.inl
+++ b/c/src/exec/rtems/inline/asr.inl
@@ -17,7 +17,7 @@
 #ifndef __INLINE_ASR_inl
 #define __INLINE_ASR_inl
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/inline/message.inl b/c/src/exec/rtems/inline/message.inl
index 114781293c..673dce92a5 100644
--- a/c/src/exec/rtems/inline/message.inl
+++ b/c/src/exec/rtems/inline/message.inl
@@ -17,7 +17,7 @@
 #ifndef __MESSAGE_QUEUE_inl
 #define __MESSAGE_QUEUE_inl
 
-#include <rtems/core/wkspace.h>
+#include <rtems/score/wkspace.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/inline/rtems/rtems/asr.inl b/c/src/exec/rtems/inline/rtems/rtems/asr.inl
index fb1d7a8efc..611ac930db 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/asr.inl
+++ b/c/src/exec/rtems/inline/rtems/rtems/asr.inl
@@ -17,7 +17,7 @@
 #ifndef __INLINE_ASR_inl
 #define __INLINE_ASR_inl
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/inline/rtems/rtems/message.inl b/c/src/exec/rtems/inline/rtems/rtems/message.inl
index 114781293c..673dce92a5 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/message.inl
+++ b/c/src/exec/rtems/inline/rtems/rtems/message.inl
@@ -17,7 +17,7 @@
 #ifndef __MESSAGE_QUEUE_inl
 #define __MESSAGE_QUEUE_inl
 
-#include <rtems/core/wkspace.h>
+#include <rtems/score/wkspace.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/macros/asr.inl b/c/src/exec/rtems/macros/asr.inl
index 6610feea2a..d6806b00f6 100644
--- a/c/src/exec/rtems/macros/asr.inl
+++ b/c/src/exec/rtems/macros/asr.inl
@@ -17,7 +17,7 @@
 #ifndef __INLINE_ASR_h
 #define __INLINE_ASR_h
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/macros/rtems/rtems/asr.inl b/c/src/exec/rtems/macros/rtems/rtems/asr.inl
index 6610feea2a..d6806b00f6 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/asr.inl
+++ b/c/src/exec/rtems/macros/rtems/rtems/asr.inl
@@ -17,7 +17,7 @@
 #ifndef __INLINE_ASR_h
 #define __INLINE_ASR_h
 
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/optman/no-dpmem.c b/c/src/exec/rtems/optman/no-dpmem.c
index a7116fefa1..ac0dc13c7f 100644
--- a/c/src/exec/rtems/optman/no-dpmem.c
+++ b/c/src/exec/rtems/optman/no-dpmem.c
@@ -13,9 +13,9 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/address.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/address.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
diff --git a/c/src/exec/rtems/optman/no-event.c b/c/src/exec/rtems/optman/no-event.c
index a0b2cecee7..7f1ca07f6c 100644
--- a/c/src/exec/rtems/optman/no-event.c
+++ b/c/src/exec/rtems/optman/no-event.c
@@ -15,11 +15,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/event.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 
 rtems_status_code rtems_event_send(
   Objects_Id         id,
diff --git a/c/src/exec/rtems/optman/no-mp.c b/c/src/exec/rtems/optman/no-mp.c
index f8ba2197ce..4d2c63d5d5 100644
--- a/c/src/exec/rtems/optman/no-mp.c
+++ b/c/src/exec/rtems/optman/no-mp.c
@@ -16,16 +16,16 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/mp.h>
-#include <rtems/core/cpu.h>
-#include <rtems/core/interr.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/tqdata.h>
-#include <rtems/core/watchdog.h>
-#include <rtems/core/sysstate.h>
+#include <rtems/score/cpu.h>
+#include <rtems/score/interr.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/tqdata.h>
+#include <rtems/score/watchdog.h>
+#include <rtems/score/sysstate.h>
 
 void _Multiprocessing_Manager_initialization ( void )
 {
diff --git a/c/src/exec/rtems/optman/no-msg.c b/c/src/exec/rtems/optman/no-msg.c
index 9113a1f0f5..9567297b73 100644
--- a/c/src/exec/rtems/optman/no-msg.c
+++ b/c/src/exec/rtems/optman/no-msg.c
@@ -16,14 +16,14 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/chain.h>
-#include <rtems/core/isr.h>
+#include <rtems/score/chain.h>
+#include <rtems/score/isr.h>
 #include <rtems/rtems/message.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/wkspace.h>
 
 void _Message_queue_Manager_initialization(
   unsigned32 maximum_message_queues
diff --git a/c/src/exec/rtems/optman/no-part.c b/c/src/exec/rtems/optman/no-part.c
index 814e041ec8..bebb9d1461 100644
--- a/c/src/exec/rtems/optman/no-part.c
+++ b/c/src/exec/rtems/optman/no-part.c
@@ -15,10 +15,10 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/address.h>
-#include <rtems/core/object.h>
+#include <rtems/score/address.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/part.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 void _Partition_Manager_initialization(
   unsigned32 maximum_partitions
diff --git a/c/src/exec/rtems/optman/no-region.c b/c/src/exec/rtems/optman/no-region.c
index 63298f5e0e..96e815c62e 100644
--- a/c/src/exec/rtems/optman/no-region.c
+++ b/c/src/exec/rtems/optman/no-region.c
@@ -15,11 +15,11 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 
 void _Region_Manager_initialization(
   unsigned32 maximum_regions
diff --git a/c/src/exec/rtems/optman/no-rtmon.c b/c/src/exec/rtems/optman/no-rtmon.c
index 3c633721cc..71ec2168b1 100644
--- a/c/src/exec/rtems/optman/no-rtmon.c
+++ b/c/src/exec/rtems/optman/no-rtmon.c
@@ -15,9 +15,9 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/ratemon.h>
diff --git a/c/src/exec/rtems/optman/no-sem.c b/c/src/exec/rtems/optman/no-sem.c
index ecc112d8d4..573d5adeb7 100644
--- a/c/src/exec/rtems/optman/no-sem.c
+++ b/c/src/exec/rtems/optman/no-sem.c
@@ -16,13 +16,13 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/sem.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/threadq.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/threadq.h>
 
 void _Semaphore_Manager_initialization(
   unsigned32 maximum_semaphores
diff --git a/c/src/exec/rtems/optman/no-signal.c b/c/src/exec/rtems/optman/no-signal.c
index 2193881d18..59a6f8e72f 100644
--- a/c/src/exec/rtems/optman/no-signal.c
+++ b/c/src/exec/rtems/optman/no-signal.c
@@ -15,8 +15,8 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/thread.h>
 
 #include <rtems/rtems/asr.h>
 #include <rtems/rtems/modes.h>
diff --git a/c/src/exec/rtems/optman/no-timer.c b/c/src/exec/rtems/optman/no-timer.c
index 0e32a501a6..48da9ecd85 100644
--- a/c/src/exec/rtems/optman/no-timer.c
+++ b/c/src/exec/rtems/optman/no-timer.c
@@ -15,10 +15,10 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 #include <rtems/rtems/types.h>
 #include <rtems/rtems/timer.h>
diff --git a/c/src/exec/rtems/src/clock.c b/c/src/exec/rtems/src/clock.c
index 01f61374cf..ea340ae5f4 100644
--- a/c/src/exec/rtems/src/clock.c
+++ b/c/src/exec/rtems/src/clock.c
@@ -15,10 +15,10 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/clock.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/dpmem.c b/c/src/exec/rtems/src/dpmem.c
index ee41eec142..982116d859 100644
--- a/c/src/exec/rtems/src/dpmem.c
+++ b/c/src/exec/rtems/src/dpmem.c
@@ -15,10 +15,10 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/address.h>
+#include <rtems/score/address.h>
 #include <rtems/rtems/dpmem.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/dpmem.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/event.c b/c/src/exec/rtems/src/event.c
index 833358bca8..2786d6b8dc 100644
--- a/c/src/exec/rtems/src/event.c
+++ b/c/src/exec/rtems/src/event.c
@@ -15,11 +15,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/event.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/tasks.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/eventmp.c b/c/src/exec/rtems/src/eventmp.c
index e477c9d3b5..30cd1166c6 100644
--- a/c/src/exec/rtems/src/eventmp.c
+++ b/c/src/exec/rtems/src/eventmp.c
@@ -15,12 +15,12 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/event.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/intr.c b/c/src/exec/rtems/src/intr.c
index dbcc23434c..8ec880ee99 100644
--- a/c/src/exec/rtems/src/intr.c
+++ b/c/src/exec/rtems/src/intr.c
@@ -15,7 +15,7 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 #include <rtems/rtems/intr.h>
 
 /*  _Interrupt_Manager_initialization
diff --git a/c/src/exec/rtems/src/mp.c b/c/src/exec/rtems/src/mp.c
index f17d3b13e6..7bc39074c6 100644
--- a/c/src/exec/rtems/src/mp.c
+++ b/c/src/exec/rtems/src/mp.c
@@ -16,7 +16,7 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/mp.h>
-#include <rtems/core/mpci.h>
+#include <rtems/score/mpci.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/msg.c b/c/src/exec/rtems/src/msg.c
index e9bf438c5d..899254d11d 100644
--- a/c/src/exec/rtems/src/msg.c
+++ b/c/src/exec/rtems/src/msg.c
@@ -14,15 +14,15 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/sysstate.h>
-#include <rtems/core/chain.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/coremsg.h>
-#include <rtems/core/object.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/wkspace.h>
-#include <rtems/core/mpci.h>
+#include <rtems/score/sysstate.h>
+#include <rtems/score/chain.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/coremsg.h>
+#include <rtems/score/object.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/wkspace.h>
+#include <rtems/score/mpci.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/attr.h>
 #include <rtems/rtems/message.h>
diff --git a/c/src/exec/rtems/src/msgmp.c b/c/src/exec/rtems/src/msgmp.c
index 092886d272..e43fc28aef 100644
--- a/c/src/exec/rtems/src/msgmp.c
+++ b/c/src/exec/rtems/src/msgmp.c
@@ -16,12 +16,12 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/message.h>
-#include <rtems/core/mpci.h>
+#include <rtems/score/mpci.h>
 #include <rtems/rtems/msgmp.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/part.c b/c/src/exec/rtems/src/part.c
index 2924fe6e9a..f63ab693f1 100644
--- a/c/src/exec/rtems/src/part.c
+++ b/c/src/exec/rtems/src/part.c
@@ -16,11 +16,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/address.h>
-#include <rtems/core/object.h>
+#include <rtems/score/address.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/part.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/sysstate.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/sysstate.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/partmp.c b/c/src/exec/rtems/src/partmp.c
index 8fc36c6a04..969bf314b5 100644
--- a/c/src/exec/rtems/src/partmp.c
+++ b/c/src/exec/rtems/src/partmp.c
@@ -15,12 +15,12 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/part.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/ratemon.c b/c/src/exec/rtems/src/ratemon.c
index a94ba66ea0..e12a590af4 100644
--- a/c/src/exec/rtems/src/ratemon.c
+++ b/c/src/exec/rtems/src/ratemon.c
@@ -16,10 +16,10 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/ratemon.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/region.c b/c/src/exec/rtems/src/region.c
index b5d55afdc3..ecfaf32382 100644
--- a/c/src/exec/rtems/src/region.c
+++ b/c/src/exec/rtems/src/region.c
@@ -16,11 +16,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/object.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/regionmp.c b/c/src/exec/rtems/src/regionmp.c
index 89b9d851c5..57f307f826 100644
--- a/c/src/exec/rtems/src/regionmp.c
+++ b/c/src/exec/rtems/src/regionmp.c
@@ -15,12 +15,12 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/region.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/rtclock.c b/c/src/exec/rtems/src/rtclock.c
index 01f61374cf..ea340ae5f4 100644
--- a/c/src/exec/rtems/src/rtclock.c
+++ b/c/src/exec/rtems/src/rtclock.c
@@ -15,10 +15,10 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/clock.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/rtemstimer.c b/c/src/exec/rtems/src/rtemstimer.c
index c59e137d0c..db37473500 100644
--- a/c/src/exec/rtems/src/rtemstimer.c
+++ b/c/src/exec/rtems/src/rtemstimer.c
@@ -16,11 +16,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/timer.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/sem.c b/c/src/exec/rtems/src/sem.c
index 0a22c27fd4..2995e8c638 100644
--- a/c/src/exec/rtems/src/sem.c
+++ b/c/src/exec/rtems/src/sem.c
@@ -30,19 +30,19 @@
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/attr.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/object.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/sem.h>
-#include <rtems/core/coremutex.h>
-#include <rtems/core/coresem.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/sysstate.h>
-
-#include <rtems/core/interr.h>
+#include <rtems/score/coremutex.h>
+#include <rtems/score/coresem.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/sysstate.h>
+
+#include <rtems/score/interr.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/semmp.c b/c/src/exec/rtems/src/semmp.c
index c0a43f3f53..7e7d59ba8e 100644
--- a/c/src/exec/rtems/src/semmp.c
+++ b/c/src/exec/rtems/src/semmp.c
@@ -15,13 +15,13 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/sem.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/signal.c b/c/src/exec/rtems/src/signal.c
index f43107fe12..6b0dfdc3e5 100644
--- a/c/src/exec/rtems/src/signal.c
+++ b/c/src/exec/rtems/src/signal.c
@@ -16,10 +16,10 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/asr.h>
-#include <rtems/core/isr.h>
+#include <rtems/score/isr.h>
 #include <rtems/rtems/modes.h>
 #include <rtems/rtems/signal.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/tasks.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/signalmp.c b/c/src/exec/rtems/src/signalmp.c
index 3a38818c25..b3a6ecf18c 100644
--- a/c/src/exec/rtems/src/signalmp.c
+++ b/c/src/exec/rtems/src/signalmp.c
@@ -15,14 +15,14 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/signal.h>
-#include <rtems/core/states.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/states.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/taskmp.c b/c/src/exec/rtems/src/taskmp.c
index 98b0e9d3e5..8edccb05e9 100644
--- a/c/src/exec/rtems/src/taskmp.c
+++ b/c/src/exec/rtems/src/taskmp.c
@@ -15,13 +15,13 @@
 
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
-#include <rtems/core/mpci.h>
-#include <rtems/core/mppkt.h>
-#include <rtems/core/object.h>
+#include <rtems/score/mpci.h>
+#include <rtems/score/mppkt.h>
+#include <rtems/score/object.h>
 #include <rtems/rtems/options.h>
 #include <rtems/rtems/tasks.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/watchdog.h>
 #include <rtems/rtems/support.h>
 
 /*PAGE
diff --git a/c/src/exec/rtems/src/tasks.c b/c/src/exec/rtems/src/tasks.c
index bed9e8112d..1e893b770b 100644
--- a/c/src/exec/rtems/src/tasks.c
+++ b/c/src/exec/rtems/src/tasks.c
@@ -17,17 +17,17 @@
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
 #include <rtems/rtems/modes.h>
-#include <rtems/core/object.h>
-#include <rtems/core/stack.h>
-#include <rtems/core/states.h>
+#include <rtems/score/object.h>
+#include <rtems/score/stack.h>
+#include <rtems/score/states.h>
 #include <rtems/rtems/tasks.h>
-#include <rtems/core/thread.h>
-#include <rtems/core/threadq.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/userext.h>
-#include <rtems/core/wkspace.h>
-#include <rtems/core/apiext.h>
-#include <rtems/core/sysstate.h>
+#include <rtems/score/thread.h>
+#include <rtems/score/threadq.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/userext.h>
+#include <rtems/score/wkspace.h>
+#include <rtems/score/apiext.h>
+#include <rtems/score/sysstate.h>
 
 /*PAGE
  *
diff --git a/c/src/exec/rtems/src/timer.c b/c/src/exec/rtems/src/timer.c
index c59e137d0c..db37473500 100644
--- a/c/src/exec/rtems/src/timer.c
+++ b/c/src/exec/rtems/src/timer.c
@@ -16,11 +16,11 @@
 #include <rtems/system.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/support.h>
-#include <rtems/core/object.h>
-#include <rtems/core/thread.h>
+#include <rtems/score/object.h>
+#include <rtems/score/thread.h>
 #include <rtems/rtems/timer.h>
-#include <rtems/core/tod.h>
-#include <rtems/core/watchdog.h>
+#include <rtems/score/tod.h>
+#include <rtems/score/watchdog.h>
 
 /*PAGE
  *