Final cleanup.

4 files changed, 13 insertions, 20 deletions

diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 39b4564d7f..4c007e0570 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.26 1999/07/16 03:13:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.27 1999/07/16 04:59:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,24 +19,23 @@
 
 #include "postgres.h"
 
-/* declarations split between these three files */
+
+#include "catalog/catalog.h"
+#include "executor/execdebug.h"
+#include "miscadmin.h"
 #include "storage/buf.h"
 #include "storage/buf_internals.h"
 #include "storage/bufmgr.h"
-
 #include "storage/fd.h"
 #include "storage/ipc.h"
+#include "storage/lmgr.h"
 #include "storage/s_lock.h"
 #include "storage/shmem.h"
-#include "storage/spin.h"
 #include "storage/smgr.h"
-#include "storage/lmgr.h"
-#include "miscadmin.h"
+#include "storage/spin.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
-#include "executor/execdebug.h"
-#include "catalog/catalog.h"
 
 /*
  *	if BMTRACE is defined, we trace the last 200 buffer allocations and
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 58b7e6c175..e0b441f295 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.59 1999/07/16 03:13:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.60 1999/07/16 04:59:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,14 +48,11 @@
 #include <signal.h>
 
 #include "postgres.h"
-
-/* declarations split between these three files */
-
+#include "executor/execdebug.h"
+#include "miscadmin.h"
 #include "storage/s_lock.h"
 #include "storage/smgr.h"
-#include "miscadmin.h"
 #include "utils/relcache.h"
-#include "executor/execdebug.h"
 
 extern SPINLOCK BufMgrLock;
 extern long int ReadBufferCount;
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 13f79377b5..eed3129004 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.16 1999/07/15 22:39:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.17 1999/07/16 04:59:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include <stdio.h>
 
 #include "postgres.h"
-
 #include "storage/bufmgr.h"
 
 
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 8977534c49..81ffdb640c 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.24 1999/07/16 03:13:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.25 1999/07/16 04:59:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,11 +28,9 @@
 
 #include "postgres.h"
 
-/* declarations split between these three files */
-
+#include "executor/execdebug.h"
 #include "storage/smgr.h"
 #include "utils/relcache.h"
-#include "executor/execdebug.h"
 
 extern long int LocalBufferFlushCount;