Move some system includes into c.h, and remove duplicates.

13 files changed, 15 insertions, 26 deletions

diff --git a/src/include/c.h b/src/include/c.h
index 1fd1aa0421e..174d20cb1c4 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.60 1999/07/17 04:12:09 momjian Exp $
+ * $Id: c.h,v 1.61 1999/07/17 20:18:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,9 @@
 #include "config.h"
 
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef STDC_HEADERS
 #include <stddef.h>
 #include <stdarg.h>
@@ -789,12 +791,14 @@ extern char *vararg_format(const char *fmt,...);
 
 #ifndef HAVE_SNPRINTF
 extern int	snprintf(char *str, size_t count, const char *fmt,...);
-
 #endif
 
 #ifndef HAVE_VSNPRINTF
 extern int	vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+#endif
 
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #endif
 
 /* ----------------
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 20ce01a2501..a23c81227e6 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.36 1999/07/15 23:03:47 momjian Exp $
+ * $Id: executor.h,v 1.37 1999/07/17 20:18:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECUTOR_H
 #define EXECUTOR_H
 
-#include <stdio.h>
 #include "executor/execdesc.h"
 
 /* ----------------
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 80af87f16a4..9c5f8d5cfc2 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -8,7 +8,6 @@
 #ifndef SPI_H
 #define SPI_H
 
-#include <string.h>
 #include "postgres.h"
 
 /*
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index fe979ebdd56..9b38673d41e 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,14 +7,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $
+ * $Id: libpq-be.h,v 1.16 1999/07/17 20:18:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LIBPQ_BE_H
 #define LIBPQ_BE_H
 
-#include <stdio.h>
 #include <sys/types.h>
 
 #include "libpq/hba.h"
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 31a2db54222..d9481970372 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.37 1999/07/15 23:03:50 momjian Exp $
+ * $Id: pqcomm.h,v 1.38 1999/07/17 20:18:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include "winsock.h"
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index abb6398a70a..434b90fae21 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $
+ * $Id: geqo_misc.h,v 1.13 1999/07/17 20:18:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #ifndef GEQO_MISC_H
 #define GEQO_MISC_H
 
-#include <stdio.h>
-
 #include "optimizer/geqo_recombination.h"
 #include "nodes/relation.h"
 
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index de36c6ffb56..bf51a8b8e74 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -37,7 +37,7 @@
  *		@(#)utils.h		8.3 (Berkeley) 3/20/94
  */
 
-#include "config.h"				/* HAVE_MEMMOVE */
+#include "config.h"
 
 /* utility definitions */
 #define DUPMAX			100000000		/* xxx is this right? */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index c434d1beec4..195401e23fc 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.28 1999/07/15 23:04:09 momjian Exp $
+ * $Id: bufmgr.h,v 1.29 1999/07/17 20:18:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BUFMGR_H
 #define BUFMGR_H
 
-#include <stdio.h>
 
 #include "storage/ipc.h"
 #include "storage/block.h"
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 361b8c15ebc..beb93bf699c 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.16 1999/05/26 12:56:53 momjian Exp $
+ * $Id: fd.h,v 1.17 1999/07/17 20:18:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,8 +38,6 @@
 #ifndef FD_H
 #define FD_H
 
-#include <stdio.h>
-
 /*
  * FileSeek uses the standard UNIX lseek(2) flags.
  */
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index ed4705184db..f31c9d385d0 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $
+ * $Id: array.h,v 1.20 1999/07/17 20:18:35 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -22,7 +22,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include <stdio.h>
 #include "utils/memutils.h"
 
 typedef struct
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index 71154579f5c..4598c2ab86c 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $
+ * $Id: lselect.h,v 1.14 1999/07/17 20:18:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSELECT_H
 #define LSELECT_H
 
-#include <stdio.h>
-
 #include "utils/syscache.h"
 
 struct leftist
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 43941fd6481..63f9b137c46 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -13,7 +13,6 @@
 
 #ifdef linux
 
-#include <stdio.h>
 #include <string.h>
 
 extern char *ps_status_buffer;
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index dcfaf16e95f..4bcdee3ae57 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -12,10 +12,8 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <stdarg.h>
 
 #ifdef ELOG_TIMESTAMPS
 char	   *tprintf_timestamp(void);