diff --git a/distrib/utils/sysinst/arch/hp300/Makefile b/distrib/utils/sysinst/arch/hp300/Makefile
index fdee5678a070..95b1f4a06d3b 100644
--- a/distrib/utils/sysinst/arch/hp300/Makefile
+++ b/distrib/utils/sysinst/arch/hp300/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:10 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2003/05/31 08:09:59 dsl Exp $
 #
 # Makefile for hp300
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/hp300/md.c b/distrib/utils/sysinst/arch/hp300/md.c
index 9a96822e2ff3..b8e5582710db 100644
--- a/distrib/utils/sysinst/arch/hp300/md.c
+++ b/distrib/utils/sysinst/arch/hp300/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2002/12/05 01:17:23 fvdl Exp $ */
+/*	$NetBSD: md.c,v 1.6 2003/05/31 08:09:59 dsl Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 
 int
diff --git a/distrib/utils/sysinst/arch/mipsco/Makefile b/distrib/utils/sysinst/arch/mipsco/Makefile
index 1425776c0cfb..bf7b566214a0 100644
--- a/distrib/utils/sysinst/arch/mipsco/Makefile
+++ b/distrib/utils/sysinst/arch/mipsco/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:11 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2003/05/31 08:09:59 dsl Exp $
 #
 # Makefile for mipsco
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/mipsco/md.c b/distrib/utils/sysinst/arch/mipsco/md.c
index fe6f7e69179a..a83ae2803b51 100644
--- a/distrib/utils/sysinst/arch/mipsco/md.c
+++ b/distrib/utils/sysinst/arch/mipsco/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.2 2002/12/05 01:17:25 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.3 2003/05/31 08:09:59 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 /*
  * temporary hack
diff --git a/distrib/utils/sysinst/arch/mvme68k/Makefile b/distrib/utils/sysinst/arch/mvme68k/Makefile
index 3215d1a9abb1..cee2a02ee4be 100644
--- a/distrib/utils/sysinst/arch/mvme68k/Makefile
+++ b/distrib/utils/sysinst/arch/mvme68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:11 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2003/05/31 08:09:59 dsl Exp $
 #
 # Makefile for mvme68k
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/mvme68k/md.c b/distrib/utils/sysinst/arch/mvme68k/md.c
index 615a13c31599..b181cf2acb7c 100644
--- a/distrib/utils/sysinst/arch/mvme68k/md.c
+++ b/distrib/utils/sysinst/arch/mvme68k/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.4 2002/12/05 01:17:26 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.5 2003/05/31 08:09:59 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 
 int
diff --git a/distrib/utils/sysinst/arch/news68k/Makefile b/distrib/utils/sysinst/arch/news68k/Makefile
index 546247fc50c2..c5d1ed460490 100644
--- a/distrib/utils/sysinst/arch/news68k/Makefile
+++ b/distrib/utils/sysinst/arch/news68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:12 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2003/05/31 08:10:00 dsl Exp $
 #
 # Makefile for news68k
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 SRCS+=	aout2elf.c
 
 md.o:	menu_defs.h msg_defs.h
diff --git a/distrib/utils/sysinst/arch/news68k/md.c b/distrib/utils/sysinst/arch/news68k/md.c
index ce8a82c48832..2415e3f31514 100644
--- a/distrib/utils/sysinst/arch/news68k/md.c
+++ b/distrib/utils/sysinst/arch/news68k/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.15 2002/12/05 01:17:26 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.16 2003/05/31 08:10:00 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -53,7 +53,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 /*
  * temporary hack
diff --git a/distrib/utils/sysinst/arch/newsmips/Makefile b/distrib/utils/sysinst/arch/newsmips/Makefile
index 6dd01a029c1c..b28084557c91 100644
--- a/distrib/utils/sysinst/arch/newsmips/Makefile
+++ b/distrib/utils/sysinst/arch/newsmips/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:12 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2003/05/31 08:10:00 dsl Exp $
 #
 # Makefile for newsmips
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/newsmips/md.c b/distrib/utils/sysinst/arch/newsmips/md.c
index 1d1f42918794..a691d90d2df6 100644
--- a/distrib/utils/sysinst/arch/newsmips/md.c
+++ b/distrib/utils/sysinst/arch/newsmips/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.4 2002/12/05 01:17:27 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.5 2003/05/31 08:10:00 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -53,7 +53,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 /*
  * temporary hack
diff --git a/distrib/utils/sysinst/arch/playstation2/Makefile b/distrib/utils/sysinst/arch/playstation2/Makefile
index bf322517f49d..fbd86201fcd9 100644
--- a/distrib/utils/sysinst/arch/playstation2/Makefile
+++ b/distrib/utils/sysinst/arch/playstation2/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/05/18 18:54:08 dsl Exp $
+#	$NetBSD: Makefile,v 1.5 2003/05/31 08:10:00 dsl Exp $
 #
 # Makefile for playstation2
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c mbr.c mbr_buf.S savenewlabel.c sizemultname.c
+	label.c target.c md.c mbr.c mbr_buf.S savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/playstation2/md.c b/distrib/utils/sysinst/arch/playstation2/md.c
index 2aee1a8c775f..f9c3b032e07c 100644
--- a/distrib/utils/sysinst/arch/playstation2/md.c
+++ b/distrib/utils/sysinst/arch/playstation2/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.6 2003/05/07 11:42:03 dsl Exp $ */
+/*	$NetBSD: md.c,v 1.7 2003/05/31 08:10:00 dsl Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -46,7 +46,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 #ifdef __mips__
 extern mbr_sector_t mbr;
diff --git a/distrib/utils/sysinst/arch/pmax/Makefile b/distrib/utils/sysinst/arch/pmax/Makefile
index 6f8716f76b2c..1441bfa8fd6d 100644
--- a/distrib/utils/sysinst/arch/pmax/Makefile
+++ b/distrib/utils/sysinst/arch/pmax/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2003/01/11 19:44:12 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2003/05/31 08:10:00 dsl Exp $
 #
 # Makefile for pmax
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c  geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/pmax/md.c b/distrib/utils/sysinst/arch/pmax/md.c
index 61b369130a6c..fa084662625e 100644
--- a/distrib/utils/sysinst/arch/pmax/md.c
+++ b/distrib/utils/sysinst/arch/pmax/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.48 2002/12/05 01:17:28 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.49 2003/05/31 08:10:01 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 /*
  * temporary hack
diff --git a/distrib/utils/sysinst/arch/sparc/Makefile b/distrib/utils/sysinst/arch/sparc/Makefile
index ae650aa1eee5..8c989fd64443 100644
--- a/distrib/utils/sysinst/arch/sparc/Makefile
+++ b/distrib/utils/sysinst/arch/sparc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:14 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2003/05/31 08:10:01 dsl Exp $
 #
 # Makefile for sparc
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sparc/md.c b/distrib/utils/sysinst/arch/sparc/md.c
index 5cb19ea66eff..fc028bd6ff02 100644
--- a/distrib/utils/sysinst/arch/sparc/md.c
+++ b/distrib/utils/sysinst/arch/sparc/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.33 2003/05/18 18:54:09 dsl Exp $	*/
+/*	$NetBSD: md.c,v 1.34 2003/05/31 08:10:01 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,7 +57,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 int
 md_get_info(void)
diff --git a/distrib/utils/sysinst/arch/sparc64/Makefile b/distrib/utils/sysinst/arch/sparc64/Makefile
index 24072be925f0..fd16d5b750d8 100644
--- a/distrib/utils/sysinst/arch/sparc64/Makefile
+++ b/distrib/utils/sysinst/arch/sparc64/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:14 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2003/05/31 08:10:01 dsl Exp $
 #
 # Makefile for sparc64
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sparc64/md.c b/distrib/utils/sysinst/arch/sparc64/md.c
index fd7b6afe7a7c..d407790b0009 100644
--- a/distrib/utils/sysinst/arch/sparc64/md.c
+++ b/distrib/utils/sysinst/arch/sparc64/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.9 2002/12/05 01:17:30 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.10 2003/05/31 08:10:01 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,7 +55,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 int
 md_get_info(void)
diff --git a/distrib/utils/sysinst/arch/vax/Makefile b/distrib/utils/sysinst/arch/vax/Makefile
index 1b5d53b3ec80..f914f0634535 100644
--- a/distrib/utils/sysinst/arch/vax/Makefile
+++ b/distrib/utils/sysinst/arch/vax/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:15 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2003/05/31 08:10:01 dsl Exp $
 #
 # Makefile for vax
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/vax/md.c b/distrib/utils/sysinst/arch/vax/md.c
index ee98fb918bbd..caa76fffbe4a 100644
--- a/distrib/utils/sysinst/arch/vax/md.c
+++ b/distrib/utils/sysinst/arch/vax/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.19 2002/12/05 01:17:31 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.20 2003/05/31 08:10:01 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -55,7 +55,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 int
 md_get_info(void)
diff --git a/distrib/utils/sysinst/arch/x68k/Makefile b/distrib/utils/sysinst/arch/x68k/Makefile
index 493d2386e9e1..e25ea83c7bd9 100644
--- a/distrib/utils/sysinst/arch/x68k/Makefile
+++ b/distrib/utils/sysinst/arch/x68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2003/01/11 19:44:15 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2003/05/31 08:10:02 dsl Exp $
 #
 # Makefile for x68k
 #
@@ -7,7 +7,8 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c savenewlabel.c sizemultname.c
+	label.c target.c md.c savenewlabel.c sizemultname.c \
+	bsddisklabel.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/x68k/md.c b/distrib/utils/sysinst/arch/x68k/md.c
index 9368ac1a82c1..0f1abc921e11 100644
--- a/distrib/utils/sysinst/arch/x68k/md.c
+++ b/distrib/utils/sysinst/arch/x68k/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.19 2002/12/05 01:17:32 fvdl Exp $ */
+/*	$NetBSD: md.c,v 1.20 2003/05/31 08:10:02 dsl Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,6 @@
 #include "md.h"
 #include "msg_defs.h"
 #include "menu_defs.h"
-#include "bsddisklabel.c"
 
 #ifdef notyet
 #undef NDOSPART 8