6 files changed, 12 insertions, 21 deletions
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 21114d2455d..ca324c94b12 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $
+ * $Id: execnodes.h,v 1.31 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include <nodes/memnodes.h>
 #include <nodes/primnodes.h>
 #include <executor/hashjoin.h>
 #include <access/relscan.h>
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 4cc34024a7c..7ea2e7e1420 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $
+ * $Id: makefuncs.h,v 1.19 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MAKEFUNC_H
 #define MAKEFUNC_H
 
-#include <nodes/primnodes.h>
 #include <nodes/parsenodes.h>
-#include <utils/fcache.h>
 
 extern Oper *makeOper(Oid opno,
 		 Oid opid,
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index da59725063a..528924ad41d 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.8 1999/02/13 23:21:38 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.9 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-#include <nodes/nodes.h>
 #include <nodes/primnodes.h>
 
 extern bool single_node(Node *node);
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 8415069f0f6..322987c447c 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.49 1999/05/26 12:56:33 momjian Exp $
+ * $Id: nodes.h,v 1.50 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,13 +262,7 @@ typedef struct Node
  */
 extern Node *newNode(Size size, NodeTag tag);
 
-/*
- * nodes/{outfuncs.c,print.c}
- */
-#define nodeDisplay		pprint
-
 extern char *nodeToString(void *obj);
-extern void print(void *obj);
 
 /*
  * nodes/{readfuncs.c,read.c}
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index 708394e0e1d..8d5292e7407 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -6,18 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: print.h,v 1.10 1999/02/13 23:21:41 momjian Exp $
+ * $Id: print.h,v 1.11 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
 #include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "executor/tuptable.h"
+#include "nodes/plannodes.h"
+
+/*
+ * nodes/{outfuncs.c,print.c}
+ */
+#define nodeDisplay		pprint
 
 extern void print(void *obj);
 extern void pprint(void *obj);
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 5f629dd0e63..c5d7d308407 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $
+ * $Id: relation.h,v 1.33 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RELATION_H
 
 #include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 
 /*
  * Relids