diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index ed9b3bb14a..ecfd479bd4 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* librdbg/src/i386/rdbg_cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>.
+	* librdbg/src/m68k/rdbg_cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>.
+	* librdbg/src/powerpc/rdbg_cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>.
+	* libchip/ide/ata.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libchip/ide/ide_controller.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libchip/shmdr/shm_driver.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
+	* libchip/serial/ns16550.c: Include <rtems/ringbuf.h> instead of <ringbuf.h>.
+
 2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* libchip/ide/ata.c, libchip/network/dec21140.c,
diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c
index 774d599cb1..3a7057af5b 100644
--- a/c/src/libchip/ide/ata.c
+++ b/c/src/libchip/ide/ata.c
@@ -16,7 +16,7 @@
  * 
  */
 #include <errno.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <assert.h>
 #include <string.h> /* for "memset" declaration */
 
diff --git a/c/src/libchip/ide/ide_controller.c b/c/src/libchip/ide/ide_controller.c
index b00c406ff3..bf64b4bb4e 100644
--- a/c/src/libchip/ide/ide_controller.c
+++ b/c/src/libchip/ide/ide_controller.c
@@ -14,7 +14,7 @@
  * $Id$
  *
  */
-#include <chain.h>
+#include <rtems/chain.h>
 #include <assert.h>
 #include <rtems/blkdev.h>
 
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index 81931cace7..53c7f0592f 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -23,7 +23,7 @@
 #include <rtems.h>
 #include <rtems/libio.h>
 #include <stdlib.h>
-#include <ringbuf.h>
+#include <rtems/ringbuf.h>
 
 #include <libchip/serial.h>
 #include <libchip/sersupp.h>
diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h
index 49a86de857..63f08c48ef 100644
--- a/c/src/libchip/shmdr/shm_driver.h
+++ b/c/src/libchip/shmdr/shm_driver.h
@@ -19,7 +19,7 @@
 #ifndef __SHM_h
 #define __SHM_h
 
-#include <clockdrv.h>
+#include <rtems/clockdrv.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/librdbg/src/i386/rdbg_cpu_asm.S b/c/src/librdbg/src/i386/rdbg_cpu_asm.S
index 073262f864..523ba1173e 100644
--- a/c/src/librdbg/src/i386/rdbg_cpu_asm.S
+++ b/c/src/librdbg/src/i386/rdbg_cpu_asm.S
@@ -7,7 +7,7 @@
  *
  */
 
-#include <asm.h>
+#include <rtems/asm.h>
 
         BEGIN_CODE
 
diff --git a/c/src/librdbg/src/m68k/rdbg_cpu_asm.S b/c/src/librdbg/src/m68k/rdbg_cpu_asm.S
index 69a609a141..50f529a19a 100644
--- a/c/src/librdbg/src/m68k/rdbg_cpu_asm.S
+++ b/c/src/librdbg/src/m68k/rdbg_cpu_asm.S
@@ -7,7 +7,7 @@
  *
  */
 
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>    
 
         BEGIN_CODE
diff --git a/c/src/librdbg/src/powerpc/rdbg_cpu_asm.S b/c/src/librdbg/src/powerpc/rdbg_cpu_asm.S
index 77b3316afc..4ffe49b64d 100644
--- a/c/src/librdbg/src/powerpc/rdbg_cpu_asm.S
+++ b/c/src/librdbg/src/powerpc/rdbg_cpu_asm.S
@@ -7,7 +7,7 @@
  *
  */
 
-#include <asm.h>
+#include <rtems/asm.h>
 #include <rtems/score/cpu.h>
 #include <libcpu/io.h>