3 files changed, 6 insertions, 2 deletions
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index 6cdc9026bf..2019e2d790 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -29,6 +29,8 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
+AM_CPPFLAGS += -I$(top_srcdir)/include
+
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/testsuites/psxtests/psxreaddir/main.c b/testsuites/psxtests/psxreaddir/main.c
index c19138573a..4ce4bae422 100644
--- a/testsuites/psxtests/psxreaddir/main.c
+++ b/testsuites/psxtests/psxreaddir/main.c
@@ -5,6 +5,7 @@
 #define TEST_INIT
 
 #include <bsp.h>
+#include <pmacros.h>
 
 void test_main( void );
 
@@ -13,7 +14,7 @@ rtems_task Init(
 )
 {
   test_main();
-  exit( 0 );
+  rtems_test_exit( 0 );
 }
 
 /* configuration information */
diff --git a/testsuites/psxtests/psxreaddir/test.c b/testsuites/psxtests/psxreaddir/test.c
index 0bdc186e5f..f8615dc578 100644
--- a/testsuites/psxtests/psxreaddir/test.c
+++ b/testsuites/psxtests/psxreaddir/test.c
@@ -48,6 +48,7 @@ int scandir ( const char *dirname,
 
 #if defined(__rtems__)
 #define d_type d_reclen
+#include <pmacros.h>
 #endif
 
 void printdir( DIR *directory )
@@ -495,6 +496,6 @@ int main(
 
   test_across_mount();
   printf( "\n\n*** END OF READDIR TEST ***\n" );
-  exit(0);
+  rtems_test_exit(0);
 }