diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index cf3b3f53b2..cdca9940d3 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-02	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/clock.S, mongoosev/vectorisrs/vectorisrs.c,
+	shared/interrupts/isr_entries.S,
+	shared/interrupts/vectorexceptions.c, timer/gettime.S: Include
+	<rtems/mips/iregdef.h> instead of <iregdef.h>.
+	* clock/clock.S, mongoosev/vectorisrs/vectorisrs.c,
+	shared/interrupts/installisrentries.c,
+	shared/interrupts/isr_entries.S,
+	shared/interrupts/vectorexceptions.c, timer/gettime.S: Include
+	<rtems/mips/idtcpu.h> instead of <idtcpu.h>.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* clock/clock.S: Include <rtems/asm.h> instead of <asm.h>.
diff --git a/c/src/lib/libcpu/mips/clock/clock.S b/c/src/lib/libcpu/mips/clock/clock.S
index 4f187d7171..cd535bdf63 100644
--- a/c/src/lib/libcpu/mips/clock/clock.S
+++ b/c/src/lib/libcpu/mips/clock/clock.S
@@ -21,8 +21,8 @@
  */
 /* @(#)clock.S       08/20/96     1.2 */
 
-#include <iregdef.h>
-#include <idtcpu.h>
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 #include <rtems/asm.h>
 
 FRAME(mips_set_timer,sp,0,ra)
diff --git a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/vectorisrs.c b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/vectorisrs.c
index 047e2239c1..76299d0f34 100644
--- a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/vectorisrs.c
+++ b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/vectorisrs.c
@@ -15,8 +15,8 @@
 #include <stdlib.h>
 #include <libcpu/mongoose-v.h>
 
-#include "iregdef.h"
-#include "idtcpu.h"
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 
 
 #include <rtems/bspIo.h>  /* for printk */
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c b/c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c
index 143e1188bb..5c2fb62abc 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c
+++ b/c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c
@@ -3,7 +3,7 @@
  */
 
 #include <rtems.h>
-#include <idtcpu.h>
+#include <rtems/mips/idtcpu.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S b/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S
index eedefa19c6..771c008e2c 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S
+++ b/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S
@@ -12,8 +12,8 @@
  */
 
 #include <rtems/asm.h>
-#include "iregdef.h"
-#include "idtcpu.h"
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 
 /*
  *  MIPS ISA Level 1 entries
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/vectorexceptions.c b/c/src/lib/libcpu/mips/shared/interrupts/vectorexceptions.c
index 5da94d50b8..d24f748ed3 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/vectorexceptions.c
+++ b/c/src/lib/libcpu/mips/shared/interrupts/vectorexceptions.c
@@ -10,8 +10,8 @@
 #include <rtems.h>
 #include <stdlib.h>
 #include <string.h>
-#include "iregdef.h"
-#include "idtcpu.h"
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 #include <rtems/bspIo.h>
 
 char *cause_strings[32] =
diff --git a/c/src/lib/libcpu/mips/timer/gettime.S b/c/src/lib/libcpu/mips/timer/gettime.S
index 1befe4bfc1..62cbe7cf7d 100644
--- a/c/src/lib/libcpu/mips/timer/gettime.S
+++ b/c/src/lib/libcpu/mips/timer/gettime.S
@@ -22,8 +22,8 @@
 
 /* @(#)gettime.S       08/20/96     1.2 */
 
-#include <iregdef.h>
-#include <idtcpu.h>
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 #include <rtems/asm.h>
 
 FRAME(mips_read_timer,sp,0,ra)