6 files changed, 14 insertions, 9 deletions
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index f65fb33888..a19555cf4c 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -21,6 +21,7 @@
 
 #include "postgres.h"
 
+#include "optimizer/geqo_misc.h"
 
 
 #ifdef GEQO_DEBUG
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index 9d0cbc47d9..cee5e4d425 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -17,6 +17,7 @@
 #include <ctype.h>
 
 #include "nodes/parsenodes.h"
+#include "parser/gramparse.h"	/* required before parser/parse.h! */
 #include "parser/keywords.h"
 #include "parser/parse.h"
 
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 0ea194d09c..c8901755eb 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -21,7 +21,7 @@
 
 #include "postgres.h"
 
-#include "parser/gramparse.h"
+#include "parser/gramparse.h"	/* required before parser/parse.h! */
 #include "parser/parse.h"
 #include "parser/parser.h"
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 847f4ab8d0..abf3086424 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -6,8 +6,6 @@
  * $PostgreSQL$
  */
 #include "postgres_fe.h"
-#include "common.h"
-#include "help.h"
 
 #include <signal.h>
 
@@ -23,10 +21,13 @@
 
 #include "pqsignal.h"
 
-#include "settings.h"
 #include "common.h"
+#include "help.h"
+#include "input.h"
+#include "settings.h"
 #include "sql_help.h"
 
+
 /*
  * PLEASE:
  * If you change something in this file, also make the same changes
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index ebb18c5ab6..817f39bf13 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -6,11 +6,6 @@
  * $PostgreSQL$
  */
 #include "postgres_fe.h"
-#include "prompt.h"
-
-
-#include "settings.h"
-#include "common.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -22,6 +17,12 @@
 #include <netdb.h>
 #endif
 
+#include "common.h"
+#include "input.h"
+#include "prompt.h"
+#include "settings.h"
+
+
 /*--------------------------
  * get_prompt
  *
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 6c13fe1657..a2ffccbf55 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -22,6 +22,7 @@
 #ifndef GEQO_MISC_H
 #define GEQO_MISC_H
 
+#include "optimizer/geqo.h"
 #include "optimizer/geqo_recombination.h"
 
 #ifdef GEQO_DEBUG