7 files changed, 9 insertions, 9 deletions
diff --git a/c/src/exec/score/cpu/no_cpu/asm.h b/c/src/exec/score/cpu/no_cpu/asm.h
index ca0ff95e35..66d98be652 100644
--- a/c/src/exec/score/cpu/no_cpu/asm.h
+++ b/c/src/exec/score/cpu/no_cpu/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/core/no_cpu.h>
+#include <rtems/score/no_cpu.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/no_cpu/cpu.c b/c/src/exec/score/cpu/no_cpu/cpu.c
index 2745e983a4..fafed97667 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu.c
+++ b/c/src/exec/score/cpu/no_cpu/cpu.c
@@ -14,8 +14,8 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/wkspace.h>
 
 /*  _CPU_Initialize
  *
diff --git a/c/src/exec/score/cpu/no_cpu/cpu.h b/c/src/exec/score/cpu/no_cpu/cpu.h
index 7242ebc041..eabe7ba2a0 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu.h
+++ b/c/src/exec/score/cpu/no_cpu/cpu.h
@@ -21,9 +21,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/no_cpu.h>               /* pick up machine definitions */
+#include <rtems/score/no_cpu.h>               /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/core/no_cputypes.h>
+#include <rtems/score/no_cputypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/no_cpu/cpu_asm.c b/c/src/exec/score/cpu/no_cpu/cpu_asm.c
index 0d7622d15f..7b87a5ffba 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu_asm.c
+++ b/c/src/exec/score/cpu/no_cpu/cpu_asm.c
@@ -24,7 +24,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/cpu.h>
 /* #include "cpu_asm.h> */
 
 /*
diff --git a/c/src/exec/score/cpu/no_cpu/cpu_asm.h b/c/src/exec/score/cpu/no_cpu/cpu_asm.h
index 50bc256e06..dd1d6a427d 100644
--- a/c/src/exec/score/cpu/no_cpu/cpu_asm.h
+++ b/c/src/exec/score/cpu/no_cpu/cpu_asm.h
@@ -21,7 +21,7 @@
 
 /* pull in the generated offsets */
 
-#include <rtems/core/offsets.h>
+#include <rtems/score/offsets.h>
 
 /*
  * Hardware General Registers
diff --git a/c/src/exec/score/cpu/no_cpu/no_cpu.h b/c/src/exec/score/cpu/no_cpu/no_cpu.h
index 465c45f7b0..afc3a46571 100644
--- a/c/src/exec/score/cpu/no_cpu/no_cpu.h
+++ b/c/src/exec/score/cpu/no_cpu/no_cpu.h
@@ -55,7 +55,7 @@ extern "C" {
  
 #if defined(no_cpu)
  
-#define RTEMS_MODEL_NAME  "no_cpu"
+#define CPU_MODEL_NAME  "no_cpu"
 #define NOCPU_HAS_FPU     1
  
 #else
diff --git a/c/src/exec/score/cpu/no_cpu/rtems.c b/c/src/exec/score/cpu/no_cpu/rtems.c
index 0d15381046..8499b6f01d 100644
--- a/c/src/exec/score/cpu/no_cpu/rtems.c
+++ b/c/src/exec/score/cpu/no_cpu/rtems.c
@@ -22,7 +22,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/cpu.h>
 /* #include "asm.h> */
 
 /*