3 files changed, 16 insertions, 29 deletions
diff --git a/c/src/exec/score/cpu/m68k/asm.h b/c/src/exec/score/cpu/m68k/asm.h
index 068c58058c..58bb04bdf9 100644
--- a/c/src/exec/score/cpu/m68k/asm.h
+++ b/c/src/exec/score/cpu/m68k/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <m68k.h>
+#include <rtems/m68k.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/m68k/cpu.h b/c/src/exec/score/cpu/m68k/cpu.h
index a1dd27db57..38bd16e0c3 100644
--- a/c/src/exec/score/cpu/m68k/cpu.h
+++ b/c/src/exec/score/cpu/m68k/cpu.h
@@ -30,7 +30,10 @@ extern "C" {
 
 #define NO_UNINITIALIZED_WARNINGS
 
-#include <m68k.h>
+#include <rtems/m68k.h>
+#ifndef ASM
+#include <rtems/m68ktypes.h>
+#endif
 
 /* conditional compilation parameters */
 
diff --git a/c/src/exec/score/cpu/m68k/m68k.h b/c/src/exec/score/cpu/m68k/m68k.h
index 3a62b7553b..b86db286cb 100644
--- a/c/src/exec/score/cpu/m68k/m68k.h
+++ b/c/src/exec/score/cpu/m68k/m68k.h
@@ -28,8 +28,19 @@ extern "C" {
  *        with the name of the appropriate macro for this target CPU.
  */
  
+#ifdef m68k
+#undef m68k
+#endif
 #define m68k
+
+#ifdef REPLACE_THIS_WITH_THE_CPU_MODEL
+#undef REPLACE_THIS_WITH_THE_CPU_MODEL
+#endif
 #define REPLACE_THIS_WITH_THE_CPU_MODEL
+
+#ifdef REPLACE_THIS_WITH_THE_BSP
+#undef REPLACE_THIS_WITH_THE_BSP
+#endif
 #define REPLACE_THIS_WITH_THE_BSP
 
 /*
@@ -151,33 +162,6 @@ extern "C" {
 
 #ifndef ASM
 
-/*
- *  This section defines the basic types for this processor.
- */
-
-typedef unsigned char  unsigned8;      /* unsigned 8-bit  integer */
-typedef unsigned short unsigned16;     /* unsigned 16-bit integer */
-typedef unsigned int   unsigned32;     /* unsigned 32-bit integer */
-typedef unsigned long long unsigned64; /* unsigned 64-bit integer */
-
-typedef unsigned16     Priority_Bit_map_control;
-
-typedef char           signed8;       /* signed 8-bit integer  */
-typedef short          signed16;      /* signed 16-bit integer */
-typedef int            signed32;      /* signed 32-bit integer */
-typedef long long      signed64;      /* signed 64-bit integer */
-
-typedef unsigned32 boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
-/*
- *
- */
-
-typedef void ( *m68k_isr )( void );
-
 #ifdef NO_UNINITIALIZED_WARNINGS
 #define m68k_disable_interrupts( _level ) \
   { \