diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index d2357a9260..160b05329b 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -8,13 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.14 1999/07/15 15:19:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.15 1999/07/17 04:00:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c
index 80b05f7a74..7cf404afc9 100644
--- a/src/backend/port/isinf.c
+++ b/src/backend/port/isinf.c
@@ -1,7 +1,9 @@
-/* $Id: isinf.c,v 1.8 1999/07/16 04:59:35 momjian Exp $ */
+/* $Id: isinf.c,v 1.9 1999/07/17 04:00:29 momjian Exp $ */
 
 #include <math.h>
 
+#include "config.h"
+
 #if HAVE_FPCLASS
 #if HAVE_IEEEFP_H
 #include <ieeefp.h>
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 4c007e0570..66c1e0077c 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.27 1999/07/16 04:59:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.28 1999/07/17 04:00:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 
 #include "postgres.h"
 
-
 #include "catalog/catalog.h"
 #include "executor/execdebug.h"
 #include "miscadmin.h"
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
index 0b75eb5888..fbcee03e1d 100755
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgnoinclude
@@ -1,6 +1,8 @@
 :
 trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-find . \( -name CVS -a -prune \) -o -type f -print | grep -v '\./postgres.h' |
+find . \( -name CVS -a -prune \) -o -type f -print | 
+grep -v '\./postgres.h' |
+grep -v '\./config.h' |
 while read FILE
 do
 	if [ "`echo $FILE | sed -n 's/^.*\.\([^\.]*\)$/\1/p'`" = "h" ]
@@ -19,6 +21,7 @@ do
 	do
 		[ -s /usr/include/$INCLUDE ] && continue
 		[ "$INCLUDE" = postgres.h ] && continue
+		[ "$INCLUDE" = config.h ] && continue
 		# preserve configure-specific includes
 		grep -B1 '^#include[ 	][ 	]*[<"]'"$INCLUDE"'[>"]' "$FILE" |
 		     egrep -q '^#if|^#else' && continue