diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index e27c06f2b3daf6dfd2660febb09b8444014f4572..ec5f574e7c849cf70bdb81fcd1c7de9271f6df43 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,18 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.30 1999/07/16 04:58:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.31 1999/07/16 05:41:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
 #else
 #include <string.h>
 #endif
 
-#include "postgres.h"
-
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "utils/syscache.h"
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 72a2cd9944b87dbd212af90dbbc36eb1b02d4950..a84742e741a3a9b3936bb7a33905f5e6b03e4efc 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.112 1999/07/16 04:59:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.113 1999/07/16 05:41:17 momjian Exp $
  *
  * NOTES
  *
@@ -32,13 +32,13 @@
  *
  *-------------------------------------------------------------------------
  */
- /* moved here to prevent double define */
+#include "postgres.h"
 #include <sys/param.h>
+ /* moved here to prevent double define */
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
-#include "postgres.h"
 
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256
diff --git a/src/backend/utils/init/enbl.c b/src/backend/utils/init/enbl.c
index f2ac69fba77940bba37566dd979c828ff5a58897..d40f1b6c83d125b185158e1cab0ff8e14a0af01d 100644
--- a/src/backend/utils/init/enbl.c
+++ b/src/backend/utils/init/enbl.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.8 1999/07/15 15:20:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.9 1999/07/16 05:41:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+#include "utils/module.h"
 
 /*
  * BypassEnable
diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c
index 239b37394897c1d32127aabc48babc07b8509786..4acdc3054b2a8ceaf4d1a2872eea167e19a4114f 100644
--- a/src/bin/pg_passwd/pg_passwd.c
+++ b/src/bin/pg_passwd/pg_passwd.c
@@ -1,10 +1,10 @@
 /*
  * @(#) pg_passwd.c 1.8 09:13:16 97/07/02		Y. Ichikawa
  */
-#include "postgres.h"
-
 #include <stdio.h>
 #include <stdlib.h>
+
+#include "postgres.h"
 #if defined(HAVE_STRING_H)
 #include <string.h>
 #else