diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 3bb34c7f61..dc9c29f9b5 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* vectors/vectors.S: Include <rtems/asm.h> instead of <asm.h>.
+	* startup/genpvec.c: Include <rtems/chain.h> instead of <chain.h>.
+	* include/bsp.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
+	* include/bsp.h: Include <rtems/console.h> instead of <console.h>.
+	* include/bsp.h: Include <rtems/iosupp.h> instead of <iosupp.h>.
+	* console/consolebsp.h: Include <rtems/ringbuf.h> instead of <ringbuf.h>.
+	* startup/vmeintr.c: Include <rtems/vmeintr.h> instead of <vmeintr.h>.
+
 2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* PCI_bus/PCI.c, PCI_bus/PCI.h, PCI_bus/flash.c, PCI_bus/universe.c,
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h b/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h
index 4c0e8e875c..65a7100676 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/console/consolebsp.h
@@ -16,7 +16,7 @@
 #define __CONSOLEBSP_H
 
 #include <rtems.h>
-#include <ringbuf.h>
+#include <rtems/ringbuf.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 992a894b28..fb85131fc9 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -40,9 +40,9 @@ extern "C" {
 
 #else
 #include <rtems.h>
-#include <console.h>
-#include <clockdrv.h>
-#include <iosupp.h>
+#include <rtems/console.h>
+#include <rtems/clockdrv.h>
+#include <rtems/iosupp.h>
 
 /*
  *  We no longer support the first generation board.
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
index c247ed0df9..ccca0d9700 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
@@ -14,7 +14,7 @@
  */
 
 #include <bsp.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <assert.h>
 
 #include <stdio.h> /* for sprintf */
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c b/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
index 9d843439dd..a9187e1e7b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/vmeintr.c
@@ -14,7 +14,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
-#include <vmeintr.h>
+#include <rtems/vmeintr.h>
 
 /*PAGE
  *
diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/vectors.S b/c/src/lib/libbsp/powerpc/score603e/vectors/vectors.S
index de84e741bd..ace52ed89c 100644
--- a/c/src/lib/libbsp/powerpc/score603e/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/score603e/vectors/vectors.S
@@ -26,7 +26,7 @@
  */
 
 #include <bsp.h>
-#include <asm.h>
+#include <rtems/asm.h>
 
 #ifndef PPC_VECTOR_FILE_BASE
 #error "PPC_VECTOR_FILE_BASE is not defined."