diff --git a/CHANGES b/CHANGES
index 510622c9cd..b7ebb409d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+ 137.   [cleanup]       <isc/commandline.h>, <isc/mem.h>, <isc/print.h>
+                        <isc/serial.h>, <isc/string.h> and <isc/offset.h>
+                        made to conform to the same style for multiple
+                        inclusion protection.
+
  136.   [cleanup]       <isc/commandline.h>, <isc/interfaceiter.h>,
                         <isc/net.h> and Win32's <isc/thread.h> needed
                         ISC_LANG_BEGINDECLS/ISC_LANG_ENDDECLS.
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index 5127654e81..e37aad97be 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -15,7 +15,10 @@
  * SOFTWARE.
  */
 
-/* $Id: commandline.h,v 1.3 2000/04/28 22:09:15 tale Exp $ */
+/* $Id: commandline.h,v 1.4 2000/04/28 22:13:14 tale Exp $ */
+
+#ifndef ISC_COMMANDLINE_H
+#define ISC_COMMANDLINE_H 1
 
 #include <isc/boolean.h>
 #include <isc/lang.h>
@@ -35,3 +38,5 @@ int
 isc_commandline_parse(int argc, char * const *argv, const char *options);
 
 ISC_LANG_ENDDECLS
+
+#endif /* ISC_COMMANDLINE_H */
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 7ba2f78d3a..8b72701c3f 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -271,4 +271,4 @@ isc_mempool_setfillcount(isc_mempool_t *mpctx, unsigned int limit);
 
 ISC_LANG_ENDDECLS
 
-#endif /* MEM_H */
+#endif /* ISC_MEM_H */
diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index 8cdf901bbf..199637359f 100644
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -16,7 +16,7 @@
  */
 
 #ifndef ISC_PRINT_H
-#define ISC_PRINT_H
+#define ISC_PRINT_H 1
 
 /***
  *** Imports
diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index 311c895ca2..2e4a85c4ff 100644
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
-	/* $Id: serial.h,v 1.5 2000/04/27 23:08:18 tale Exp $ */
+/* $Id: serial.h,v 1.6 2000/04/28 22:13:15 tale Exp $ */
 
 #ifndef ISC_SERIAL_H
-#define ISC_SERIAL_H
+#define ISC_SERIAL_H 1
 
 #include <isc/lang.h>
 #include <isc/types.h>
diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index 60d4a2c124..54ba569464 100644
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -16,7 +16,7 @@
  */
 
 #ifndef ISC_STRING_H
-#define ISC_STRING_H
+#define ISC_STRING_H 1
 
 #include <string.h>
 
diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index c675f8d52e..5f2b76462e 100644
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
-/* $Id: offset.h,v 1.2 2000/04/28 00:39:11 tale Exp $ */
+/* $Id: offset.h,v 1.3 2000/04/28 22:13:15 tale Exp $ */
 
-#ifndef ISC_OFFSET_T
-#define ISC_OFFSET_T 1
+#ifndef ISC_OFFSET_H
+#define ISC_OFFSET_H 1
 
 /*
  * File offsets are operating-system dependent.
@@ -28,4 +28,4 @@
 
 typedef off_t isc_offset_t;
 
-#endif /* ISC_OFFSET_T */
+#endif /* ISC_OFFSET_H */