Clean up the #include mess a little.

walsender.h should depend on xlog.h, not vice versa.  (Actually, the
inclusion was circular until a couple hours ago, which was even sillier;
but Bruce broke it in the expedient rather than logically correct
direction.)  Because of that poor decision, plus blind application of
pgrminclude, we had a situation where half the system was depending on
xlog.h to include such unrelated stuff as array.h and guc.h.  Clean up
the header inclusion, and manually revert a lot of what pgrminclude had
done so things build again.

This episode reinforces my feeling that pgrminclude should not be run
without adult supervision.  Inclusion changes in header files in particular
need to be reviewed with great care.  More generally, it'd be good if we
had a clearer notion of module layering to dictate which headers can sanely
include which others ... but that's a big task for another day.

6 files changed, 8 insertions, 0 deletions

diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index 06337e61149..a31479defb5 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -15,6 +15,8 @@
 #define COPY_H
 
 #include "nodes/execnodes.h"
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"
 
 /* CopyStateData is private in commands/copy.c */
 typedef struct CopyStateData *CopyState;
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index e704380b604..21dacff39c7 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -15,6 +15,7 @@
 #define DBCOMMANDS_H
 
 #include "access/xlog.h"
+#include "nodes/parsenodes.h"
 
 /* XLOG stuff */
 #define XLOG_DBASE_CREATE		0x00
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index 49605da63eb..87c57f4c873 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -14,6 +14,7 @@
 #ifndef PORTALCMDS_H
 #define PORTALCMDS_H
 
+#include "nodes/parsenodes.h"
 #include "utils/portal.h"
 
 
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index 1ef0f91e95a..85452b0cfdd 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -13,6 +13,8 @@
 #ifndef SEQUENCE_H
 #define SEQUENCE_H
 
+#include "nodes/parsenodes.h"
+#include "storage/relfilenode.h"
 #include "access/xlog.h"
 
 
diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h
index 5b1fb6eddc5..4692098a65f 100644
--- a/src/include/commands/tablespace.h
+++ b/src/include/commands/tablespace.h
@@ -15,6 +15,7 @@
 #define TABLESPACE_H
 
 #include "access/xlog.h"
+#include "nodes/parsenodes.h"
 
 /* XLOG stuff */
 #define XLOG_TBLSPC_CREATE		0x00
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index 3ac4a823ec1..fe21298b648 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -14,6 +14,7 @@
 #define TRIGGER_H
 
 #include "nodes/execnodes.h"
+#include "nodes/parsenodes.h"
 
 /*
  * TriggerData is the node type that is passed as fmgr "context" info