diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h
index c3082beb4a..fb9b5aebbe 100644
--- a/src/interfaces/ecpg/ecpglib/extern.h
+++ b/src/interfaces/ecpg/ecpglib/extern.h
@@ -3,12 +3,12 @@
 #ifndef _ECPG_LIB_EXTERN_H
 #define _ECPG_LIB_EXTERN_H
 
-#include "postgres_fe.h"
 #include "libpq-fe.h"
 #include "sqlca.h"
 #include "sqlda-native.h"
 #include "sqlda-compat.h"
 #include "ecpg_config.h"
+
 #ifndef CHAR_BIT
 #include <limits.h>
 #endif
diff --git a/src/interfaces/ecpg/test/pg_regress_ecpg.c b/src/interfaces/ecpg/test/pg_regress_ecpg.c
index b3ff76c446..b6ecb618e6 100644
--- a/src/interfaces/ecpg/test/pg_regress_ecpg.c
+++ b/src/interfaces/ecpg/test/pg_regress_ecpg.c
@@ -16,9 +16,12 @@
  *-------------------------------------------------------------------------
  */
 
+#include "postgres_fe.h"
+
 #include "pg_regress.h"
 
 #define LINEBUFSIZE 300
+
 static void
 ecpg_filter(const char *sourcefile, const char *outfile)
 {
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 360956d6eb..b8ec3418c5 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -21,7 +21,6 @@
 #define LIBPQ_INT_H
 
 /* We assume libpq-fe.h has already been included. */
-#include "postgres_fe.h"
 #include "libpq-events.h"
 
 #include <time.h>
diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c
index 46b48ee855..8a3d7f51b3 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 d4d00d9c66..c393ae1f51 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 62433b158f..f7745b16e1 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 6106c6bbda..298ed758ee 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"
 
 /*