diff --git a/common/cmp.h b/common/cmp.h
index 18a24ea..d192fa7 100644
--- a/common/cmp.h
+++ b/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmp.h,v 1.3 1997/10/16 23:24:24 lukem Exp $	*/
+/*	$NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: cmp.h,v 1.3 1997/10/16 23:24:24 lukem Exp $
+ *	$NetBSD: cmp.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -39,4 +39,4 @@ __BEGIN_DECLS
 int	mopCmpEAddr __P((u_char *, u_char *));
 __END_DECLS
 
-#endif _CMP_H_
+#endif /* _CMP_H_ */
diff --git a/common/device.h b/common/device.h
index c6808da..043d635 100644
--- a/common/device.h
+++ b/common/device.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.h,v 1.3 1997/10/16 23:24:29 lukem Exp $	*/
+/*	$NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: device.h,v 1.3 1997/10/16 23:24:29 lukem Exp $
+ *	$NetBSD: device.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -50,4 +50,4 @@ void	mopReadDL __P((void));
 void	mopReadRC __P((void));
 __END_DECLS
 
-#endif _DEVICE_H_
+#endif /* _DEVICE_H_ */
diff --git a/common/dl.h b/common/dl.h
index 0ce9638..744b3be 100644
--- a/common/dl.h
+++ b/common/dl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dl.h,v 1.3 1997/10/16 23:24:33 lukem Exp $	*/
+/*	$NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: dl.h,v 1.3 1997/10/16 23:24:33 lukem Exp $
+ *	$NetBSD: dl.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -39,4 +39,4 @@ __BEGIN_DECLS
 void	mopDumpDL       __P((FILE *, u_char *, int));
 __END_DECLS
 
-#endif _DL_H_
+#endif /* _DL_H_ */
diff --git a/common/file.c b/common/file.c
index 8cf6b14..1edf048 100644
--- a/common/file.c
+++ b/common/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.6 1998/07/25 06:01:13 mycroft Exp $	*/
+/*	$NetBSD: file.c,v 1.7 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: file.c,v 1.6 1998/07/25 06:01:13 mycroft Exp $");
+__RCSID("$NetBSD: file.c,v 1.7 2001/01/16 02:50:31 cgd Exp $");
 #endif
 
 #include "os.h"
@@ -427,7 +427,7 @@ CheckAOutFile(fd)
 	} else {
 		return(-1);
 	}
-#endif NOAOUT
+#endif /* NOAOUT */
 }
 
 int
@@ -662,7 +662,7 @@ GetAOutFileInfo(fd, load, xfr, a_text, a_text_fill,
 	}
 
 	return(0);
-#endif NOAOUT
+#endif /* NOAOUT */
 }
 
 int
diff --git a/common/mopdef.h b/common/mopdef.h
index 5f50a3c..b258937 100644
--- a/common/mopdef.h
+++ b/common/mopdef.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopdef.h,v 1.2 1997/03/25 03:07:20 thorpej Exp $	*/
+/*	$NetBSD: mopdef.h,v 1.3 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: mopdef.h,v 1.2 1997/03/25 03:07:20 thorpej Exp $
+ *	$NetBSD: mopdef.h,v 1.3 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -193,6 +193,6 @@ extern char rc_mcst[];
 extern char dl_802_proto[];
 extern char rc_802_proto[];
 extern char lp_802_proto[];
-#endif	MOPDEF_SUPRESS_EXTERN
+#endif	/* MOPDEF_SUPRESS_EXTERN */
 
-#endif _MOPDEF_H_
+#endif /* _MOPDEF_H_ */
diff --git a/common/nma.h b/common/nma.h
index c1f62a1..968b5ea 100644
--- a/common/nma.h
+++ b/common/nma.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nma.h,v 1.3 1997/10/16 23:24:50 lukem Exp $	*/
+/*	$NetBSD: nma.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: nma.h,v 1.3 1997/10/16 23:24:50 lukem Exp $
+ *	$NetBSD: nma.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -40,4 +40,4 @@ char	*nmaGetShort  __P((int));
 char	*nmaGetDevice __P((int));
 __END_DECLS
 
-#endif _NMA_H_
+#endif /* _NMA_H_ */
diff --git a/common/os.h b/common/os.h
index 9890952..c4e5a7c 100644
--- a/common/os.h
+++ b/common/os.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: os.h,v 1.3 1997/10/16 23:24:53 lukem Exp $	*/
+/*	$NetBSD: os.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: os.h,v 1.3 1997/10/16 23:24:53 lukem Exp $
+ *	$NetBSD: os.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -58,4 +58,4 @@
 
 #define  DEV_NEW_CONF
 
-#endif _OS_H_
+#endif /* _OS_H_ */
diff --git a/common/pf.h b/common/pf.h
index 8dbf6e5..97756f9 100644
--- a/common/pf.h
+++ b/common/pf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pf.h,v 1.3 1997/10/16 23:24:56 lukem Exp $	*/
+/*	$NetBSD: pf.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: pf.h,v 1.3 1997/10/16 23:24:56 lukem Exp $
+ *	$NetBSD: pf.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -45,4 +45,4 @@ int	pfRead     __P((int, u_char *, int));
 int	pfWrite    __P((int, u_char *, int, int));
 __END_DECLS
 
-#endif _PF_H_
+#endif /* _PF_H_ */
diff --git a/common/print.h b/common/print.h
index 49976f2..66c22c2 100644
--- a/common/print.h
+++ b/common/print.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.h,v 1.3 1997/10/16 23:25:00 lukem Exp $	*/
+/*	$NetBSD: print.h,v 1.4 2001/01/16 02:50:31 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: print.h,v 1.3 1997/10/16 23:25:00 lukem Exp $
+ *	$NetBSD: print.h,v 1.4 2001/01/16 02:50:31 cgd Exp $
  *
  */
 
@@ -48,4 +48,4 @@ void	mopPrintInfo      __P((FILE *, u_char *, int *, u_short,
 			       u_char, int));
 __END_DECLS
 
-#endif _PRINT_H_
+#endif /* _PRINT_H_ */
diff --git a/common/rc.h b/common/rc.h
index 91ecfa5..bac56de 100644
--- a/common/rc.h
+++ b/common/rc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rc.h,v 1.3 1997/10/16 23:25:05 lukem Exp $	*/
+/*	$NetBSD: rc.h,v 1.4 2001/01/16 02:50:32 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: rc.h,v 1.3 1997/10/16 23:25:05 lukem Exp $
+ *	$NetBSD: rc.h,v 1.4 2001/01/16 02:50:32 cgd Exp $
  *
  */
 
@@ -39,4 +39,4 @@ __BEGIN_DECLS
 void	mopDumpRC        __P((FILE *, u_char *, int));
 __END_DECLS
 
-#endif _RC_H_
+#endif /* _RC_H_ */
diff --git a/mopd/process.h b/mopd/process.h
index 8874746..5f8b1e7 100644
--- a/mopd/process.h
+++ b/mopd/process.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: process.h,v 1.3 1997/10/16 23:25:21 lukem Exp $	*/
+/*	$NetBSD: process.h,v 1.4 2001/01/16 02:50:32 cgd Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: process.h,v 1.3 1997/10/16 23:25:21 lukem Exp $
+ *	$NetBSD: process.h,v 1.4 2001/01/16 02:50:32 cgd Exp $
  *
  */
 
@@ -42,4 +42,4 @@ void	mopProcessRC __P((FILE *, struct if_info *, u_char *, int *,
 			  u_char *, u_char *, int, u_short));
 __END_DECLS
 
-#endif _PROCESS_H_
+#endif /* _PROCESS_H_ */