diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index ffd9ef3fcbda9ae9b077d6bb4cdf246ff099ca6b..4b935492ea59798484bea2f1389d280741ba9140 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.9 2002/06/20 20:29:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/clog.c,v 1.10 2002/09/02 02:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "access/clog.h"
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 56b31983dc83c502449d2d045fd4a7f37245b460..d2955d405842572d9584ffadfd2cc31d4ea9b722 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.104 2002/09/01 01:58:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.105 2002/09/02 02:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <dirent.h>
 #include <locale.h>
 
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 97e1dc17ae29288a66d8a05c1bdf32c5dc0e5b37..1945c751e18aa0f25c5f8d10ea3701be9d68c166 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.89 2002/08/30 22:18:05 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.90 2002/09/02 02:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <netinet/in.h>
 
 #include "access/heapam.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index ba94c54fcd99b2d42a927a0743640f9f96354db5..8d777c7e0bdf02fe4da559c542cc9f0846016f50 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.101 2002/09/02 01:05:04 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.102 2002/09/02 02:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "access/heapam.h"
 #include "catalog/catname.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 569cf0700456669b940859348e7891f56cf5eaff..8a4b31f443805acbbfd3181b16c4d0aefec2978c 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,13 +6,12 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.109 2002/08/30 01:01:02 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.110 2002/09/02 02:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index e8df691c8ea1a0b6693be8cacce65f827d116a69..9fd7c4fb00c01abb7568d8f0979fbf5aad22acc3 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -12,13 +12,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.20 2002/06/20 20:29:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.21 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/file.h>
 
 #include "executor/executor.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 92102486c2199a62741f814133dd36fe0d7afc5c..466452df8e032fa04e2b4fe3d1160a8310c6bab8 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- *	$Id: nodeHash.c,v 1.64 2002/08/24 15:00:46 tgl Exp $
+ *	$Id: nodeHash.c,v 1.65 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <math.h>
 
 #include "access/hash.h"
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index b741f8983fd92ba6b8e6d2ae70959f45b93ac85d..f1484c4a0545769f2f46b80fff147e2b01298168 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -8,11 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.40 2002/06/20 20:29:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.41 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <sys/types.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index 5b1f95957348b966e3d56ca383350419ee908875..9330d61fa5bdd2aeb49124778a0688037ed1e7a5 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.17 2002/06/20 20:29:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.18 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <sys/types.h>
-
 #include "postgres.h"
 
 
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 216343f36c97bab18d380a61f85f4123b6859fdd..09129dd13e049f1c85411dbce0919b1011ab6776 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.88 2002/08/30 16:00:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.89 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || defined(HAVE_STRUCT_SOCKCRED)
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 8f778f1de7803567714a06ed822ceb551761f7a3..a85aca5bd49b7a3e8f4f357a24b58b90460d3f8c 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.62 2002/08/25 17:20:01 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.63 2002/09/02 02:47:02 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -35,7 +35,6 @@
 #include "postgres.h"
 
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index bfd5ffde15caa116c336e194c3513b5ec8db049a..7b895de22741ceb7fb26bc827cf4b5023069b44a 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.11 2002/07/15 21:34:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.12 2002/09/02 02:47:02 momjian Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -76,7 +76,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 2a4aafcbc7d32bab385dc2b8282deea06f071f45..0bf6371ff9a4b49afe2268837804b64b8c559f3b 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.85 2002/06/26 14:52:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.86 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <pwd.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || defined(HAVE_STRUCT_SOCKCRED)
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index dd9c6e75d214c882e0988f0fc8b93b0e8d421e26..38b84a4a29cb52db4d24210dc721c75bafb524b0 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.137 2002/06/20 20:29:28 momjian Exp $
+ *	$Id: pqcomm.c,v 1.138 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,6 @@
 #include <fcntl.h>
 #include <grp.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index bfb82d6aafd48e0d03104d3498c375236f483b1c..f2bfb0a7d2d6b0c62725c6ffa8902825f02389c2 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -8,12 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.18 2002/06/20 20:29:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.19 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <sys/types.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index d208d5dbbac710273bd2df387816b64f8e45d18d..f1e2acac81d40c707735bfbcb78d02432163fc5d 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.69 2002/06/20 20:29:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.70 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <math.h>
 
 #include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index f6792789de9a607f1ccc69bc7bd56d95b8a88828..908d36bccc38172584037ab69847f3e8cfccc141 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -10,13 +10,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.116 2002/06/20 20:29:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.117 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 12c6d8f35219d3194839e622d7e9c9ef3eaa1c76..0187c21d29046847f69abd4ecb61567089bf1a1a 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.73 2002/06/20 20:29:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.74 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 8efbf36f9219058a02d7cac876cf3ef7799432b3..41f914b8f91e0f25d7c55f585251bef192be835f 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -14,13 +14,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.69 2002/06/20 20:29:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.70 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index bcbf9c8e992bface0b33ff5a685e81fc066fd02f..b685cfa3ba65c787024bcb7c036e1792da4b1c59 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -9,13 +9,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.79 2002/06/20 20:29:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.80 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index 188765f856bf2b58c4fb1d4af0e75f94f3d4cde9..bb00555f69d9d02fb42112a230758017e0706de2 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -8,11 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.32 2002/06/20 20:29:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.33 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <sys/types.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index c7bf00abf5fea910d6bb782b4666980de6d7ed36..492492b9f7587b79081d44675e27cc8ba0f6f5fc 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -14,13 +14,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.76 2002/08/29 16:03:48 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.77 2002/09/02 02:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index a447509c228fdfd83847e9f03b2234367f44dfb3..97a916d8a3014e80d75f9f81a03b6c2daa59ab0e 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -4,14 +4,14 @@
  * 30159 Hannover, Germany
  */
 
+#include "postgres.h"
+
 #include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
 #include "sys/ldr.h"
 #include <a.out.h>
 #include "ldfcn.h"
 
-#include "postgres.h"
 #include "dynloader.h"
 
 #ifndef HAVE_DLOPEN
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 874eefce36a9cb3ea1b1494b0587f0a067a79b9f..763749fa450147b288b9b8b58557e2cbf9e34875 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -36,7 +36,9 @@
 static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #endif   /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
+#include "postgres.h"
+#include "dynloader.h"
+
 #include <nlist.h>
 #include <link.h>
 #include <dlfcn.h>
@@ -44,9 +46,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "postgres.h"
-#include "dynloader.h"
-
 static char error_message[BUFSIZ];
 
 char *
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 26a4ec72c95c3658684587659599717d6e0067b4..2202b6847b4f012f093a77b90d82473130672546 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -36,7 +36,8 @@
 static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #endif   /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
+#include "postgres.h"
+
 #include <nlist.h>
 #include <link.h>
 #include <dlfcn.h>
@@ -44,7 +45,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "postgres.h"
 #include "dynloader.h"
 
 static char error_message[BUFSIZ];
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index 26a4ec72c95c3658684587659599717d6e0067b4..2202b6847b4f012f093a77b90d82473130672546 100644
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -36,7 +36,8 @@
 static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #endif   /* LIBC_SCCS and not lint */
 
-#include <sys/types.h>
+#include "postgres.h"
+
 #include <nlist.h>
 #include <link.h>
 #include <dlfcn.h>
@@ -44,7 +45,6 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "postgres.h"
 #include "dynloader.h"
 
 static char error_message[BUFSIZ];
diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c
index 58825d0f53ce308895654dc6c557eec83058fb27..b3b782be8ce6da25ca57114f7f58d1e9f389eff9 100644
--- a/src/backend/port/qnx4/sem.c
+++ b/src/backend/port/qnx4/sem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.9 2001/10/28 06:25:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.10 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <semaphore.h>
 #include <string.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index 99a4090f64b0f2b74263c9b80b19578ec417f786..dc3478642200c6debfd61edb166c03b4d6964b1f 100644
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.2 2002/06/20 20:29:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_sema.c,v 1.3 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index 968b77af6ea77238a5a835f8e7d28551cf75e69b..aadf3da202361c841e9340c0239e8dfe11bd450d 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.2 2002/06/20 20:29:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.3 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>
-#include <sys/types.h>
 #ifdef HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 3dd3b4e2625d8d33c79cde07ba710594dd9699d4..9492cb6ee5ead245a894f02ec139da0a0cebbb60 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -16,7 +16,7 @@
  *
  *	Copyright (c) 2001, PostgreSQL Global Development Group
  *
- *	$Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.25 2002/09/02 01:05:05 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.26 2002/09/02 02:47:03 momjian Exp $
  * ----------
  */
 #include "postgres.h"
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index bbec926434d0c33f529e43ffe00762890b9a6725..2217fbbe1967133b8a56ef9a333ce175ed63ab16 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.286 2002/08/29 21:02:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.287 2002/09/02 02:47:03 momjian Exp $
  *
  * NOTES
  *
@@ -65,7 +65,6 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <ctype.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index ae079ff4c4db28b2a11578533f9d34f20695080c..2e2d7c6ab24794ff8700e847967b188f3546592b 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -39,7 +39,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <ctype.h>
 #include <limits.h>
 #include <assert.h>
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index b3d1d472dfb443e2823907954086524fafc14da3..27ad9e2bd3ec9e22c1cec850409761c975cadf9f 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -39,7 +39,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <ctype.h>
 #include <limits.h>
 #include <assert.h>
diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c
index b022dddc75af20e7fcafe0e63aa295bef33e2b8f..e46ea98e29f34b01d7b2172f933422bd1909f206 100644
--- a/src/backend/regex/regfree.c
+++ b/src/backend/regex/regfree.c
@@ -39,7 +39,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "regex/regex.h"
 #include "regex/utils.h"
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index a8c56562f2d6074299a98f64830562b2e73b84a3..5e6650dc969a5ae27bdfc30ef5167945f2df6354 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.50 2002/08/06 02:36:34 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.51 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/file.h>
 #include <math.h>
 #include <signal.h>
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 550bd6e70d5b548de45f108c7d694ebc7f33f4c1..bea4854bb712f53711ff8aa45a91c1b54e64b6ee 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.130 2002/08/15 16:36:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.131 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,7 +41,6 @@
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/file.h>
 #include <math.h>
 #include <signal.h>
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 8be2ed219b99b6343e54f159c8681b103db26daa..a3b959fe8f832e632b1ed9b3ae31f35ee3a85642 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.93 2002/08/06 02:36:34 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.94 2002/09/02 02:47:03 momjian Exp $
  *
  * NOTES:
  *
@@ -40,7 +40,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 04e4f5bc38ea87f8109681133a4884376f062c3f..68d922ff86f933c1daf4b96fda75a59122874df1 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.48 2002/06/20 20:29:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.49 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "miscadmin.h"
 #include "access/clog.h"
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 745a9c068deb25c80237f8bb768a4ff2ef54537a..a328ea4830a3b6b78202e9a9b876c31df2d637c4 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.50 2002/08/29 21:02:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.51 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "storage/proc.h"
 #include "storage/sinval.h"
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 0b58f17bc1b493ee125078836bb79fb1a5acd7b3..0d8df593830a005314fd0a4b7635eba77e2a25e2 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -9,14 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.95 2002/08/25 17:20:01 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.96 2002/09/02 02:47:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index db4cf76f2fd5104619d7e02c0905d907488ab6c0..fd300a4c9e68f160469fff68e9358d13ade44cb0 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.113 2002/08/31 17:14:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.114 2002/09/02 02:47:03 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -30,7 +30,6 @@
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
 
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index a44e405d0fde921fb9d1f730eb34fa3c34760268..5f263205f13f0f983190ecf54e53871baac885fa 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.48 2002/09/02 01:05:05 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.49 2002/09/02 02:47:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <sys/file.h>
 
 #include "storage/bufpage.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 282cc7ded7cd0e6042366a73200cf296312e7ec1..232a51e9ac45bbe3162f9e0cc27c27c5cb25122f 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.288 2002/09/01 23:26:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.289 2002/09/02 02:47:04 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -23,7 +23,6 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <errno.h>
@@ -1687,7 +1686,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.288 $ $Date: 2002/09/01 23:26:06 $\n");
+		puts("$Revision: 1.289 $ $Date: 2002/09/02 02:47:04 $\n");
 	}
 
 	/*
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 2457421a62aa6a9a9894a3b0f0753d0556aba2bf..9392c3efb90ff76292efeae0ff280619bd68fc8d 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.93 2002/08/04 06:44:47 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.94 2002/09/02 02:47:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include <ctype.h>
 #include <math.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c
index c0d782ec0895daf0b27582ca915922a999b2a4b3..1cf0dcec2bd14f2708d2bdaf9d2241ba878b7531 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -16,17 +16,17 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.11 2001/10/25 05:49:44 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.12 2002/09/02 02:47:04 momjian Exp $";
 #endif
 
-#include <sys/types.h>
+#include "postgres.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <errno.h>
 
-#include "postgres.h"
 #include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index 785d333f9d008c1eaa6cb8ca1a6f990dd791655d..2df36de1e9da006f4e73dcf37ab52dcaac3ebd46 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -16,10 +16,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.13 2001/10/25 05:49:44 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.14 2002/09/02 02:47:04 momjian Exp $";
 #endif
 
-#include <sys/types.h>
+#include "postgres.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -28,7 +29,6 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.13 2001/10/25 05:49:44 mom
 #include <ctype.h>
 #include <errno.h>
 
-#include "postgres.h"
 #include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 24eb68218437ceb4e490e9efdc8f58dd34415e3b..363b6ca3ecaca25b1eee6c1ca151aebf7fd45b3d 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -8,17 +8,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.25 2002/08/20 04:45:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.26 2002/09/02 02:47:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <sys/types.h>
+#include "postgres.h"
+
 #include <sys/file.h>
 #include <time.h>
 
-#include "postgres.h"
 #include "miscadmin.h"
-
 #include "utils/builtins.h"
 
 
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index bb50fb70d4d89ad4d0c9d10f30ec0d6f425f681a..d96f5441c4278149e0c3d1bfc9350dd8dc35737e 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.97 2002/09/01 00:58:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.98 2002/09/02 02:47:04 momjian Exp $
  *
  * NOTES
  *
@@ -20,7 +20,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <float.h>
 #include <limits.h>
 
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 400449217473f82cb674404852a482aefa10c21c..31fb9c1b87ab892bd22e77c36fcff3f5ca666fa9 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
  *	is for IP V4 CIDR notation, but prepared for V6: just
  *	add the necessary bits where the comments indicate.
  *
- *	$Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.34 2001/10/25 05:49:45 momjian Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.35 2002/09/02 02:47:04 momjian Exp $
  *
  *	Jon Postel RIP 16 Oct 1998
  */
@@ -11,7 +11,6 @@
 #include "postgres.h"
 
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 99ef1327e48a9afcd628bff3f2a9151accf09efc..acbf0bff2110fafe519dea2362a64c6c5ebb6dbf 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.51 2002/08/26 17:53:58 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.52 2002/09/02 02:47:04 momjian Exp $
  *
  * ----------
  */
@@ -16,7 +16,6 @@
 #include <float.h>
 #include <math.h>
 #include <errno.h>
-#include <sys/types.h>
 
 #include "catalog/pg_type.h"
 #include "utils/array.h"
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 1b2553ec9478343c6626d41a67802a6e9795d572..a511e34410ed7d8e7ffec0fa591d3ec2c304c91e 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.70 2002/08/26 17:53:59 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.71 2002/09/02 02:47:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include <ctype.h>
 #include <math.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <float.h>
 #include <limits.h>
 
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 036d11022bb633b22295d828e0d8efd8cc984a0f..1b33371e90ae26289856cb06e03805e0233fa8a1 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.173 2002/09/02 01:05:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.174 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <errno.h>
 #include <sys/file.h>
 #include <fcntl.h>
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index fdd4388e5ca0f080478d5112c1b3f75a39fedc83..61ce577536d2e23ae031c089f711416fc4bb4574 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.100 2002/08/29 07:22:28 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.101 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include <time.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 301cb2320cd167692a45caaa5e373a122e412b8e..d8e6ff3ee107039e78c976032e7a6489517ab185 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.56 2002/06/20 20:29:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.57 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include "dynloader.h"
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 3b65344086fc6870e14c49e45c12ede4e50599e8..acbd103f106e00e10052f15ff8a3b00d7c60ada5 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.43 2002/06/20 20:29:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.44 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,6 @@
 
 #include "postgres.h"
 
-#include <sys/types.h>
 
 #include "utils/dynahash.h"
 #include "utils/hsearch.h"
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 0337c8f8cd019cc247b48e07f84c6be7240d438a..6c9698da480d98add7da4c17e04db5a8c551a450 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.28 2002/06/20 20:29:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.29 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <sys/types.h>
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 367d9c2acab850e59cc11247b611bf41c843931c..df67988bed0e628c3573b8389bbb0b819736b46c 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.94 2002/07/25 10:07:12 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.95 2002/09/02 02:47:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/file.h>
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 5e4100384a275d30289c244a67cf9cdfba7172a0..8be88ac259f38cf699a7d887b0af22dce5c7465b 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.113 2002/09/02 01:05:06 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.114 2002/09/02 02:47:05 momjian Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -17,7 +17,6 @@
 
 #include <fcntl.h>
 #include <sys/file.h>
-#include <sys/types.h>
 #include <math.h>
 #include <unistd.h>
 
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 6b52982b51739fb4bc097059ec2925c75f52703b..c2fea16b09793eb48a2baa24443491270041a6f7 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,13 +6,12 @@
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * licence: BSD
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.3 2002/08/21 22:24:34 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.4 2002/09/02 02:47:07 momjian Exp $
  */
 #include "postgres.h"
 
 #include <unistd.h>
 #include <time.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <locale.h>
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 1c0c64e1d38deaad12df647dec6b437ad4d73187..11986cd3db59035ed91ed07018e4d79a423d4f2f 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.3 2002/08/29 22:19:03 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.4 2002/09/02 02:47:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index fce4fea4b402af1e3b4816ec0d634917e87b51a9..3769a9d1846a8c5c5deb3ceb9ebe3ea029777d4b 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.107 2002/08/29 21:02:12 momjian Exp $
+ * $Id: miscadmin.h,v 1.108 2002/09/02 02:47:07 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file should be moved to
@@ -23,7 +23,6 @@
 #ifndef MISCADMIN_H
 #define MISCADMIN_H
 
-#include <sys/types.h>
 
 
 /*****************************************************************************
diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h
index e33fc858cb3d95641a13b75444699f6378458425..dcc6b13ed45852dddfdcc2c70009b7e7db2d430f 100644
--- a/src/include/storage/pg_shmem.h
+++ b/src/include/storage/pg_shmem.h
@@ -17,16 +17,13 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_shmem.h,v 1.2 2002/06/20 20:29:52 momjian Exp $
+ * $Id: pg_shmem.h,v 1.3 2002/09/02 02:47:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PG_SHMEM_H
 #define PG_SHMEM_H
 
-#include <sys/types.h>
-
-
 typedef struct PGShmemHeader	/* standard header for all Postgres shmem */
 {
 	int32		magic;			/* magic # to identify Postgres segments */
diff --git a/src/port/gethostname.c b/src/port/gethostname.c
index 568df7c497fb27db491a5cdbaf0aa322a25ca8e1..305f5571068fc3975cc5597363921216a392016f 100644
--- a/src/port/gethostname.c
+++ b/src/port/gethostname.c
@@ -1,8 +1,7 @@
-/* $Id: gethostname.c,v 1.1 2002/07/18 04:13:59 momjian Exp $ */
+/* $Id: gethostname.c,v 1.2 2002/09/02 02:47:07 momjian Exp $ */
 
 #include "c.h"
 
-#include <sys/types.h>
 #include <string.h>
 
 #include <sys/utsname.h>
diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c
index c7f409ae4352c157ae63bfef282ec7a37e4703f9..c55ac4fa518bd338d26bd0ca80e7d667ae892c68 100644
--- a/src/port/inet_aton.c
+++ b/src/port/inet_aton.c
@@ -1,4 +1,4 @@
-/* $Id: inet_aton.c,v 1.1 2002/07/18 04:13:59 momjian Exp $
+/* $Id: inet_aton.c,v 1.2 2002/09/02 02:47:07 momjian Exp $
  *
  *	This inet_aton() function was taken from the GNU C library and
  *	incorporated into Postgres for those systems which do not have this
@@ -44,7 +44,6 @@
 
 #include "c.h"
 
-#include <sys/types.h>
 #include <netinet/in.h>
 #include <ctype.h>