diff --git a/distrib/utils/sysinst/arch/arc/md.c b/distrib/utils/sysinst/arch/arc/md.c
index 907c3305a6b1..3926d30ed58f 100644
--- a/distrib/utils/sysinst/arch/arc/md.c
+++ b/distrib/utils/sysinst/arch/arc/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2003/01/10 20:00:29 christos Exp $	*/
+/*	$NetBSD: md.c,v 1.6 2003/01/12 21:49:50 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -48,8 +48,6 @@
 #include <stdio.h>
 #include <util.h>
 #include <dirent.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/bebox/md.c b/distrib/utils/sysinst/arch/bebox/md.c
index d3eee9775926..aea75b91ad94 100644
--- a/distrib/utils/sysinst/arch/bebox/md.c
+++ b/distrib/utils/sysinst/arch/bebox/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.27 2003/01/10 20:00:29 christos Exp $ */
+/*	$NetBSD: md.c,v 1.28 2003/01/12 21:49:50 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -42,8 +42,6 @@
 #include <sys/sysctl.h>
 #include <stdio.h>
 #include <util.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/evbppc/md.c b/distrib/utils/sysinst/arch/evbppc/md.c
index 97d8aeb3d5ec..76c557e8098e 100644
--- a/distrib/utils/sysinst/arch/evbppc/md.c
+++ b/distrib/utils/sysinst/arch/evbppc/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.3 2003/01/10 20:00:30 christos Exp $	*/
+/*	$NetBSD: md.c,v 1.4 2003/01/12 21:49:51 christos Exp $	*/
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -42,8 +42,6 @@
 #include <sys/sysctl.h>
 #include <stdio.h>
 #include <util.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/hpcmips/md.c b/distrib/utils/sysinst/arch/hpcmips/md.c
index 65cbcdd9a4ef..4373779633db 100644
--- a/distrib/utils/sysinst/arch/hpcmips/md.c
+++ b/distrib/utils/sysinst/arch/hpcmips/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.18 2003/01/11 19:06:54 christos Exp $ */
+/*	$NetBSD: md.c,v 1.19 2003/01/12 21:49:51 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -43,8 +43,6 @@
 #include <sys/param.h>
 #include <machine/cpu.h>
 #include <sys/sysctl.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/i386/md.c b/distrib/utils/sysinst/arch/i386/md.c
index d05c6a76061e..984eeb74d49d 100644
--- a/distrib/utils/sysinst/arch/i386/md.c
+++ b/distrib/utils/sysinst/arch/i386/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.68 2003/01/11 22:32:25 christos Exp $ */
+/*	$NetBSD: md.c,v 1.69 2003/01/12 21:49:51 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -48,8 +48,6 @@
 #include <stdio.h>
 #include <util.h>
 #include <dirent.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/mac68k/md.c b/distrib/utils/sysinst/arch/mac68k/md.c
index 37f7d5d8bbd7..d2883cc3ed62 100644
--- a/distrib/utils/sysinst/arch/mac68k/md.c
+++ b/distrib/utils/sysinst/arch/mac68k/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.28 2003/01/11 19:28:04 christos Exp $ */
+/*	$NetBSD: md.c,v 1.29 2003/01/12 21:49:52 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -44,8 +44,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/prep/md.c b/distrib/utils/sysinst/arch/prep/md.c
index b35d6c20b5df..a70f06cc4af6 100644
--- a/distrib/utils/sysinst/arch/prep/md.c
+++ b/distrib/utils/sysinst/arch/prep/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2003/01/10 20:00:31 christos Exp $	*/
+/*	$NetBSD: md.c,v 1.6 2003/01/12 21:49:52 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -43,8 +43,6 @@
 
 #include <stdio.h>
 #include <util.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 
 #include <machine/cpu.h>
 
diff --git a/distrib/utils/sysinst/arch/sandpoint/md.c b/distrib/utils/sysinst/arch/sandpoint/md.c
index c4310e144b26..1dfaec2e0d12 100644
--- a/distrib/utils/sysinst/arch/sandpoint/md.c
+++ b/distrib/utils/sysinst/arch/sandpoint/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2003/01/10 20:00:31 christos Exp $ */
+/*	$NetBSD: md.c,v 1.6 2003/01/12 21:49:52 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -42,8 +42,6 @@
 #include <sys/sysctl.h>
 #include <stdio.h>
 #include <util.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/arch/x86_64/md.c b/distrib/utils/sysinst/arch/x86_64/md.c
index 83459eace5d7..06d60a517994 100644
--- a/distrib/utils/sysinst/arch/x86_64/md.c
+++ b/distrib/utils/sysinst/arch/x86_64/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.2 2003/01/10 20:00:31 christos Exp $ */
+/*	$NetBSD: md.c,v 1.3 2003/01/12 21:49:52 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -48,8 +48,6 @@
 #include <stdio.h>
 #include <util.h>
 #include <dirent.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 #include "defs.h"
 #include "md.h"
 #include "msg_defs.h"
diff --git a/distrib/utils/sysinst/defs.h b/distrib/utils/sysinst/defs.h
index 99f5c1a96c6c..bb2a8814fa86 100644
--- a/distrib/utils/sysinst/defs.h
+++ b/distrib/utils/sysinst/defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.74 2003/01/10 20:00:27 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.75 2003/01/12 21:49:50 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -41,6 +41,7 @@
 /* System includes needed for this. */
 #include <sys/types.h>
 #include <sys/disklabel.h>
+extern const char * const fstypenames[];
 
 #include "msg_defs.h"
 
diff --git a/distrib/utils/sysinst/disks.c b/distrib/utils/sysinst/disks.c
index 89a151afac3b..3a620c569073 100644
--- a/distrib/utils/sysinst/disks.c
+++ b/distrib/utils/sysinst/disks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.48 2003/01/10 20:00:28 christos Exp $ */
+/*	$NetBSD: disks.c,v 1.49 2003/01/12 21:49:50 christos Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -50,7 +50,9 @@
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #define FSTYPENAMES
+#define static
 #include <sys/disklabel.h>
+#undef static
 
 #include "defs.h"
 #include "md.h"
diff --git a/distrib/utils/sysinst/savenewlabel.c b/distrib/utils/sysinst/savenewlabel.c
index d109ec9fb989..74d971777e1f 100644
--- a/distrib/utils/sysinst/savenewlabel.c
+++ b/distrib/utils/sysinst/savenewlabel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: savenewlabel.c,v 1.1 2003/01/11 19:44:05 christos Exp $	*/
+/*	$NetBSD: savenewlabel.c,v 1.2 2003/01/12 21:49:50 christos Exp $	*/
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.1 2003/01/11 19:44:05 christos Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.2 2003/01/12 21:49:50 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -47,8 +47,6 @@ __RCSID("$NetBSD: savenewlabel.c,v 1.1 2003/01/11 19:44:05 christos Exp $");
 #include <unistd.h>
 #include <sys/dkio.h>
 #include <sys/ioctl.h>
-#define FSTYPENAMES
-#include <sys/disklabel.h>
 
 #include "defs.h"
 #include "msg_defs.h"