diff --git a/contrib/fulltextindex/fti.c b/contrib/fulltextindex/fti.c
index 33a7666fe77c79c897b2115a754da3ddbf4115e3..e5539b44576c1275584d736d9956d4a18cd61dcf 100644
--- a/contrib/fulltextindex/fti.c
+++ b/contrib/fulltextindex/fti.c
@@ -1,6 +1,6 @@
+#include "postgres.h"
 #include "executor/spi.h"
 #include "commands/trigger.h"
-#include "c.h"		/* endof() macro */
 #include <ctype.h>	/* tolower */
 #include <stdio.h>	/* debugging */
 
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 4e1f62cedf870d4d3a5d259c26b278e102dc5d79..401b08b1afbe4d0d57efdb3ca36dc80d7546977a 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -12,8 +12,8 @@
 #include <sys/ldr.h>
 #include <a.out.h>
 #include <ldfcn.h>
+#include "postgres.h"
 #include "dynloader.h"
-#include "c.h"
 
 /*
  * We simulate dlopen() et al. through a call to load. Because AIX has
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 4e8f252bce8f4671bc7a43ae364adffa83918c0e..e237572337c18eb1d3ba9dda92db12619c507db7 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.5 1998/09/01 03:24:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.6 1999/01/17 03:04:50 tgl Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <a.out.h>
 #include <dl.h>
-#include "c.h"
+#include "postgres.h"
 #include "fmgr.h"
 #include "utils/dynamic_loader.h"
 #include "dynloader.h"
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 51abd4bb4aa4ccc7e2cd06c01c94c9b1b9cd494f..fe786c6921b2b82e3cf5d83c4e983d86e5bc41a7 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.3 1998/09/01 03:24:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.4 1999/01/17 03:04:50 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include <postgres.h>
 #include "dl.h"
 #include <utils/dynamic_loader.h>
-#include "c.h"
+#include "postgres.h"
 #include "fmgr.h"
 #include "port-protos.h"
 #include "utils/elog.h"
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index 9a6991b222fc96d8bd55e3bdcf32363a37dfad79..6b43b08bb585bdd4fe042a5709e24d0679e6bdea 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.15 1998/12/26 18:15:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.16 1999/01/17 03:04:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "config.h"
-#include "c.h"
+#include "postgres.h"
 #include "storage/s_lock.h"
 
 
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index a4e526083be4a335c2cc545d79e63a5bfd642cc6..4cb92670be40dabd543919ce93212cd5c973820b 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,13 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.8 1999/01/01 04:48:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.9 1999/01/17 03:04:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <stdarg.h>
-#include "c.h"
+#include "postgres.h"
 
 #define FormMaxSize		1024
 #define FormMinSize		(FormMaxSize / 8)
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index 79c7dbe4f1473f95e8167d94f16f401fd6a07347..a076bc08118aad1cf418b40202be02704d3080b8 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.9 1998/09/01 03:27:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.10 1999/01/17 03:04:53 tgl Exp $
  *
  * NOTE
  *	  XXX This is a preliminary implementation which lacks fail-fast
@@ -15,7 +15,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 
 #include "utils/memutils.h"		/* where declarations of this file goes */
 
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 4862c92d966dc67c28d6500776dd30b1cfb4f4e3..9c50c3a30236cee083f71fdbd82ef3f16178465b 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.8 1998/09/01 04:33:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.9 1999/01/17 03:04:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <string.h>
 
-#include "c.h"
+#include "postgres.h"
 
 #include "utils/mcxt.h"
 #include "utils/elog.h"
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index c246fdae99fd8acb91341cb4bf438e540ab3de6d..6645a669e6029e3620f04c4b044267210074eee5 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.31 1999/01/17 01:45:42 tgl Exp $
+ * $Id: pqcomm.h,v 1.32 1999/01/17 03:04:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@
 #include <netinet/in.h>
 #endif
 
-#include "c.h"
+#include "postgres.h"
 
 /* Define a generic socket address type. */
 
diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h
index d86ad8c346495ea54529e5c7e269248d817a56c1..6a40c5e20d9683127295e8bc7b85d4a35a4884ac 100644
--- a/src/interfaces/libpq/pqsignal.h
+++ b/src/interfaces/libpq/pqsignal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqsignal.h,v 1.5 1998/09/01 04:40:15 momjian Exp $
+ * $Id: pqsignal.h,v 1.6 1999/01/17 03:04:57 tgl Exp $
  *
  * NOTES
  *	  This shouldn't be in libpq, but the monitor and some other
@@ -17,7 +17,7 @@
 #ifndef PQSIGNAL_H
 #define PQSIGNAL_H
 
-#include "c.h"
+#include "postgres.h"
 
 typedef void (*pqsigfunc) (int);