4 files changed, 7 insertions, 2 deletions
diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c
index 46b48ee8557..8a3d7f51b39 100644
--- a/src/test/isolation/isolation_main.c
+++ b/src/test/isolation/isolation_main.c
@@ -10,6 +10,8 @@
  *-------------------------------------------------------------------------
  */
 
+#include "postgres_fe.h"
+
 #include "pg_regress.h"
 
 char		saved_argv0[MAXPGPATH];
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index d4d00d9c66f..c393ae1f511 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -16,7 +16,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include "pg_regress.h"
+#include "postgres_fe.h"
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -29,6 +29,8 @@
 #include <sys/resource.h>
 #endif
 
+#include "pg_regress.h"
+
 #include "common/restricted_token.h"
 #include "common/username.h"
 #include "getopt_long.h"
diff --git a/src/test/regress/pg_regress.h b/src/test/regress/pg_regress.h
index 62433b158f6..f7745b16e11 100644
--- a/src/test/regress/pg_regress.h
+++ b/src/test/regress/pg_regress.h
@@ -8,7 +8,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres_fe.h"
 #include <unistd.h>
 
 #ifndef WIN32
diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
index 6106c6bbda2..298ed758eeb 100644
--- a/src/test/regress/pg_regress_main.c
+++ b/src/test/regress/pg_regress_main.c
@@ -16,6 +16,8 @@
  *-------------------------------------------------------------------------
  */
 
+#include "postgres_fe.h"
+
 #include "pg_regress.h"
 
 /*