diff --git a/src/port/getopt.c b/src/port/getopt.c
index 0d697cbd89c30de85988ce6115865f4d3cf9c659..512331d21c43db8b5947c2b117fec63c0190300e 100644
--- a/src/port/getopt.c
+++ b/src/port/getopt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  */
 
-#include "postgres.h"
+#include "c.h"
 
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/src/port/getrusage.c b/src/port/getrusage.c
index 031eb1f884bb18341b9c3fcaa527c88ad19e23af..6a9dbc5afa33ec8e03bd03c872494d640608e7dd 100644
--- a/src/port/getrusage.c
+++ b/src/port/getrusage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/getrusage.c,v 1.4 2003/11/29 19:52:13 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/port/getrusage.c,v 1.5 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "postgres.h"
+#include "c.h"
 #include "rusagestub.h"
 
 /* This code works on:
diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c
index fd4200d04d48f12df9b8e10d850b388f5e4ce260..3b6871c304712669de053c4102b546ebcbb373bd 100644
--- a/src/port/gettimeofday.c
+++ b/src/port/gettimeofday.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.4 2004/05/21 05:08:05 tgl Exp $
+ * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.5 2004/06/24 18:53:48 tgl Exp $
  *
  * Copyright (c) 2003 SRA, Inc.
  * Copyright (c) 2003 SKC, Inc.
@@ -23,7 +23,7 @@
  * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "postgres.h"
+#include "c.h"
 
 #include <sys/time.h>
 
diff --git a/src/port/kill.c b/src/port/kill.c
index b13fea924f76ba6b90788745ecfbbaaff7bc8735..ebd07d95e6cb23bdf062976e3406563abeae4a69 100644
--- a/src/port/kill.c
+++ b/src/port/kill.c
@@ -9,12 +9,12 @@
  *	signals that the backend can recognize.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/kill.c,v 1.1 2004/05/27 13:08:57 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/kill.c,v 1.2 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include "c.h"
 
 #ifdef WIN32
 /* signal sending */
diff --git a/src/port/noblock.c b/src/port/noblock.c
index b7067549cdd6de93f4248acdc6c8d3f93fcdbc4e..2d2e2282f40ed88307b9bf71651dcda002d72dcf 100644
--- a/src/port/noblock.c
+++ b/src/port/noblock.c
@@ -7,12 +7,12 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/noblock.c,v 1.1 2004/03/10 21:12:49 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/noblock.c,v 1.2 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include "c.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/src/port/pgsleep.c b/src/port/pgsleep.c
index b4a659654005d38e74e0a5f1a3112abae62013eb..2752622d626bfa4da72526702cc0fc86e881e08e 100644
--- a/src/port/pgsleep.c
+++ b/src/port/pgsleep.c
@@ -6,11 +6,11 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/pgsleep.c,v 1.3 2004/04/12 16:19:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/pgsleep.c,v 1.4 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
+#include "c.h"
 
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/src/port/pgstrcasecmp.c b/src/port/pgstrcasecmp.c
index 6ac07804af4d3c9c5247874369f216b81444f130..ea41103a20088f2c08797c012aaf7c070c03754c 100644
--- a/src/port/pgstrcasecmp.c
+++ b/src/port/pgstrcasecmp.c
@@ -16,11 +16,11 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/pgstrcasecmp.c,v 1.1 2004/05/07 00:24:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/port/pgstrcasecmp.c,v 1.2 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
+#include "c.h"
 
 #include <ctype.h>
 
diff --git a/src/port/pipe.c b/src/port/pipe.c
index 64f31d3e035ac6b5fc5beef4c4e10a6b92d4d35f..aa447beb136884bf4aaed0c411897e77fbd0cb2e 100644
--- a/src/port/pipe.c
+++ b/src/port/pipe.c
@@ -10,12 +10,12 @@
  *	must be replaced with recv/send.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/pipe.c,v 1.5 2004/06/11 03:48:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/pipe.c,v 1.6 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include "c.h"
 
 #ifdef WIN32
 int
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 664d4bc606e530fc6e48d4ac66d395c76a096633..2e9712b2dcc98659198d5d99c3f0fd2628f5307b 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.5 2004/04/19 17:42:59 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.6 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,7 @@
  *
  * Returns a malloc()'ed string with the input (w/o trailing newline).
  */
-#include "postgres.h"
+#include "c.h"
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
diff --git a/src/port/thread.c b/src/port/thread.c
index a6cdb64d0dd750e9d08ea0e437b6fad724ea4783..554383fe1b60ae1c5bd7a93a8dcd7ff0d002a885 100644
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -7,12 +7,12 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/thread.c,v 1.22 2004/06/08 01:45:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/thread.c,v 1.23 2004/06/24 18:53:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include "c.h"
 
 #include <sys/types.h>
 #include <errno.h>