3 files changed, 4 insertions, 2 deletions
diff --git a/testsuites/fstests/support/fstest.h b/testsuites/fstests/support/fstest.h
index 27402873b7..6342f75a21 100644
--- a/testsuites/fstests/support/fstest.h
+++ b/testsuites/fstests/support/fstest.h
@@ -12,8 +12,6 @@
 #ifndef __FSTEST_H
 #define __FSTEST_H
 
-#include "pmacros.h"
-
 #define TIME_PRECISION  (2)
 #define TIME_EQUAL(x,y) (abs((x)-(y))<TIME_PRECISION)
 
diff --git a/testsuites/fstests/support/fstest_support.c b/testsuites/fstests/support/fstest_support.c
index 2718915c56..5d8dd4c36a 100644
--- a/testsuites/fstests/support/fstest_support.c
+++ b/testsuites/fstests/support/fstest_support.c
@@ -18,6 +18,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h> /* exit */
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -27,6 +28,7 @@
 #include "fs_config.h"
 
 #include "fstest.h"
+#include "pmacros.h"
 
 #define TEMP_DIR "waterbuffalo"
 
diff --git a/testsuites/fstests/support/ramdisk_support.c b/testsuites/fstests/support/ramdisk_support.c
index 9a0d7556b7..02459ab939 100644
--- a/testsuites/fstests/support/ramdisk_support.c
+++ b/testsuites/fstests/support/ramdisk_support.c
@@ -19,6 +19,8 @@
 
 #include "ramdisk_support.h"
 #include "fstest.h"
+#include "pmacros.h"
+
 /*
  * Ramdisk information
  */