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

6 files changed, 3 insertions, 26 deletions

diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 9a8b94bd256..4d04c00dd9c 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -6,7 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index aa6c2c274b3..6bfabd338de 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -4,7 +4,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
 #if HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -13,12 +12,6 @@ extern int	optind;
 extern char *optarg;
 
 #endif
-#include <stdlib.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 
 #include "extern.h"
 
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 8ecd9a92e9f..c5c2f936527 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -6,7 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 70865ff3ee4..fe72134a98a 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.15 1999/07/15 15:21:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.16 1999/07/17 20:18:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 1585e395b0c..493d6e3c706 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1,24 +1,15 @@
 /* This is a modified version of src/backend/parser/scan.l */
 %{
-#include "config.h"
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
+#include <errno.h>
 
+#include "postgres.h"
 #ifndef PATH_MAX
 #include <sys/param.h>
 #define PATH_MAX MAXPATHLEN
 #endif
-
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <errno.h>
-
-#include "postgres.h"
 #include "miscadmin.h"
 #include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index ff1f9907f9c..04b27c5f1fe 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,9 +1,5 @@
 /* Copyright comment */
 %{
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "postgres.h"
 #include "access/htup.h"
 #include "catalog/catname.h"