diff --git a/Makefile.inc b/Makefile.inc
index c1aa59f..a51e18c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.2 1997/03/25 03:07:00 thorpej Exp $
+#	$NetBSD: Makefile.inc,v 1.3 1997/04/17 21:08:57 christos Exp $
 
 BINDIR?=	/usr/sbin
+
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../common
+.PATH:	${.CURDIR}/../common
diff --git a/mopa.out/Makefile b/mopa.out/Makefile
index 60f93f1..6dd4d88 100644
--- a/mopa.out/Makefile
+++ b/mopa.out/Makefile
@@ -1,9 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 1997/04/16 13:29:57 christos Exp $
+#	$NetBSD: Makefile,v 1.4 1997/04/17 21:09:02 christos Exp $
 
 PROG=	mopa.out
 SRCS=	mopa.out.c file.c
 
-CFLAGS+= -I${.CURDIR}/..
-.PATH:	${.CURDIR}/../common
-
 .include <bsd.prog.mk>
diff --git a/mopa.out/mopa.out.c b/mopa.out/mopa.out.c
index 51f3e33..deaedfb 100644
--- a/mopa.out/mopa.out.c
+++ b/mopa.out/mopa.out.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopa.out.c,v 1.3 1997/04/16 13:30:57 christos Exp $	*/
+/*	$NetBSD: mopa.out.c,v 1.4 1997/04/17 21:09:05 christos Exp $	*/
 
 /* mopa.out - Convert a Unix format kernel into something that
  * can be transfered via MOP.
@@ -48,10 +48,10 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: mopa.out.c,v 1.3 1997/04/16 13:30:57 christos Exp $";
+static char rcsid[] = "$NetBSD: mopa.out.c,v 1.4 1997/04/17 21:09:05 christos Exp $";
 #endif
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/file.h"
diff --git a/mopchk/Makefile b/mopchk/Makefile
index fb87fd4..a95b0cd 100644
--- a/mopchk/Makefile
+++ b/mopchk/Makefile
@@ -1,12 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 1997/04/16 13:29:58 christos Exp $
+#	$NetBSD: Makefile,v 1.5 1997/04/17 21:09:09 christos Exp $
 
 PROG=	mopchk
 SRCS=	mopchk.c device.c version.c pf.c loop-bsd.c file.c
-CFLAGS+= -I${.CURDIR}/.. -DINFO
+CFLAGS+= -DINFO
 CLEANFILES= version.c version.h
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
-.PATH:	${.CURDIR}/../common 
 
 version.c version.h: ${.CURDIR}/../common/VERSION
 	rm -f version.c; \
diff --git a/mopchk/mopchk.c b/mopchk/mopchk.c
index a82f72e..db7c9c6 100644
--- a/mopchk/mopchk.c
+++ b/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopchk.c,v 1.3 1997/04/16 13:30:58 christos Exp $	*/
+/*	$NetBSD: mopchk.c,v 1.4 1997/04/17 21:09:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: mopchk.c,v 1.3 1997/04/16 13:30:58 christos Exp $";
+static char rcsid[] = "$NetBSD: mopchk.c,v 1.4 1997/04/17 21:09:12 christos Exp $";
 #endif
 
 /*
@@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: mopchk.c,v 1.3 1997/04/16 13:30:58 christos Exp
  * Usage:	mopchk [-a] [-v] [filename...]
  */
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/device.h"
diff --git a/mopd/Makefile b/mopd/Makefile
index eab5175..18ce232 100644
--- a/mopd/Makefile
+++ b/mopd/Makefile
@@ -1,14 +1,12 @@
-#	$NetBSD: Makefile,v 1.5 1997/04/16 13:48:46 christos Exp $
+#	$NetBSD: Makefile,v 1.6 1997/04/17 21:09:17 christos Exp $
 
 PROG=	mopd
 SRCS=	mopd.c process.c print.c cmp.c get.c put.c mopdef.c nma.c device.c \
 	version.c pf.c loop-bsd.c dl.c rc.c file.c
 MAN=	mopd.8
-CFLAGS+= -I${.CURDIR}/..
 CLEANFILES= version.c version.h
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
-.PATH:	${.CURDIR}/../common
 
 version.c version.h: ${.CURDIR}/../common/VERSION
 	rm -f version.c; \
diff --git a/mopd/mopd.c b/mopd/mopd.c
index 89251f8..c3b84ec 100644
--- a/mopd/mopd.c
+++ b/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopd.c,v 1.3 1997/04/16 13:30:59 christos Exp $	*/
+/*	$NetBSD: mopd.c,v 1.4 1997/04/17 21:09:19 christos Exp $	*/
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: mopd.c,v 1.3 1997/04/16 13:30:59 christos Exp $";
+static char rcsid[] = "$NetBSD: mopd.c,v 1.4 1997/04/17 21:09:19 christos Exp $";
 #endif
 
 /*
@@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: mopd.c,v 1.3 1997/04/16 13:30:59 christos Exp $"
  *		mopd [ -d -f -v ] [ -3 | -4 ] interface
  */
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/device.h"
diff --git a/mopd/process.c b/mopd/process.c
index eb457d6..af18c10 100644
--- a/mopd/process.c
+++ b/mopd/process.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: process.c,v 1.3 1997/04/16 13:31:00 christos Exp $	*/
+/*	$NetBSD: process.c,v 1.4 1997/04/17 21:09:21 christos Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,10 +30,10 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: process.c,v 1.3 1997/04/16 13:31:00 christos Exp $";
+static char rcsid[] = "$NetBSD: process.c,v 1.4 1997/04/17 21:09:21 christos Exp $";
 #endif
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/nmadef.h"
diff --git a/mopprobe/Makefile b/mopprobe/Makefile
index ce3b341..a13e28a 100644
--- a/mopprobe/Makefile
+++ b/mopprobe/Makefile
@@ -1,12 +1,11 @@
-#	$NetBSD: Makefile,v 1.4 1997/04/16 13:30:01 christos Exp $
+#	$NetBSD: Makefile,v 1.5 1997/04/17 21:09:25 christos Exp $
 
 PROG=	mopprobe
 SRCS=	mopprobe.c device.c get.c cmp.c mopdef.c version.c pf.c loop-bsd.c
-CFLAGS+= -I${.CURDIR}/.. -DNODL
+CFLAGS+= -DNODL
 CLEANFILES= version.c version.h
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
-.PATH:	${.CURDIR}/../common 
 
 version.c version.h: ${.CURDIR}/../common/VERSION
 	rm -f version.c; \
diff --git a/mopprobe/mopprobe.c b/mopprobe/mopprobe.c
index 41df1bd..42c9c1c 100644
--- a/mopprobe/mopprobe.c
+++ b/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mopprobe.c,v 1.3 1997/04/16 13:31:02 christos Exp $	*/
+/*	$NetBSD: mopprobe.c,v 1.4 1997/04/17 21:09:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: mopprobe.c,v 1.3 1997/04/16 13:31:02 christos Exp $";
+static char rcsid[] = "$NetBSD: mopprobe.c,v 1.4 1997/04/17 21:09:27 christos Exp $";
 #endif
 
 /*
@@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: mopprobe.c,v 1.3 1997/04/16 13:31:02 christos Ex
  *		mopprobe [ -3 | -4 ] interface
  */
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/device.h"
diff --git a/moptrace/Makefile b/moptrace/Makefile
index e21c223..4ef57c9 100644
--- a/moptrace/Makefile
+++ b/moptrace/Makefile
@@ -1,14 +1,12 @@
-#	$NetBSD: Makefile,v 1.4 1997/04/16 13:30:03 christos Exp $
+#	$NetBSD: Makefile,v 1.5 1997/04/17 21:09:31 christos Exp $
 
 PROG=	moptrace
 SRCS=	moptrace.c print.c cmp.c get.c mopdef.c nma.c device.c version.c pf.c \
 	loop-bsd.c dl.c rc.c
 MAN=	moptrace.1
-CFLAGS+= -I${.CURDIR}/..
 CLEANFILES= version.c version.h
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
-.PATH:	${.CURDIR}/../common
 
 version.c version.h: ${.CURDIR}/../common/VERSION
 	rm -f version.c; \
diff --git a/moptrace/moptrace.c b/moptrace/moptrace.c
index 5251f26..b3d8b73 100644
--- a/moptrace/moptrace.c
+++ b/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: moptrace.c,v 1.3 1997/04/16 13:31:03 christos Exp $	*/
+/*	$NetBSD: moptrace.c,v 1.4 1997/04/17 21:09:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$NetBSD: moptrace.c,v 1.3 1997/04/16 13:31:03 christos Exp $";
+static char rcsid[] = "$NetBSD: moptrace.c,v 1.4 1997/04/17 21:09:33 christos Exp $";
 #endif
 
 /*
@@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: moptrace.c,v 1.3 1997/04/16 13:31:03 christos Ex
  *		moptrace [ -d ] [ -3 | -4 ] interface
  */
 
-#include "common/os.h"
+#include "os.h"
 #include "common/common.h"
 #include "common/mopdef.h"
 #include "common/device.h"