2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org>

	* libblock/include/rtems/bdbuf.h: Include <rtems/chain.h> instead of <chain.h>.
	* libblock/include/rtems/ide_part_table.h: Include <rtems/chain.h> instead of <chain.h>.
	* libcsupport/src/malloc.c: Include <rtems/chain.h> instead of <chain.h>.
	* libcsupport/src/mount.c: Include <rtems/chain.h> instead of <chain.h>.
	* libcsupport/src/unmount.c: Include <rtems/chain.h> instead of <chain.h>.
	* libfs/src/imfs/imfs.h: Include <rtems/chain.h> instead of <chain.h>.
	* libfs/src/imfs/imfs_directory.c: Include <rtems/chain.h> instead of <chain.h>.
	* libfs/src/imfs/imfs_load_tar.c: Include <rtems/chain.h> instead of <chain.h>.
	* sapi/include/confdefs.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
	* sapi/include/confdefs.h: Include <rtems/console.h> instead of <console.h>.
	* libfs/src/imfs/imfs_load_tar.c: Include <rtems/imfs.h> instead of <imfs.h>.
	* libmisc/shell/cmds.c: Include <rtems/imfs.h> instead of <imfs.h>.
	* libmisc/fsmount/fsmount.c: Include <rtems/imfs.h> instead of <imfs.h>.
	* sapi/include/confdefs.h: Include <rtems/imfs.h> instead of <imfs.h>.
	* itron/src/can_wup.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/chg_pri.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/cre_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/cre_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/cre_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/cre_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/del_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/del_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/del_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/del_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/dis_dsp.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ena_dsp.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/eventflags.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/exd_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ext_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/fmempool.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/frsm_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/get_tid.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/itronintr.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/itronsem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/itrontime.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/mbox.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/mboxtranslatereturncode.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/msgbuffer.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/msgbuffertranslatereturncode.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/network.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/port.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/prcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/prcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/preq_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/psnd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/rcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/rcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ref_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ref_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ref_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ref_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/rel_wai.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/rot_rdq.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/rsm_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/sig_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/slp_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/snd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/snd_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/sta_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/sus_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/sysmgmt.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/task.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/ter_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/trcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/trcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/tslp_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/tsnd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/twai_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/vmempool.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/wai_sem.c: Include <rtems/itron.h> instead of <itron.h>.
	* itron/src/wup_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
	* sapi/include/rtems/config.h: Include <rtems/itron.h> instead of <itron.h>.
	* sapi/include/confdefs.h: Include <rtems/itron.h> instead of <itron.h>.
	* sapi/src/itronapi.c: Include <rtems/itron.h> instead of <itron.h>.
	* sapi/include/confdefs.h: Include <rtems/rtc.h> instead of <rtc.h>.
	* sapi/include/confdefs.h: Include <rtems/timerdrv.h> instead of <timerdrv.h>.

71 files changed, 155 insertions, 76 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index f05671c5c3..48e11ad8b2 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,84 @@
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
+	* libblock/include/rtems/bdbuf.h: Include <rtems/chain.h> instead of <chain.h>.
+	* libblock/include/rtems/ide_part_table.h: Include <rtems/chain.h> instead of <chain.h>.
+	* libcsupport/src/malloc.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libcsupport/src/mount.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libcsupport/src/unmount.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libfs/src/imfs/imfs.h: Include <rtems/chain.h> instead of <chain.h>.
+	* libfs/src/imfs/imfs_directory.c: Include <rtems/chain.h> instead of <chain.h>.
+	* libfs/src/imfs/imfs_load_tar.c: Include <rtems/chain.h> instead of <chain.h>.
+	* sapi/include/confdefs.h: Include <rtems/clockdrv.h> instead of <clockdrv.h>.
+	* sapi/include/confdefs.h: Include <rtems/console.h> instead of <console.h>.
+	* libfs/src/imfs/imfs_load_tar.c: Include <rtems/imfs.h> instead of <imfs.h>.
+	* libmisc/shell/cmds.c: Include <rtems/imfs.h> instead of <imfs.h>.
+	* libmisc/fsmount/fsmount.c: Include <rtems/imfs.h> instead of <imfs.h>.
+	* sapi/include/confdefs.h: Include <rtems/imfs.h> instead of <imfs.h>.
+	* itron/src/can_wup.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/chg_pri.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/cre_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/cre_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/cre_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/cre_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/del_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/del_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/del_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/del_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/dis_dsp.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ena_dsp.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/eventflags.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/exd_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ext_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/fmempool.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/frsm_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/get_tid.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/itronintr.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/itronsem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/itrontime.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/mbox.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/mboxtranslatereturncode.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/msgbuffer.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/msgbuffertranslatereturncode.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/network.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/port.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/prcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/prcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/preq_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/psnd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/rcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/rcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ref_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ref_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ref_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ref_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/rel_wai.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/rot_rdq.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/rsm_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/sig_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/slp_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/snd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/snd_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/sta_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/sus_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/sysmgmt.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/task.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/ter_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/trcv_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/trcv_mbx.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/tslp_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/tsnd_mbf.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/twai_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/vmempool.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/wai_sem.c: Include <rtems/itron.h> instead of <itron.h>.
+	* itron/src/wup_tsk.c: Include <rtems/itron.h> instead of <itron.h>.
+	* sapi/include/rtems/config.h: Include <rtems/itron.h> instead of <itron.h>.
+	* sapi/include/confdefs.h: Include <rtems/itron.h> instead of <itron.h>.
+	* sapi/src/itronapi.c: Include <rtems/itron.h> instead of <itron.h>.
+	* sapi/include/confdefs.h: Include <rtems/rtc.h> instead of <rtc.h>.
+	* sapi/include/confdefs.h: Include <rtems/timerdrv.h> instead of <timerdrv.h>.
+
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
 	* backward/asm.h, backward/chain.h, backward/clockdrv.h,
 	backward/console.h, backward/dosfs.h, backward/imfs.h,
 	backward/iosupp.h, backward/itron.h, backward/ringbuf.h,
diff --git a/cpukit/itron/src/can_wup.c b/cpukit/itron/src/can_wup.c
index 0747939873..d769430ddf 100644
--- a/cpukit/itron/src/can_wup.c
+++ b/cpukit/itron/src/can_wup.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/chg_pri.c b/cpukit/itron/src/chg_pri.c
index 1fc6527202..efbd18ec71 100644
--- a/cpukit/itron/src/chg_pri.c
+++ b/cpukit/itron/src/chg_pri.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/cre_mbf.c b/cpukit/itron/src/cre_mbf.c
index dfd053cfa1..1cf088155a 100644
--- a/cpukit/itron/src/cre_mbf.c
+++ b/cpukit/itron/src/cre_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/cre_mbx.c b/cpukit/itron/src/cre_mbx.c
index a23721afa6..abc2cd1bfe 100644
--- a/cpukit/itron/src/cre_mbx.c
+++ b/cpukit/itron/src/cre_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/cre_sem.c b/cpukit/itron/src/cre_sem.c
index 7b6c5124ee..3e6e005728 100644
--- a/cpukit/itron/src/cre_sem.c
+++ b/cpukit/itron/src/cre_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/cre_tsk.c b/cpukit/itron/src/cre_tsk.c
index 465eb1565c..44dd1b9731 100644
--- a/cpukit/itron/src/cre_tsk.c
+++ b/cpukit/itron/src/cre_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/del_mbf.c b/cpukit/itron/src/del_mbf.c
index 73bf7a0de9..81996703b2 100644
--- a/cpukit/itron/src/del_mbf.c
+++ b/cpukit/itron/src/del_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/del_mbx.c b/cpukit/itron/src/del_mbx.c
index a934e417b8..e06bea2fb5 100644
--- a/cpukit/itron/src/del_mbx.c
+++ b/cpukit/itron/src/del_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/del_sem.c b/cpukit/itron/src/del_sem.c
index ccf1ae4857..55e6d55d69 100644
--- a/cpukit/itron/src/del_sem.c
+++ b/cpukit/itron/src/del_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/del_tsk.c b/cpukit/itron/src/del_tsk.c
index dc87fdd5c0..04c05d6ca3 100644
--- a/cpukit/itron/src/del_tsk.c
+++ b/cpukit/itron/src/del_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/dis_dsp.c b/cpukit/itron/src/dis_dsp.c
index d73e92f82c..00db32ce0c 100644
--- a/cpukit/itron/src/dis_dsp.c
+++ b/cpukit/itron/src/dis_dsp.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/ena_dsp.c b/cpukit/itron/src/ena_dsp.c
index 35289f92b2..03d424d418 100644
--- a/cpukit/itron/src/ena_dsp.c
+++ b/cpukit/itron/src/ena_dsp.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/eventflags.c b/cpukit/itron/src/eventflags.c
index 0c502a94b1..e3e01a70fd 100644
--- a/cpukit/itron/src/eventflags.c
+++ b/cpukit/itron/src/eventflags.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/eventflags.h>
 
diff --git a/cpukit/itron/src/exd_tsk.c b/cpukit/itron/src/exd_tsk.c
index b75aca2106..d7ed8a0961 100644
--- a/cpukit/itron/src/exd_tsk.c
+++ b/cpukit/itron/src/exd_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 #include <assert.h>
 
 #include <rtems/score/thread.h>
diff --git a/cpukit/itron/src/ext_tsk.c b/cpukit/itron/src/ext_tsk.c
index f4c6fc5fb4..941874dfde 100644
--- a/cpukit/itron/src/ext_tsk.c
+++ b/cpukit/itron/src/ext_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/fmempool.c b/cpukit/itron/src/fmempool.c
index 1b568709d4..b756d52479 100644
--- a/cpukit/itron/src/fmempool.c
+++ b/cpukit/itron/src/fmempool.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/fmempool.h>
 
diff --git a/cpukit/itron/src/frsm_tsk.c b/cpukit/itron/src/frsm_tsk.c
index ba52eb1f04..ffa9751be2 100644
--- a/cpukit/itron/src/frsm_tsk.c
+++ b/cpukit/itron/src/frsm_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/get_tid.c b/cpukit/itron/src/get_tid.c
index 7a01f98112..baf7609921 100644
--- a/cpukit/itron/src/get_tid.c
+++ b/cpukit/itron/src/get_tid.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/itronintr.c b/cpukit/itron/src/itronintr.c
index e83c4b6300..4de5cfa13c 100644
--- a/cpukit/itron/src/itronintr.c
+++ b/cpukit/itron/src/itronintr.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/intr.h>
 
diff --git a/cpukit/itron/src/itronsem.c b/cpukit/itron/src/itronsem.c
index 38b3ad2d60..f77cf90e76 100644
--- a/cpukit/itron/src/itronsem.c
+++ b/cpukit/itron/src/itronsem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/itrontime.c b/cpukit/itron/src/itrontime.c
index efc794fe3e..3a9fa961c2 100644
--- a/cpukit/itron/src/itrontime.c
+++ b/cpukit/itron/src/itrontime.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/tod.h>
diff --git a/cpukit/itron/src/mbox.c b/cpukit/itron/src/mbox.c
index 793b782d36..67d240e970 100644
--- a/cpukit/itron/src/mbox.c
+++ b/cpukit/itron/src/mbox.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/mboxtranslatereturncode.c b/cpukit/itron/src/mboxtranslatereturncode.c
index bafa14f45e..acd34f8b24 100644
--- a/cpukit/itron/src/mboxtranslatereturncode.c
+++ b/cpukit/itron/src/mboxtranslatereturncode.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/msgbuffer.c b/cpukit/itron/src/msgbuffer.c
index d6739f719c..7292d69fed 100644
--- a/cpukit/itron/src/msgbuffer.c
+++ b/cpukit/itron/src/msgbuffer.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/msgbuffertranslatereturncode.c b/cpukit/itron/src/msgbuffertranslatereturncode.c
index 408eca09b0..4623f2742a 100644
--- a/cpukit/itron/src/msgbuffertranslatereturncode.c
+++ b/cpukit/itron/src/msgbuffertranslatereturncode.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/network.c b/cpukit/itron/src/network.c
index b249ce32c6..11cd63ba20 100644
--- a/cpukit/itron/src/network.c
+++ b/cpukit/itron/src/network.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/network.h>
 
diff --git a/cpukit/itron/src/port.c b/cpukit/itron/src/port.c
index e4d91bdf3d..63327abfdd 100644
--- a/cpukit/itron/src/port.c
+++ b/cpukit/itron/src/port.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/port.h>
 
diff --git a/cpukit/itron/src/prcv_mbf.c b/cpukit/itron/src/prcv_mbf.c
index 71371f8075..e095d2ccb4 100644
--- a/cpukit/itron/src/prcv_mbf.c
+++ b/cpukit/itron/src/prcv_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/prcv_mbx.c b/cpukit/itron/src/prcv_mbx.c
index 2b5378e794..4986ae3744 100644
--- a/cpukit/itron/src/prcv_mbx.c
+++ b/cpukit/itron/src/prcv_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/preq_sem.c b/cpukit/itron/src/preq_sem.c
index 86df709ed7..d8bf014e9a 100644
--- a/cpukit/itron/src/preq_sem.c
+++ b/cpukit/itron/src/preq_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/psnd_mbf.c b/cpukit/itron/src/psnd_mbf.c
index 4ff0a5cd44..94dd994aec 100644
--- a/cpukit/itron/src/psnd_mbf.c
+++ b/cpukit/itron/src/psnd_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/rcv_mbf.c b/cpukit/itron/src/rcv_mbf.c
index fbd99375a1..6427f36250 100644
--- a/cpukit/itron/src/rcv_mbf.c
+++ b/cpukit/itron/src/rcv_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/rcv_mbx.c b/cpukit/itron/src/rcv_mbx.c
index 51f54fb107..d9e4f4b76a 100644
--- a/cpukit/itron/src/rcv_mbx.c
+++ b/cpukit/itron/src/rcv_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/ref_mbf.c b/cpukit/itron/src/ref_mbf.c
index 1775f22acc..00bbcb5ddd 100644
--- a/cpukit/itron/src/ref_mbf.c
+++ b/cpukit/itron/src/ref_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/ref_mbx.c b/cpukit/itron/src/ref_mbx.c
index c3a7bed570..2f469987ec 100644
--- a/cpukit/itron/src/ref_mbx.c
+++ b/cpukit/itron/src/ref_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/ref_sem.c b/cpukit/itron/src/ref_sem.c
index 1f1b75b587..250f6c20e4 100644
--- a/cpukit/itron/src/ref_sem.c
+++ b/cpukit/itron/src/ref_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/ref_tsk.c b/cpukit/itron/src/ref_tsk.c
index 9c490c4350..e01c2489e2 100644
--- a/cpukit/itron/src/ref_tsk.c
+++ b/cpukit/itron/src/ref_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/rel_wai.c b/cpukit/itron/src/rel_wai.c
index 197fa59c8f..b63691e915 100644
--- a/cpukit/itron/src/rel_wai.c
+++ b/cpukit/itron/src/rel_wai.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/rot_rdq.c b/cpukit/itron/src/rot_rdq.c
index cad8fac83c..6309184b60 100644
--- a/cpukit/itron/src/rot_rdq.c
+++ b/cpukit/itron/src/rot_rdq.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/rsm_tsk.c b/cpukit/itron/src/rsm_tsk.c
index 888b18e3ed..234282a180 100644
--- a/cpukit/itron/src/rsm_tsk.c
+++ b/cpukit/itron/src/rsm_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/sig_sem.c b/cpukit/itron/src/sig_sem.c
index 52697c4f33..cde504891c 100644
--- a/cpukit/itron/src/sig_sem.c
+++ b/cpukit/itron/src/sig_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/slp_tsk.c b/cpukit/itron/src/slp_tsk.c
index c3ec5ef09e..917ef11157 100644
--- a/cpukit/itron/src/slp_tsk.c
+++ b/cpukit/itron/src/slp_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/snd_mbf.c b/cpukit/itron/src/snd_mbf.c
index 021fca869e..f9df6f6b53 100644
--- a/cpukit/itron/src/snd_mbf.c
+++ b/cpukit/itron/src/snd_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/snd_mbx.c b/cpukit/itron/src/snd_mbx.c
index 936d532906..6d1abb5e41 100644
--- a/cpukit/itron/src/snd_mbx.c
+++ b/cpukit/itron/src/snd_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/sta_tsk.c b/cpukit/itron/src/sta_tsk.c
index 11eab7075b..017346a952 100644
--- a/cpukit/itron/src/sta_tsk.c
+++ b/cpukit/itron/src/sta_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/sus_tsk.c b/cpukit/itron/src/sus_tsk.c
index 967d427077..2fb5d39bf0 100644
--- a/cpukit/itron/src/sus_tsk.c
+++ b/cpukit/itron/src/sus_tsk.c
@@ -14,7 +14,7 @@
 #endif
 
 #include <limits.h>
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/sysmgmt.c b/cpukit/itron/src/sysmgmt.c
index 3364def882..2023dea099 100644
--- a/cpukit/itron/src/sysmgmt.c
+++ b/cpukit/itron/src/sysmgmt.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/sysmgmt.h>
 
diff --git a/cpukit/itron/src/task.c b/cpukit/itron/src/task.c
index 734fffb85a..7190a2c343 100644
--- a/cpukit/itron/src/task.c
+++ b/cpukit/itron/src/task.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/ter_tsk.c b/cpukit/itron/src/ter_tsk.c
index 0cf56d9304..d2c86a4e6b 100644
--- a/cpukit/itron/src/ter_tsk.c
+++ b/cpukit/itron/src/ter_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/trcv_mbf.c b/cpukit/itron/src/trcv_mbf.c
index fd10a42c5a..c53604fbe5 100644
--- a/cpukit/itron/src/trcv_mbf.c
+++ b/cpukit/itron/src/trcv_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/trcv_mbx.c b/cpukit/itron/src/trcv_mbx.c
index 46a4894825..0ffd2e6912 100644
--- a/cpukit/itron/src/trcv_mbx.c
+++ b/cpukit/itron/src/trcv_mbx.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/mbox.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/tslp_tsk.c b/cpukit/itron/src/tslp_tsk.c
index f3d06c4f79..abb12f84ed 100644
--- a/cpukit/itron/src/tslp_tsk.c
+++ b/cpukit/itron/src/tslp_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/itron/src/tsnd_mbf.c b/cpukit/itron/src/tsnd_mbf.c
index 46ed5d3fa4..841d0b8756 100644
--- a/cpukit/itron/src/tsnd_mbf.c
+++ b/cpukit/itron/src/tsnd_mbf.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/msgbuffer.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/twai_sem.c b/cpukit/itron/src/twai_sem.c
index fa88bb1903..2ad18fbbc5 100644
--- a/cpukit/itron/src/twai_sem.c
+++ b/cpukit/itron/src/twai_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/vmempool.c b/cpukit/itron/src/vmempool.c
index 8238d94514..db68237c96 100644
--- a/cpukit/itron/src/vmempool.c
+++ b/cpukit/itron/src/vmempool.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/vmempool.h>
 
diff --git a/cpukit/itron/src/wai_sem.c b/cpukit/itron/src/wai_sem.c
index 4952672c54..6da8e8a870 100644
--- a/cpukit/itron/src/wai_sem.c
+++ b/cpukit/itron/src/wai_sem.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/itron/semaphore.h>
 #include <rtems/itron/task.h>
diff --git a/cpukit/itron/src/wup_tsk.c b/cpukit/itron/src/wup_tsk.c
index 22b7403f3b..0884038fde 100644
--- a/cpukit/itron/src/wup_tsk.c
+++ b/cpukit/itron/src/wup_tsk.c
@@ -13,7 +13,7 @@
 #include "config.h"
 #endif
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <rtems/score/thread.h>
 #include <rtems/score/userext.h>
diff --git a/cpukit/libblock/include/rtems/bdbuf.h b/cpukit/libblock/include/rtems/bdbuf.h
index 4405e17e34..737c6afe7e 100644
--- a/cpukit/libblock/include/rtems/bdbuf.h
+++ b/cpukit/libblock/include/rtems/bdbuf.h
@@ -15,7 +15,7 @@ extern "C" {
 
 #include <rtems.h>
 #include <rtems/libio.h>
-#include <chain.h>
+#include <rtems/chain.h>
 
 #include "rtems/blkdev.h"
 #include "rtems/diskdevs.h"
diff --git a/cpukit/libblock/include/rtems/ide_part_table.h b/cpukit/libblock/include/rtems/ide_part_table.h
index 6c3af11639..88ffc93105 100644
--- a/cpukit/libblock/include/rtems/ide_part_table.h
+++ b/cpukit/libblock/include/rtems/ide_part_table.h
@@ -22,7 +22,7 @@
 #define __RTEMS_IDE_PART_TABLE_H__
 
 #include <assert.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index 316f6e3439..038cec7bc3 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/malloc.c
@@ -33,7 +33,7 @@
 
 #include <unistd.h>    /* sbrk(2) */
 
-#include <chain.h>
+#include <rtems/chain.h>
 
 Chain_Control RTEMS_Malloc_GC_list;
 
diff --git a/cpukit/libcsupport/src/mount.c b/cpukit/libcsupport/src/mount.c
index bd06517a51..01ea2ea7cb 100644
--- a/cpukit/libcsupport/src/mount.c
+++ b/cpukit/libcsupport/src/mount.c
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c
index 1c1b9d2e79..234f7ea10f 100644
--- a/cpukit/libcsupport/src/unmount.c
+++ b/cpukit/libcsupport/src/unmount.c
@@ -22,7 +22,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h
index ef4d8a60b1..d2ee3fa5a6 100644
--- a/cpukit/libfs/src/imfs/imfs.h
+++ b/cpukit/libfs/src/imfs/imfs.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 #include <rtems.h>
-#include <chain.h>
+#include <rtems/chain.h>
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c
index 0991784e58..d3533d8651 100644
--- a/cpukit/libfs/src/imfs/imfs_directory.c
+++ b/cpukit/libfs/src/imfs/imfs_directory.c
@@ -17,7 +17,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <chain.h>
+#include <rtems/chain.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/cpukit/libfs/src/imfs/imfs_load_tar.c b/cpukit/libfs/src/imfs/imfs_load_tar.c
index afbf2b0291..80f93f1dfa 100644
--- a/cpukit/libfs/src/imfs/imfs_load_tar.c
+++ b/cpukit/libfs/src/imfs/imfs_load_tar.c
@@ -22,8 +22,8 @@
 
 #include <rtems.h>
 #include <rtems/libio_.h>
-#include <chain.h>
-#include <imfs.h>
+#include <rtems/chain.h>
+#include <rtems/imfs.h>
 
 
 /**************************************************************************
diff --git a/cpukit/libmisc/fsmount/fsmount.c b/cpukit/libmisc/fsmount/fsmount.c
index 0b5bdb97ab..8d5c6ead64 100644
--- a/cpukit/libmisc/fsmount/fsmount.c
+++ b/cpukit/libmisc/fsmount/fsmount.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <imfs.h>
+#include <rtems/imfs.h>
 #include <sys/stat.h>
 
 /*=========================================================================*\
diff --git a/cpukit/libmisc/shell/cmds.c b/cpukit/libmisc/shell/cmds.c
index 611458bba7..beffef38c5 100644
--- a/cpukit/libmisc/shell/cmds.c
+++ b/cpukit/libmisc/shell/cmds.c
@@ -46,7 +46,7 @@
 #include <rtems/monitor.h>
 #include <rtems/score/tod.h>
 
-#include <imfs.h>
+#include <rtems/imfs.h>
 #include <rtems/shell.h>
 
 /* ----------------------------------------------- *
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index e568e9ff2a..14e331c901 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -104,7 +104,7 @@ uint32_t   rtems_libio_number_iops = CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS;
  *  Mount Table Configuration
  */
 
-#include <imfs.h>
+#include <rtems/imfs.h>
 
 #ifdef CONFIGURE_INIT
 
@@ -260,19 +260,19 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
  { NULL, NULL, NULL, NULL, NULL, NULL }
 
 #ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#include <console.h>
+#include <rtems/console.h>
 #endif
 
 #ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#include <clockdrv.h>
+#include <rtems/clockdrv.h>
 #endif
 
 #ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#include <timerdrv.h>
+#include <rtems/timerdrv.h>
 #endif
 
 #ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
-#include <rtc.h>
+#include <rtems/rtc.h>
 #endif
 
 #ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
@@ -630,7 +630,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = {
 
 #ifdef RTEMS_ITRON_API
 
-#include <itron.h>
+#include <rtems/itron.h>
 #include <rtems/itron/config.h>
 #include <rtems/itron/eventflags.h>
 #include <rtems/itron/fmempool.h>
diff --git a/cpukit/sapi/include/rtems/config.h b/cpukit/sapi/include/rtems/config.h
index da1881c617..cb4aab2087 100644
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/sapi/include/rtems/config.h
@@ -46,7 +46,7 @@ typedef void *posix_api_configuration_table;
 #endif
 
 #ifdef RTEMS_ITRON_API
-#include <itron.h>
+#include <rtems/itron.h>
 #include <rtems/itron/config.h>
 #else
 typedef void *itron_api_configuration_table;
diff --git a/cpukit/sapi/src/itronapi.c b/cpukit/sapi/src/itronapi.c
index 87bf7b9f36..580317d8b4 100644
--- a/cpukit/sapi/src/itronapi.c
+++ b/cpukit/sapi/src/itronapi.c
@@ -25,7 +25,7 @@
 #include <rtems/system.h>    /* include this before checking RTEMS_ITRON_API */
 #ifdef RTEMS_ITRON_API
 
-#include <itron.h>
+#include <rtems/itron.h>
 
 #include <sys/types.h>
 #include <rtems/config.h>