2 files changed, 4 insertions, 8 deletions
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
index 9a8c66d2df..cfe6057bc1 100644
--- a/testsuites/sptests/spsize/init.c
+++ b/testsuites/sptests/spsize/init.c
@@ -42,7 +42,7 @@ rtems_task Init(
   puts( "\n*** RTEMS SIZE PROGRAM ***" );
   size_rtems( 1 );
   puts( "*** END OF RTEMS SIZE PROGRAM ***" );
-  exit( 0 );
+  rtems_test_exit( 0 );
 #if defined(HAVE_MENU)
   do {
     printf( "\n\nPlease select program mode:\n" );
@@ -55,7 +55,7 @@ rtems_task Init(
     switch( choice ) {
       case 1: size_rtems( 1 );  break;
       case 2: size_rtems( 0 );  break;
-      case 3: exit( 0 );
+      case 3: rtems_test_exit( 0 );
       default:  continue;
     }
   } while ( FOREVER );
diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c
index 2390cc6de8..5ffe538107 100644
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -46,6 +46,8 @@
 #include <rtems/score/wkspace.h>
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <tmacros.h>
 
 /* These are always defined by the executive.
  *
@@ -126,12 +128,6 @@
 
 rtems_unsigned32 sys_req;
 
-/* to avoid warnings */
-int puts();
-int printf();
-int getint();
-#undef getchar
-int getchar();
 void help_size();
 void print_formula();