diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index c8dc0f537d..4839fa9bc7 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* psxcancel/init.c: Include <rtems/console.h> instead of <console.h>.
+	* psxmount/test.c: Include <rtems/imfs.h> instead of <imfs.h>.
+	* psxreaddir/test.c: Include <rtems/imfs.h> instead of <imfs.h>.
+	* psxstat/test.c: Include <rtems/imfs.h> instead of <imfs.h>.
+
 2004-03-30	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* psx06/init.c, psx06/system.h, psx06/task.c, psx06/task2.c: Convert
diff --git a/testsuites/psxtests/psxcancel/init.c b/testsuites/psxtests/psxcancel/init.c
index 3cf857fafa..2a7cc36c68 100644
--- a/testsuites/psxtests/psxcancel/init.c
+++ b/testsuites/psxtests/psxcancel/init.c
@@ -46,7 +46,7 @@ rtems_task Init( rtems_task_argument argument);
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 5
 #define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 5
 
-#include <console.h>
+#include <rtems/console.h>
 #include <confdefs.h>
 
 #endif /* __rtems__ */
diff --git a/testsuites/psxtests/psxmount/test.c b/testsuites/psxtests/psxmount/test.c
index bf4a704c26..59b0b16f44 100644
--- a/testsuites/psxtests/psxmount/test.c
+++ b/testsuites/psxtests/psxmount/test.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <rtems.h>
 #include <rtems/libio.h>
-#include <imfs.h>
+#include <rtems/imfs.h>
 #include <pmacros.h>
 
 extern rtems_filesystem_location_info_t rtems_filesystem_current;
diff --git a/testsuites/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c
index bc790c5233..6098a10109 100644
--- a/testsuites/psxtests/psxreaddir/test.c
+++ b/testsuites/psxtests/psxreaddir/test.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <errno.h>
-#include <imfs.h>
+#include <rtems/imfs.h>
 #include <assert.h>
 
 DIR *directory;
diff --git a/testsuites/psxtests/psxstat/test.c b/testsuites/psxtests/psxstat/test.c
index f6189d4782..84402e2a56 100644
--- a/testsuites/psxtests/psxstat/test.c
+++ b/testsuites/psxtests/psxstat/test.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <rtems.h>
 #include <rtems/libio.h>
-#include <imfs.h>
+#include <rtems/imfs.h>
 #include <pmacros.h>
 
 #define MAXSYMLINK 5   /* There needs to be a better way of getting this. */