diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index 2a1197275e..9b37b41a75 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* bootloader/exception.S: Include <rtems/asm.h> instead of <asm.h>.
+	* bootloader/head.S: Include <rtems/asm.h> instead of <asm.h>.
+	* irq/irq_asm.S: Include <rtems/asm.h> instead of <asm.h>.
+	* start/rtems_crti.S: Include <rtems/asm.h> instead of <asm.h>.
+	* start/start.S: Include <rtems/asm.h> instead of <asm.h>.
+	* vectors/vectors.S: Include <rtems/asm.h> instead of <asm.h>.
+	* include/bsp.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
+	* include/bsp.h: Include <rtems/console.h> instead of <console.h>.
+
 2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* bootloader/misc.c, bootloader/pci.c, console/inch.c,
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S b/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S
index cc4217ea36..059c62cd32 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/exception.S
@@ -104,7 +104,7 @@
  */
 #define DIRTY_MEANS_WRITABLE 	
 	
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include "bootldr.h"
 
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
index 3d5d010fb5..b0eeb0e550 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S
@@ -15,7 +15,7 @@
  * $Id$
  */
 
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include "bootldr.h"
 
diff --git a/c/src/lib/libbsp/powerpc/shared/include/bsp.h b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
index e243bb7c62..85488eb076 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
@@ -15,9 +15,9 @@
 #include <bspopts.h>
 
 #include <rtems.h>
-#include <console.h>
+#include <rtems/console.h>
 #include <libcpu/io.h>
-#include <clockdrv.h>
+#include <rtems/clockdrv.h>
 #include <bsp/vectors.h>
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
index a2be56d753..e666001815 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
@@ -16,7 +16,7 @@
  * $Id$
  */
   	
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <bsp/vectors.h>
 #include <libcpu/raw_exception.h>
diff --git a/c/src/lib/libbsp/powerpc/shared/start/rtems_crti.S b/c/src/lib/libbsp/powerpc/shared/start/rtems_crti.S
index 0b606663c3..aa61ddc206 100644
--- a/c/src/lib/libbsp/powerpc/shared/start/rtems_crti.S
+++ b/c/src/lib/libbsp/powerpc/shared/start/rtems_crti.S
@@ -1,5 +1,5 @@
 /* rtems_crti.S */
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <libcpu/io.h>
 
diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S
index 7d6ccdd6ca..c986564cb7 100644
--- a/c/src/lib/libbsp/powerpc/shared/start/start.S
+++ b/c/src/lib/libbsp/powerpc/shared/start/start.S
@@ -11,7 +11,7 @@
  *
  */
 
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <libcpu/io.h>
 
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
index 7ba2fe408d..17c4ffecd6 100644
--- a/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/vectors.S
@@ -10,7 +10,7 @@
 	
 
 
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <bsp/vectors.h>