diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index 1ce33e10458f96f6450c49d8537b2967f51f16b2..46920c0009b4987d9e8a6263370fc8d7f46adb78 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -31,7 +31,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.38 2004/02/12 05:39:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.39 2004/04/25 23:50:54 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -813,7 +813,7 @@ count_nondeletable_pages(Relation onerel, LVRelStats *vacrelstats)
 
 		if (PageIsNew(page) || PageIsEmpty(page))
 		{
-			/* PageIsNew robably shouldn't happen... */
+			/* PageIsNew probably shouldn't happen... */
 			LockBuffer(buf, BUFFER_LOCK_UNLOCK);
 			ReleaseBuffer(buf);
 			continue;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 84da0ebfbe72a9ec79ac25368c6a88942f100d9b..64f5e5ad40a0afd7c3775839c9c0be71f10a41c7 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.163 2004/04/22 07:21:55 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.164 2004/04/25 23:50:54 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,8 +35,6 @@
  */
 #include "postgres.h"
 
-#include <math.h>
-#include <signal.h>
 #include <sys/file.h>
 #include <unistd.h>
 
diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h
index 4fc9985b2b1e8acdbc58b1c76a11a658e0ef7042..9e095e97e555dd2934f76712c263e9c87a1181a3 100644
--- a/src/include/storage/buf.h
+++ b/src/include/storage/buf.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/buf.h,v 1.16 2003/11/29 22:41:13 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/storage/buf.h,v 1.17 2004/04/25 23:50:58 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,7 +32,7 @@ typedef int Buffer;
 
 /*
  * BufferIsLocal
- *		True iff the buffer is local (not visible to other servers).
+ *		True iff the buffer is local (not visible to other backends).
  */
 #define BufferIsLocal(buffer)	((buffer) < 0)
 
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 43a901864697c6e004c581e0196e6017e0469b01..1cd16a515342582d0d1b38323a43a2bc2df80599 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.77 2004/04/22 07:21:55 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.78 2004/04/25 23:50:58 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,7 @@ extern DLLIMPORT int NLocBuffer;
 extern DLLIMPORT Block *LocalBufferBlockPointers;
 extern int32 *LocalRefCount;
 
-/* special pageno for bget */
+/* special block number for ReadBuffer() */
 #define P_NEW	InvalidBlockNumber		/* grow the file to get a new page */
 
 /*