diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index 6ba3f44e2cb..ce7b93f9e5e 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -8,10 +8,9 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include "postgres_fe.h"
 #include <setjmp.h>
-#include "libpq-fe.h"
 
+#include "libpq-fe.h"
 #include "print.h"
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl
index b9b8e870e02..f3d8141b994 100644
--- a/src/bin/psql/create_help.pl
+++ b/src/bin/psql/create_help.pl
@@ -59,7 +59,6 @@ print HFILE "/*
 #ifndef $define
 #define $define
 
-#include \"postgres_fe.h\"
 #include \"pqexpbuffer.h\"
 
 struct _helpStruct
@@ -84,6 +83,7 @@ print CFILE "/*
 
 #define N_(x) (x)				/* gettext noop */
 
+#include \"postgres_fe.h\"
 #include \"$hfile\"
 
 ";
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index 09747f85cab..e6476ca7c6c 100644
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -8,8 +8,6 @@
 #ifndef MAINLOOP_H
 #define MAINLOOP_H
 
-#include "postgres_fe.h"
-
-int			MainLoop(FILE *source);
+extern int	MainLoop(FILE *source);
 
 #endif   /* MAINLOOP_H */