From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 8 Aug 2003 04:18:49 +0000 (+0000)
Subject: Kernel tree reorganization stage 2: Major cvs repository work.
X-Git-Tag: v2.0.1~13142
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/38a690d7ef32dab925f9d788db9099b562bc14ba

Kernel tree reorganization stage 2: Major cvs repository work.

This stage includes source code adjustments to make buildworld work again,
including extensive additional work on the /usr/include hierarchy.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index fe3f9eee12..204ff3a89f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.4 2003/08/05 07:45:39 asmodai Exp $
+# $DragonFly: src/Makefile.inc1,v 1.5 2003/08/08 04:18:24 dillon Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -230,8 +230,10 @@ USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
 		usr/share/groff_font/devutf8 \
 		usr/share/tmac/mdoc usr/share/tmac/mm
 
-INCDIRS=	arpa dev fs g++/std isc isofs libmilter objc openssl \
-		protocols readline rpc rpcsvc security ufs
+# XXX remove in favor of the BSD.include.dist mtree that we already have.
+#
+INCDIRS=	arpa dev g++/std isc libmilter objc openssl \
+		protocols readline rpc rpcsvc security
 
 #
 # buildworld
diff --git a/bin/df/df.c b/bin/df/df.c
index 8490cb2b9b..31060acc75 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -38,7 +38,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)df.c	8.9 (Berkeley) 5/8/95
  * $FreeBSD: src/bin/df/df.c,v 1.23.2.9 2002/07/01 00:14:24 iedowse Exp $
- * $DragonFly: src/bin/df/df.c,v 1.2 2003/06/17 04:22:49 dillon Exp $
+ * $DragonFly: src/bin/df/df.c,v 1.3 2003/08/08 04:18:29 dillon Exp $
  */
 
 #include <sys/cdefs.h>
@@ -46,8 +46,8 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/ufsmount.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 435efc83ae..13548e8ae4 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -40,7 +40,7 @@
  *
  * $Id: nfs_prot_freebsd3.h,v 1.4 1999/03/30 17:22:54 ezk Exp $
  * $FreeBSD: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.7 1999/09/15 05:45:14 obrien Exp $
- * $DragonFly: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.2 2003/06/17 04:23:57 dillon Exp $
+ * $DragonFly: src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h,v 1.3 2003/08/08 04:18:29 dillon Exp $
  *
  */
 
@@ -69,7 +69,7 @@ struct nfs_fh3;
 # include <nfs/nfs.h>
 #endif /* HAVE_NFS_NFS_H */
 #ifdef	HAVE_UFS_UFS_UFSMOUNT_H
-# include <ufs/ufs/ufsmount.h>
+# include <vfs/ufs/ufsmount.h>
 #endif	/* HAVE_UFS_UFS_UFSMOUNT_H */
 
 /*
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index e996915ff5..d1114d884e 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -40,7 +40,7 @@
  *
  * $Id: am_defs.h,v 1.11 1999/09/18 08:38:05 ezk Exp $
  * $FreeBSD: src/contrib/amd/include/am_defs.h,v 1.8 1999/11/05 11:58:03 obrien Exp $
- * $DragonFly: src/contrib/amd/include/am_defs.h,v 1.2 2003/06/17 04:23:57 dillon Exp $
+ * $DragonFly: src/contrib/amd/include/am_defs.h,v 1.3 2003/08/08 04:18:29 dillon Exp $
  *
  */
 
@@ -763,7 +763,7 @@ struct sockaddr_dl;
 # error do not include this file here because on netbsd/openbsd it
 # error causes errors with other header files.  Instead, add it to the
 # error specific conf/nfs_prot_*.h file.
-# include <ufs/ufs/ufsmount.h>
+# include <vfs/ufs/ufsmount.h>
 #endif	/* HAVE_UFS_UFS_UFSMOUNT_H */
 
 /*
@@ -1118,7 +1118,7 @@ extern char *nc_sperror(void);
  * Actions to take if <ufs/ufs_mount.h> exists.
  */
 #ifdef HAVE_UFS_UFS_MOUNT_H
-# include <ufs/ufs/ufsmount.h>
+# include <vfs/ufs/ufsmount.h>
 #endif /* HAVE_UFS_UFS_MOUNT_H */
 
 /*
diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c
index 10364e1470..75f9818635 100644
--- a/contrib/pnpinfo/pnpinfo.c
+++ b/contrib/pnpinfo/pnpinfo.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/contrib/pnpinfo/pnpinfo.c,v 1.7 1999/09/05 17:27:05 peter Exp $
- * $DragonFly: src/contrib/pnpinfo/pnpinfo.c,v 1.2 2003/06/17 04:24:06 dillon Exp $
+ * $DragonFly: src/contrib/pnpinfo/pnpinfo.c,v 1.3 2003/08/08 04:18:31 dillon Exp $
  */
 
 #include <sys/time.h>
@@ -37,7 +37,7 @@
 
 #include <machine/cpufunc.h>
 
-#include <isa/pnpreg.h>
+#include <bus/isa/pnpreg.h>
 
 #ifdef DEBUG
 #define	DEB(x) x
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 7d82679176..ff104983ea 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,5 +1,5 @@
 # $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.32.2.14 2003/01/24 09:47:07 roam Exp $
-# $DragonFly: src/etc/mtree/BSD.include.dist,v 1.3 2003/08/07 21:26:07 dillon Exp $
+# $DragonFly: src/etc/mtree/BSD.include.dist,v 1.4 2003/08/08 04:18:32 dillon Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -15,20 +15,26 @@
 	..
 	pccard
 	..
+	usb
+	..
+	pci
+	..
+	isa
+	..
     ..
     crypto
     ..
     dev
-        an
-        ..
-        firewire
-        ..
-        ppbus
-        ..
-        usb
-        ..
-        wi
-        ..
+	misc
+	    lpt
+	    ..
+	..
+	netif
+	    wi
+	    ..
+	..
+	raid
+	..
     ..
     netproto
 	atalk
@@ -61,6 +67,8 @@
     emulation
 	posix4
 	..
+	linux
+	..
     ..
     vfs
 	msdosfs
@@ -75,6 +83,8 @@
 	..
 	mfs
 	..
+	smbfs
+	..
 	isofs
 	    cd9660
 	    ..
@@ -92,9 +102,89 @@
         pc
         ..
     ..
+    i4b_machine
+    ..
     net
+	vlan
+	..
+	ipfw
+	..
+	ip6fw
+	..
+	ppp
+	..
+	ppp_layer
+	..
+	sl
+	..
+	dummynet
+	..
+	sppp
+	..
+	ip_mroute
+	..
+	bridge
+	..
+	tun
+	..
+	i4b
+	    include
+	    ..
+	..
     ..
     netgraph
+	UI
+	..
+	async
+	..
+	bpf
+	..
+	bridge
+	..
+	cisco
+	..
+	echo
+	..
+	eiface
+	..
+	etf
+	..
+	ether
+	..
+	fec
+	..
+	frame_relay
+	..
+	hole
+	..
+	iface
+	..
+	ksocket
+	..
+	l2tp
+	..
+	lmi
+	..
+	mppc
+	..
+	one2many
+	..
+	ppp
+	..
+	pppoe
+	..
+	pptpgre
+	..
+	rfc1490
+	..
+	socket
+	..
+	tee
+	..
+	tty
+	..
+	vjc
+	..
     ..
     netinet
     ..
@@ -106,8 +196,6 @@
     ..
     pccard
     ..
-    posix4
-    ..
     protocols
     ..
     readline
diff --git a/include/Makefile b/include/Makefile
index 900897f18e..d8a57e2bb9 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $
-# $DragonFly: src/include/Makefile,v 1.3 2003/08/07 21:26:08 dillon Exp $
+# $DragonFly: src/include/Makefile,v 1.4 2003/08/08 04:18:32 dillon Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -33,22 +33,45 @@ SHDRS=	soundcard.h joystick.h
 LHDRS=	aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \
 	termios.h ucontext.h
 
+# directories which also contain header files that need to be coiped.
+# Other directories, like 'bus' and 'netproto', are created using mtree.
+#
+# XXX allow these directories to not contain header files.
 LDIRS=	net netgraph netinet netinet6 sys vm
 
+# Subdirectories containing header files to copy.  In symlink mode 
+# the subdirectory will be symlinked.  Care must be taken to adjust
+# LSYMSUBDIRS below to remove subdirectories whos parent directories.
+# If you make a mistake, part of your source tree might get overwritten
+# when buildworld is run.
+#
 LSUBDIRS=	bus/cam bus/cam/scsi \
 	emulation/posix4 \
+	emulation/linux \
 	vfs/msdosfs vfs/nfs vfs/ntfs vfs/nwfs \
-	vfs/ufs \
-	bus/cam bus/pccard \
+	vfs/ufs vfs/smbfs \
+	net/vlan net/ipfw net/ip6fw net/dummynet net/sppp net/ip_mroute \
+	net/bridge net/tun net/ppp net/ppp_layer net/sl \
+	netgraph/UI netgraph/async netgraph/bpf netgraph/bridge \
+	netgraph/cisco netgraph/echo netgraph/eiface netgraph/etf \
+	netgraph/ether netgraph/fec netgraph/frame_relay netgraph/hole \
+	netgraph/iface netgraph/ksocket netgraph/l2tp netgraph/lmi \
+	netgraph/mppc netgraph/one2many netgraph/ppp \
+	netgraph/pppoe netgraph/pptpgre netgraph/rfc1490 netgraph/socket \
+	netgraph/tee netgraph/tty netgraph/vjc \
+	bus/cam bus/usb bus/pccard bus/pci bus/isa \
 	netproto/atalk netproto/atm netproto/ipsec netproto/ipx \
 	netproto/key netproto/natm netproto/ncp netproto/ns netproto/smb \
 	netproto/atm/ipatm netproto/atm/sigpvc netproto/atm/spans \
-	netproto/atm/uni \
-#	dev/an dev/firewire dev/ppbus dev/usb dev/wi \
+	netproto/atm/uni
 
-# For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/*
-# are taken care of
-LSYMSUBDIRS=	${LSUBDIRS:Ncam/scsi:Nnetatm/*}
+LSUBDIRS3= vfs/isofs/cd9660 net/i4b/include \
+	dev/misc/lpt dev/netif/wi
+
+# For SHARED=symlinks, bus/cam and netproto/atm are symlinks, so cam/scsi
+# and netproto/atm/* are taken care of
+LSYMSUBDIRS=	${LSUBDIRS:Nbus/cam/scsi:Nnetproto/atm/*:Nnet/*:Nnetgraph/*}
+LSYMSUBDIRS3=	${LSUBDIRS3:Nnet/*}
 
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
@@ -83,10 +106,13 @@ INCSLINKS+=	emulation/posix4/$i ${INCLUDEDIR}/$i
 .endfor
 INCSLINKS+=	bus/cam ${INCLUDEDIR}/cam
 INCSLINKS+=	vfs/msdosfs ${INCLUDEDIR}/msdosfs
+INCSLINKS+=	vfs/isofs ${INCLUDEDIR}/isofs
+INCSLINKS+=	vfs/mfs ${INCLUDEDIR}/mfs
 INCSLINKS+=	vfs/nfs ${INCLUDEDIR}/nfs
 INCSLINKS+=	vfs/ntfs ${INCLUDEDIR}/ntfs
 INCSLINKS+=	vfs/nwfs ${INCLUDEDIR}/nwfs
 INCSLINKS+=	vfs ${INCLUDEDIR}/fs
+INCSLINKS+=	emulation ${INCLUDEDIR}/compat
 INCSLINKS+=	netproto/atalk ${INCLUDEDIR}/netatalk
 INCSLINKS+=	netproto/atm ${INCLUDEDIR}/netatm
 INCSLINKS+=	netproto/ipsec ${INCLUDEDIR}/netipsec
@@ -98,15 +124,17 @@ INCSLINKS+=	netproto/ns ${INCLUDEDIR}/netns
 INCSLINKS+=	netproto/smb ${INCLUDEDIR}/netsmb
 INCSLINKS+=	bus/pccard ${INCLUDEDIR}/pccard
 
-copies:
-.for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto
+mtree_setup:
+.for i in ${LDIRS} ${LSYMSUBDIRS} ${LSYMSUBDIRS3} machine crypto
 	if [ -h ${DESTDIR}/usr/include/$i ]; then \
 		rm -f ${DESTDIR}/usr/include/$i; \
 	fi
 .endfor
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
-.for i in ${LDIRS} ${LSUBDIRS}
+
+copies:		mtree_setup
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBDIRS3}
 	cd ${.CURDIR}/../sys; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
 		${DESTDIR}/usr/include/$i
@@ -124,11 +152,16 @@ copies:
 		${DESTDIR}/usr/include/machine/pc
 .endif
 .endif
+.if exists(${.CURDIR}/../sys/net/i4b/include/${MACHINE_ARCH})
+	cd ${.CURDIR}/../sys/net/i4b/include/${MACHINE_ARCH}; \
+		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+		${DESTDIR}/usr/include/i4b_machine
+.endif
 .for i in ${SHDRS}
 	ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
 .endfor
 
-symlinks:
+symlinks:	mtree_setup
 	@${ECHO} "Setting up symlinks to kernel source tree..."
 .for i in ${LDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
@@ -139,9 +172,15 @@ symlinks:
 .for i in ${LSYMSUBDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
 	ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i
+.endfor
+.for i in ${LSYMSUBDIRS3}
+	rm -rf ${DESTDIR}/usr/include/$i
+	ln -s ../../../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
 	rm -rf ${DESTDIR}/usr/include/machine
 	ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
+	rm -rf ${DESTDIR}/usr/include/i4b_machine
+	ln -s ../../sys/net/i4b/include/${MACHINE_ARCH} ${DESTDIR}/usr/include/i4b_machine
 
 .include <bsd.prog.mk>
 
diff --git a/lib/libalias/alias_db.c b/lib/libalias/alias_db.c
index 696fe93c69..ec27b22cb5 100644
--- a/lib/libalias/alias_db.c
+++ b/lib/libalias/alias_db.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libalias/alias_db.c,v 1.21.2.14 2002/07/24 03:21:24 luigi Exp $
- * $DragonFly: src/lib/libalias/alias_db.c,v 1.2 2003/06/17 04:26:41 dillon Exp $
+ * $DragonFly: src/lib/libalias/alias_db.c,v 1.3 2003/08/08 04:18:33 dillon Exp $
  */
 
 /*
@@ -2639,7 +2639,7 @@ PacketAliasCheckNewLink(void)
 
 /* Firewall include files */
 #include <net/if.h>
-#include <netinet/ip_fw.h>
+#include <net/ipfw/ip_fw.h>
 #include <string.h>
 #include <err.h>
 
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 9bfdd74513..cb137aa57f 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -32,14 +32,14 @@
  *
  * @(#)disklabel.c	8.2 (Berkeley) 5/3/95
  * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $
- * $DragonFly: src/lib/libc/gen/disklabel.c,v 1.2 2003/06/17 04:26:42 dillon Exp $
+ * $DragonFly: src/lib/libc/gen/disklabel.c,v 1.3 2003/08/08 04:18:33 dillon Exp $
  */
 
 #include <sys/param.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/disktab.c b/lib/libc/gen/disktab.c
index 560bfbb2f6..a0df4d5e9f 100644
--- a/lib/libc/gen/disktab.c
+++ b/lib/libc/gen/disktab.c
@@ -32,14 +32,14 @@
  *
  * @(#)disklabel.c	8.2 (Berkeley) 5/3/95
  * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $
- * $DragonFly: src/lib/libc/gen/disktab.c,v 1.2 2003/06/17 04:26:42 dillon Exp $
+ * $DragonFly: src/lib/libc/gen/disktab.c,v 1.3 2003/08/08 04:18:33 dillon Exp $
  */
 
 #include <sys/param.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index d18243307e..126d036260 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/lib/libcam/Makefile,v 1.6.2.2 2001/04/25 10:04:22 ru Exp $
-# $DragonFly: src/lib/libcam/Makefile,v 1.2 2003/06/17 04:26:48 dillon Exp $
+# $DragonFly: src/lib/libcam/Makefile,v 1.3 2003/08/08 04:18:33 dillon Exp $
 
 MAINTAINER=ken@FreeBSD.ORG
 
@@ -33,7 +33,7 @@ MLINKS+=cam.3 cam_open_device.3 \
 	cam_cdbparse.3 csio_encode_visit.3 \
 	cam_cdbparse.3 buff_encode_visit.3
 
-.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam
+.PATH: ${.CURDIR}/../../sys/bus/cam/scsi ${.CURDIR}/../../sys/bus/cam
 
 SDIR= ${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR} -I${SDIR}
diff --git a/lib/libcr/gen/disklabel.c b/lib/libcr/gen/disklabel.c
index cf7f934421..f1762f1948 100644
--- a/lib/libcr/gen/disklabel.c
+++ b/lib/libcr/gen/disklabel.c
@@ -32,14 +32,14 @@
  *
  * @(#)disklabel.c	8.2 (Berkeley) 5/3/95
  * $FreeBSD: src/lib/libc/gen/disklabel.c,v 1.9.2.1 2001/03/05 08:40:47 obrien Exp $
- * $DragonFly: src/lib/libcr/gen/Attic/disklabel.c,v 1.2 2003/06/17 04:26:42 dillon Exp $
+ * $DragonFly: src/lib/libcr/gen/Attic/disklabel.c,v 1.3 2003/08/08 04:18:34 dillon Exp $
  */
 
 #include <sys/param.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index 015756d19f..e1c92e3395 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -37,7 +37,7 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $FreeBSD: src/lib/libnetgraph/debug.c,v 1.5.2.1 2000/05/01 18:09:54 archie Exp $
- * $DragonFly: src/lib/libnetgraph/debug.c,v 1.2 2003/06/17 04:26:50 dillon Exp $
+ * $DragonFly: src/lib/libnetgraph/debug.c,v 1.3 2003/08/08 04:18:34 dillon Exp $
  * $Whistle: debug.c,v 1.24 1999/01/24 01:15:33 archie Exp $
  */
 
@@ -52,37 +52,37 @@
 #include <net/bpf.h>
 
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include "netgraph.h"
 #include "internal.h"
 
-#include <netgraph/ng_UI.h>
-#include <netgraph/ng_async.h>
-#include <netgraph/ng_bpf.h>
-#include <netgraph/ng_cisco.h>
-#include <netgraph/ng_echo.h>
-#include <netgraph/ng_ether.h>
-#include <netgraph/ng_frame_relay.h>
-#include <netgraph/ng_hole.h>
-#include <netgraph/ng_iface.h>
-#include <netgraph/ng_ksocket.h>
-#include <netgraph/ng_lmi.h>
-#include <netgraph/ng_ppp.h>
-#include <netgraph/ng_pppoe.h>
-#include <netgraph/ng_rfc1490.h>
-#include <netgraph/ng_socket.h>
-#include <netgraph/ng_tee.h>
-#include <netgraph/ng_tty.h>
-#include <netgraph/ng_vjc.h>
+#include <netgraph/UI/ng_UI.h>
+#include <netgraph/async/ng_async.h>
+#include <netgraph/bpf/ng_bpf.h>
+#include <netgraph/cisco/ng_cisco.h>
+#include <netgraph/echo/ng_echo.h>
+#include <netgraph/ether/ng_ether.h>
+#include <netgraph/frame_relay/ng_frame_relay.h>
+#include <netgraph/hole/ng_hole.h>
+#include <netgraph/iface/ng_iface.h>
+#include <netgraph/ksocket/ng_ksocket.h>
+#include <netgraph/lmi/ng_lmi.h>
+#include <netgraph/ppp/ng_ppp.h>
+#include <netgraph/pppoe/ng_pppoe.h>
+#include <netgraph/rfc1490/ng_rfc1490.h>
+#include <netgraph/socket/ng_socket.h>
+#include <netgraph/tee/ng_tee.h>
+#include <netgraph/tty/ng_tty.h>
+#include <netgraph/vjc/ng_vjc.h>
 #ifdef	WHISTLE
 #include <machine/../isa/df_def.h>
 #include <machine/../isa/if_wfra.h>
 #include <machine/../isa/ipac.h>
 #include <netgraph/ng_df.h>
 #include <netgraph/ng_ipac.h>
-#include <netgraph/ng_mppc.h>
-#include <netgraph/ng_pptpgre.h>
+#include <netgraph/mppc/ng_mppc.h>
+#include <netgraph/pptpgre/ng_pptpgre.h>
 #include <netgraph/ng_tn.h>
 #endif
 
diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index d3ef6c8b56..cce835f464 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -37,14 +37,14 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $FreeBSD: src/lib/libnetgraph/msg.c,v 1.2.2.3 2001/10/29 18:36:30 archie Exp $
- * $DragonFly: src/lib/libnetgraph/msg.c,v 1.2 2003/06/17 04:26:50 dillon Exp $
+ * $DragonFly: src/lib/libnetgraph/msg.c,v 1.3 2003/08/08 04:18:34 dillon Exp $
  * $Whistle: msg.c,v 1.9 1999/01/20 00:57:23 archie Exp $
  */
 
 #include <sys/types.h>
 #include <stdarg.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include "netgraph.h"
 #include "internal.h"
diff --git a/lib/libnetgraph/sock.c b/lib/libnetgraph/sock.c
index c9f59c66f1..eb8a2e3892 100644
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -37,14 +37,14 @@
  * Author: Archie Cobbs <archie@whistle.com>
  *
  * $FreeBSD: src/lib/libnetgraph/sock.c,v 1.2 2000/01/28 00:48:27 archie Exp $
- * $DragonFly: src/lib/libnetgraph/sock.c,v 1.2 2003/06/17 04:26:50 dillon Exp $
+ * $DragonFly: src/lib/libnetgraph/sock.c,v 1.3 2003/08/08 04:18:34 dillon Exp $
  * $Whistle: sock.c,v 1.12 1999/01/20 00:57:23 archie Exp $
  */
 
 #include <sys/types.h>
 #include <stdarg.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include "netgraph.h"
 #include "internal.h"
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 672fe9fd12..199c05b5a7 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -1,7 +1,3 @@
-/* $FreeBSD: src/lib/libstand/cd9660.c,v 1.4.2.4 2001/12/21 22:17:44 jhb Exp $ */
-/* $DragonFly: src/lib/libstand/cd9660.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */
-/*	$NetBSD: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $	*/
-
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
  * Copyright (C) 1996 TooLs GmbH.
@@ -31,6 +27,10 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $
+ * $FreeBSD: src/lib/libstand/cd9660.c,v 1.4.2.4 2001/12/21 22:17:44 jhb Exp $
+ * $DragonFly: src/lib/libstand/cd9660.c,v 1.3 2003/08/08 04:18:34 dillon Exp $
  */
 
 /*
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 914c2cc0d2..b01022a605 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/lib/libstand/ufs.c,v 1.5.6.1 2000/05/04 13:47:53 ps Exp $ */
-/* $DragonFly: src/lib/libstand/ufs.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */
+/* $DragonFly: src/lib/libstand/ufs.c,v 1.3 2003/08/08 04:18:34 dillon Exp $ */
 /*	$NetBSD: ufs.c,v 1.20 1998/03/01 07:15:39 ross Exp $	*/
 
 /*-
@@ -70,9 +70,9 @@
 
 #include <sys/param.h>
 #include <sys/time.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 #include "stand.h"
 #include "string.h"
 
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index b3bd345768..90e7ccbfda 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libusbhid/descr.c,v 1.7.2.1 2002/04/03 15:54:00 joe Exp $
- * $DragonFly: src/lib/libusbhid/descr.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libusbhid/descr.c,v 1.3 2003/08/08 04:18:35 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #endif
 
-#include <dev/usb/usb.h>
+#include <bus/usb/usb.h>
 
 #include "libusbhid.h"
 #include "usbvar.h"
diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c
index 076da41bde..8614c644df 100644
--- a/lib/libusbhid/parse.c
+++ b/lib/libusbhid/parse.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libusbhid/parse.c,v 1.6.2.1 2002/04/03 15:54:00 joe Exp $
- * $DragonFly: src/lib/libusbhid/parse.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/libusbhid/parse.c,v 1.3 2003/08/08 04:18:35 dillon Exp $
  */
 
 #include <assert.h>
@@ -34,8 +34,8 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
+#include <bus/usb/usb.h>
+#include <bus/usb/usbhid.h>
 
 #include "libusbhid.h"
 #include "usbvar.h"
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 50dbcf9391..b3bf86ab4f 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.2.6.8 2002/06/17 02:21:25 brian Exp $
- * $DragonFly: src/libexec/pppoed/pppoed.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/pppoed/pppoed.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -37,10 +37,10 @@
 #include <net/ethernet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netgraph/ng_ether.h>
+#include <netgraph/ether/ng_ether.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_pppoe.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/pppoe/ng_pppoe.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include <errno.h>
 #include <paths.h>
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index f300cb7c9f..a63920f915 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -4,7 +4,7 @@
  * There is no copyright, you can use it as you want.
  *
  * $FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.3.2.1 2001/07/02 23:46:27 mikeh Exp $
- * $DragonFly: src/libexec/rpc.rquotad/rquotad.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rpc.rquotad/rquotad.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -28,7 +28,7 @@
 #include <syslog.h>
 #include <varargs.h>
 
-#include <ufs/ufs/quota.h>
+#include <vfs/ufs/quota.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 #include <rpcsvc/rquota.h>
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index bdf66f7a69..b7d066b554 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.c
@@ -5,7 +5,7 @@
  * generation being slated to essentially a complete rewrite.
  *
  * $FreeBSD: src/release/sysinstall/floppy.c,v 1.34.2.2 2002/10/24 12:57:57 nyan Exp $
- * $DragonFly: src/release/sysinstall/Attic/floppy.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/floppy.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -53,7 +53,7 @@
 #include <msdosfs/msdosfsmount.h>
 #undef MSDOSFS
 
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 static Boolean floppyMounted;
 
 char *distWanted;
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 291fc2f83b..39e144152a 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -5,7 +5,7 @@
  * generation being essentially a complete rewrite.
  *
  * $FreeBSD: src/release/sysinstall/install.c,v 1.268.2.42 2003/02/22 21:16:47 ceri Exp $
- * $DragonFly: src/release/sysinstall/Attic/install.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/install.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -45,7 +45,7 @@
 #include <sys/param.h>
 #define MSDOSFS
 #include <sys/mount.h>
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 #include <msdosfs/msdosfsmount.h>
 #undef MSDOSFS
 #include <sys/stat.h>
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index ab9c3e22fc..ad554617eb 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -2,7 +2,7 @@
  * Miscellaneous support routines..
  *
  * $FreeBSD: src/release/sysinstall/misc.c,v 1.40.2.1 2001/09/27 06:51:09 murray Exp $
- * $DragonFly: src/release/sysinstall/Attic/misc.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/sysinstall/Attic/misc.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -43,7 +43,7 @@
 #include <sys/wait.h>
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 #include <sys/reboot.h>
 #include <sys/disklabel.h>
 
diff --git a/sbin/atm/atm/atm_eni.c b/sbin/atm/atm/atm_eni.c
index 9e52b3faed..65be6e0cf3 100644
--- a/sbin/atm/atm/atm_eni.c
+++ b/sbin/atm/atm/atm_eni.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sbin/atm/atm/atm_eni.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
- *	@(#) $DragonFly: src/sbin/atm/atm/atm_eni.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ *	@(#) $DragonFly: src/sbin/atm/atm/atm_eni.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  */
 
 /*
@@ -45,7 +45,7 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_sys.h>
 #include <netatm/atm_ioctl.h>
-#include <dev/hea/eni_stats.h>
+#include <dev/atm/hea/eni_stats.h>
 
 #include <errno.h>
 #include <libatm.h>
diff --git a/sbin/atm/atm/atm_fore200.c b/sbin/atm/atm/atm_fore200.c
index 9f88d3e08b..b3ce297c7a 100644
--- a/sbin/atm/atm/atm_fore200.c
+++ b/sbin/atm/atm/atm_fore200.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sbin/atm/atm/atm_fore200.c,v 1.3.2.1 2000/07/01 06:02:14 ps Exp $
- *	@(#) $DragonFly: src/sbin/atm/atm/atm_fore200.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ *	@(#) $DragonFly: src/sbin/atm/atm/atm_fore200.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  */
 
 /*
@@ -45,9 +45,9 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_sys.h>
 #include <netatm/atm_ioctl.h>
-#include <dev/hfa/fore_aali.h>
-#include <dev/hfa/fore_slave.h>
-#include <dev/hfa/fore_stats.h>
+#include <dev/atm/hfa/fore_aali.h>
+#include <dev/atm/hfa/fore_slave.h>
+#include <dev/atm/hfa/fore_stats.h>
 
 #include <errno.h>
 #include <libatm.h>
diff --git a/sbin/atm/fore_dnld/fore_dnld.c b/sbin/atm/fore_dnld/fore_dnld.c
index ed12d19d4b..84d85f683d 100644
--- a/sbin/atm/fore_dnld/fore_dnld.c
+++ b/sbin/atm/fore_dnld/fore_dnld.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.6.2.2 2000/12/11 01:03:24 obrien Exp $
- *	@(#) $DragonFly: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ *	@(#) $DragonFly: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
  */
 
 /*
@@ -46,9 +46,9 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_sys.h>
 #include <netatm/atm_ioctl.h>
-#include <dev/hfa/fore.h>
-#include <dev/hfa/fore_aali.h>
-#include <dev/hfa/fore_slave.h>
+#include <dev/atm/hfa/fore.h>
+#include <dev/atm/hfa/fore_aali.h>
+#include <dev/atm/hfa/fore_slave.h>
 
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 5ddcc4f36a..70da035272 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *      @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.6.2.2 2001/03/04 07:15:30 kris Exp $
- *      @(#) $DragonFly: src/sbin/atm/ilmid/ilmid.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ *      @(#) $DragonFly: src/sbin/atm/ilmid/ilmid.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 /*
@@ -57,10 +57,10 @@
 #include <netatm/atm_sap.h>
 #include <netatm/atm_sys.h>
 #include <netatm/atm_ioctl.h>
-#include <dev/hea/eni_stats.h>
-#include <dev/hfa/fore_aali.h>
-#include <dev/hfa/fore_slave.h>
-#include <dev/hfa/fore_stats.h>
+#include <dev/atm/hea/eni_stats.h>
+#include <dev/atm/hfa/fore_aali.h>
+#include <dev/atm/hfa/fore_slave.h>
+#include <dev/atm/hfa/fore_stats.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 388276ae36..39a5c3aa09 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1981, 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)badsect.c	8.1 (Berkeley) 6/5/93
  * $FreeBSD: src/sbin/badsect/badsect.c,v 1.7.2.2 2001/07/30 10:30:04 dd Exp $
- * $DragonFly: src/sbin/badsect/badsect.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/badsect/badsect.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 /*
@@ -49,8 +49,8 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
+#include <vfs/ufs/dinode.h>
 
 #include <err.h>
 #include <dirent.h>
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 333aebf1ee..0101bd57b6 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -36,13 +36,13 @@
  * @(#) Copyright (c) 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)clri.c	8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sbin/clri/clri.c,v 1.4 1999/08/28 00:12:32 peter Exp $
- * $DragonFly: src/sbin/clri/clri.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/clri/clri.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 2a118199c9..46e30e5114 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -37,7 +37,7 @@
  * @(#)disklabel.c	1.2 (Symmetric) 11/28/85
  * @(#)disklabel.c      8.2 (Berkeley) 1/7/94
  * $FreeBSD: src/sbin/disklabel/disklabel.c,v 1.28.2.15 2003/01/24 16:18:16 des Exp $
- * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@
 #include <sys/wait.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/fs.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/sbin/dump/cache.c b/sbin/dump/cache.c
index cc295a1d35..9469b40e32 100644
--- a/sbin/dump/cache.c
+++ b/sbin/dump/cache.c
@@ -4,7 +4,7 @@
  *	Block cache for dump
  *
  * $FreeBSD: src/sbin/dump/cache.c,v 1.1.2.1 2003/01/25 18:54:59 dillon Exp $
- * $DragonFly: src/sbin/dump/cache.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/cache.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -18,9 +18,9 @@
 #include <ufs/fsdir.h>
 #include <ufs/inode.h>
 #else
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 #endif
 
 #include <protocols/dumprestore.h>
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 7c001b1ed9..0146468fc2 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -32,7 +32,7 @@
  *
  * @(#)dumprmt.c	8.3 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $
- * $DragonFly: src/sbin/dump/dumprmt.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/dumprmt.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,7 @@
 
 #include <ufs/inode.h>
 #else
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 #endif
 
 #include <netinet/in.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index c02d3de6b7..6d46618953 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -32,7 +32,7 @@
  *
  * @(#)itime.c	8.1 (Berkeley) 6/5/93
  * $FreeBSD: src/sbin/dump/itime.c,v 1.3.2.1 2001/08/01 06:29:35 obrien Exp $
- * $DragonFly: src/sbin/dump/itime.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/itime.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <ufs/inode.h>
 #include <ufs/fs.h>
 #else
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 #endif
 
 #include <protocols/dumprestore.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 9dcf6a5952..2950b55275 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/dump/main.c,v 1.20.2.9 2003/01/25 18:54:59 dillon Exp $
- * $DragonFly: src/sbin/dump/main.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/main.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -45,8 +45,8 @@
 #include <ufs/inode.h>
 #include <ufs/fs.h>
 #else
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 #endif
 
 #include <protocols/dumprestore.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 0e544dedb9..aff2ec7ccd 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -32,7 +32,7 @@
  *
  * @(#)tape.c	8.4 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $
- * $DragonFly: src/sbin/dump/tape.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/tape.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -46,8 +46,8 @@
 #include <ufs/fs.h>
 #include <ufs/inode.h>
 #else
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 #endif
 
 #include <protocols/dumprestore.h>
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 941a7ec3a1..5e87a0744f 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,7 +32,7 @@
  *
  * @(#)traverse.c	8.7 (Berkeley) 6/15/95
  * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $
- * $DragonFly: src/sbin/dump/traverse.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dump/traverse.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -44,9 +44,9 @@
 #include <ufs/fsdir.h>
 #include <ufs/inode.h>
 #else
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 #endif
 
 #include <protocols/dumprestore.h>
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index d74e748843..1cbf6681af 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -33,13 +33,13 @@
  * @(#) Copyright (c) 1983, 1992, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)dumpfs.c	8.5 (Berkeley) 4/29/95
  * $FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.13.2.1 2001/01/22 18:10:11 iedowse Exp $
- * $DragonFly: src/sbin/dumpfs/dumpfs.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/dumpfs/dumpfs.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/time.h>
 
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index 0eddf63b4e..446377385f 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,12 +1,12 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 # $FreeBSD: src/sbin/fsck/Makefile,v 1.5.6.1 2001/04/25 10:58:17 ru Exp $
-# $DragonFly: src/sbin/fsck/Makefile,v 1.2 2003/06/17 04:27:32 dillon Exp $
+# $DragonFly: src/sbin/fsck/Makefile,v 1.3 2003/08/08 04:18:37 dillon Exp $
 
 PROG=	fsck
 MAN=	fsck.8
 SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+=-W
-.PATH:	${.CURDIR}/../../sys/ufs/ffs
+.PATH:	${.CURDIR}/../../sys/vfs/ufs
 
 .include <bsd.prog.mk>
diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c
index 84a30d1fdc..b685e91c57 100644
--- a/sbin/fsck/dir.c
+++ b/sbin/fsck/dir.c
@@ -32,15 +32,15 @@
  *
  * @(#)dir.c	8.8 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/dir.c,v 1.15 1999/08/28 00:12:45 peter Exp $
- * $DragonFly: src/sbin/fsck/dir.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/dir.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/time.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c
index 0046ffaa59..b07c7ac63d 100644
--- a/sbin/fsck/inode.c
+++ b/sbin/fsck/inode.c
@@ -32,15 +32,15 @@
  *
  * @(#)inode.c	8.8 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/inode.c,v 1.20 2000/02/28 20:02:41 mckusick Exp $
- * $DragonFly: src/sbin/fsck/inode.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/inode.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/time.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <pwd.h>
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index 4bcb4a9023..8fc6911662 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1986, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/14/95
  * $FreeBSD: src/sbin/fsck/main.c,v 1.21.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/main.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/main.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -42,9 +42,9 @@
 #include <sys/mount.h>
 #include <sys/resource.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/ufsmount.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c
index 2f8b81a88e..2dddb3767a 100644
--- a/sbin/fsck/pass1.c
+++ b/sbin/fsck/pass1.c
@@ -32,14 +32,14 @@
  *
  * @(#)pass1.c	8.6 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass1.c,v 1.16.2.5 2002/06/23 22:34:58 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass1.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass1.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c
index 8421a4bf04..65c92a9703 100644
--- a/sbin/fsck/pass1b.c
+++ b/sbin/fsck/pass1b.c
@@ -32,13 +32,13 @@
  *
  * @(#)pass1b.c	8.4 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass1b.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass1b.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass1b.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <string.h>
 
diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c
index 9d2fe48f6a..86f58c2c71 100644
--- a/sbin/fsck/pass2.c
+++ b/sbin/fsck/pass2.c
@@ -32,13 +32,13 @@
  *
  * @(#)pass2.c	8.9 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass2.c,v 1.10.2.2 2001/11/24 15:14:59 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass2.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass2.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsck/pass3.c b/sbin/fsck/pass3.c
index 7c0e574ccc..6d08a320b3 100644
--- a/sbin/fsck/pass3.c
+++ b/sbin/fsck/pass3.c
@@ -32,14 +32,14 @@
  *
  * @(#)pass3.c	8.2 (Berkeley) 4/27/95
  * $FreeBSD: src/sbin/fsck/pass3.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass3.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass3.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include <string.h>
 
diff --git a/sbin/fsck/pass4.c b/sbin/fsck/pass4.c
index 84f87e8ddb..1d536fe913 100644
--- a/sbin/fsck/pass4.c
+++ b/sbin/fsck/pass4.c
@@ -32,13 +32,13 @@
  *
  * @(#)pass4.c	8.4 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass4.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass4.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass4.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c
index 5e5a258fe0..9146d61abf 100644
--- a/sbin/fsck/pass5.c
+++ b/sbin/fsck/pass5.c
@@ -32,13 +32,13 @@
  *
  * @(#)pass5.c	8.9 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass5.c,v 1.17.2.2 2002/11/26 04:46:59 julian Exp $
- * $DragonFly: src/sbin/fsck/pass5.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/pass5.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 16f32c3930..9864bf2d34 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -32,14 +32,14 @@
  *
  * @(#)preen.c	8.5 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $
- * $DragonFly: src/sbin/fsck/preen.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/preen.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 5aada60668..3bddb8bd6f 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -32,7 +32,7 @@
  *
  * @(#)setup.c	8.10 (Berkeley) 5/9/95
  * $FreeBSD: src/sbin/fsck/setup.c,v 1.17.2.4 2002/06/24 05:10:41 dillon Exp $
- * $DragonFly: src/sbin/fsck/setup.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/setup.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #define DKTYPENAMES
@@ -41,8 +41,8 @@
 #include <sys/disklabel.h>
 #include <sys/file.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index 964163c51f..64ebb6b222 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -32,14 +32,14 @@
  *
  * @(#)utilities.c	8.6 (Berkeley) 5/19/95
  * $FreeBSD: src/sbin/fsck/utilities.c,v 1.11.2.3 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/utilities.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsck/utilities.c,v 1.3 2003/08/08 04:18:37 dillon Exp $
  */
 
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <string.h>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 70711208ef..5040b7e92a 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,7 +1,7 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/sbin/fsdb/Makefile,v 1.9.2.1 2001/04/25 10:58:17 ru Exp $
-# $DragonFly: src/sbin/fsdb/Makefile,v 1.2 2003/06/17 04:27:32 dillon Exp $
+# $DragonFly: src/sbin/fsdb/Makefile,v 1.3 2003/08/08 04:18:38 dillon Exp $
 
 PROG=	fsdb
 MAN=	fsdb.8
@@ -11,6 +11,6 @@ SRCS=	fsdb.c fsdbutil.c \
 CFLAGS+= -I${.CURDIR}/../fsck
 LDADD+= -ledit -ltermcap
 DPADD+=	${LIBEDIT} ${LIBTERMCAP}
-.PATH:	${.CURDIR}/../fsck ${.CURDIR}/../../sys/ufs/ffs
+.PATH:	${.CURDIR}/../fsck ${.CURDIR}/../../sys/vfs/ufs
 
 .include <bsd.prog.mk>
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index b49ccf4cb4..c7fd06e924 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/fsdb/fsdb.c,v 1.13.2.3 2002/03/20 13:39:02 joerg Exp $
- * $DragonFly: src/sbin/fsdb/fsdb.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsdb/fsdb.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -40,9 +40,9 @@
 #include <pwd.h>
 #include <string.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 
 #include "fsdb.h"
 #include "fsck.h"
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index a6e3879bdf..4811aa1e8d 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/fsdb/fsdbutil.c,v 1.9.2.2 2002/03/20 13:39:02 joerg Exp $
- * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsdb/fsdbutil.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <time.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include <sys/ioctl.h>
 
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index adf729b04b..38a2919424 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -30,7 +30,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/fsirand/fsirand.c,v 1.7.2.1 2000/07/01 06:23:36 ps Exp $
- * $DragonFly: src/sbin/fsirand/fsirand.c,v 1.2 2003/06/17 04:27:32 dillon Exp $
+ * $DragonFly: src/sbin/fsirand/fsirand.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  */
 
 #include <sys/disklabel.h>
@@ -38,8 +38,8 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
+#include <vfs/ufs/dinode.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 00315d5483..d7378ba385 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -37,7 +37,7 @@
  *
  * $TSHeader: src/sbin/growfs/debug.c,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
  * $FreeBSD: src/sbin/growfs/debug.c,v 1.3.2.1 2001/07/16 15:02:13 tomsoft Exp $
- * $DragonFly: src/sbin/growfs/debug.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/growfs/debug.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  *
  * $FreeBSD: src/sbin/growfs/debug.c,v 1.3.2.1 2001/07/16 15:02:13 tomsoft Exp $
  */
@@ -46,8 +46,8 @@
 #include <sys/param.h>
 
 #include <stdio.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include "debug.h"
 
diff --git a/sbin/growfs/debug.h b/sbin/growfs/debug.h
index 44b1f32dbf..99ecd2696b 100644
--- a/sbin/growfs/debug.h
+++ b/sbin/growfs/debug.h
@@ -37,7 +37,7 @@
  *
  * $TSHeader: src/sbin/growfs/debug.h,v 1.2 2000/11/16 18:43:50 tom Exp $
  * $FreeBSD: src/sbin/growfs/debug.h,v 1.1.2.1 2001/07/16 15:02:13 tomsoft Exp $
- * $DragonFly: src/sbin/growfs/debug.h,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/growfs/debug.h,v 1.3 2003/08/08 04:18:38 dillon Exp $
  *
  */
 
@@ -46,8 +46,8 @@
 /* ********************************************************** INCLUDES ***** */
 #include <sys/param.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 void dbg_open(const char *);
 void dbg_close(void);
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 28cb95928f..f00e5fff7b 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -39,7 +39,7 @@
  *
  * @(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz Copyright (c) 1980, 1989, 1993 The Regents of the University of California. All rights reserved.
  * $FreeBSD: src/sbin/growfs/growfs.c,v 1.4.2.2 2001/08/14 12:45:11 chm Exp $
- * $DragonFly: src/sbin/growfs/growfs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/growfs/growfs.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  */
 
 /* ********************************************************** INCLUDES ***** */
@@ -56,8 +56,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
 
 #include "debug.h"
 
diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c
index f98faeaa5a..5a1f1fd31b 100644
--- a/sbin/ifconfig/ifvlan.c
+++ b/sbin/ifconfig/ifvlan.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
- * $DragonFly: src/sbin/ifconfig/ifvlan.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/ifconfig/ifvlan.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  *
  * $FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.2 1999/08/28 00:13:09 peter Exp $
  */
@@ -47,7 +47,7 @@
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_vlan_var.h>
+#include <net/vlan/if_vlan_var.h>
 #include <net/route.h>
 
 #include <ctype.h>
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index ab6913d05f..3aa58e5be2 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3.2.12 2003/02/23 20:17:15 trhodes Exp $
-.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.2 2003/06/17 04:27:33 dillon Exp $
+.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.3 2003/08/08 04:18:38 dillon Exp $
 .\"
 .\"	$KAME$
 .\"
@@ -329,7 +329,7 @@ A range may only be specified as the first value,
 and the length of the port list is limited to
 .Dv IPV6_FW_MAX_PORTS
 (as defined in
-.Pa /usr/src/sys/netinet6/ip6_fw.h )
+.Pa /usr/src/sys/net/ip6fw/ip6_fw.h )
 ports.
 .Pp
 Fragmented packets which have a non-zero offset (i.e. not the first
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index f9726a6c1e..ba536a37aa 100644
--- a/sbin/ip6fw/ip6fw.c
+++ b/sbin/ip6fw/ip6fw.c
@@ -49,7 +49,7 @@
  *
  * $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $
  * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.1.2.9 2003/04/05 10:54:51 ume Exp $
- * $DragonFly: src/sbin/ip6fw/ip6fw.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/ip6fw/ip6fw.c,v 1.3 2003/08/08 04:18:38 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -79,7 +79,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
-#include <netinet6/ip6_fw.h>
+#include <net/ip6fw/ip6_fw.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index 0dbc430c89..de228ada0a 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sbin/ipf/Makefile,v 1.4.2.6 2002/04/27 18:11:34 darrenr Exp $
-# $DragonFly: src/sbin/ipf/Makefile,v 1.2 2003/06/17 04:27:33 dillon Exp $
+# $DragonFly: src/sbin/ipf/Makefile,v 1.3 2003/08/08 04:18:38 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
@@ -7,7 +7,7 @@ PROG=	ipf
 MAN=	ipf.4 ipf.5 ipf.8
 SRCS=	ipf.c parse.c opt.c facpri.c common.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index a4a2a8012f..d37eb7c373 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sbin/ipfstat/Makefile,v 1.4.2.7 2002/04/27 18:13:13 darrenr Exp $
-# $DragonFly: src/sbin/ipfstat/Makefile,v 1.2 2003/06/17 04:27:33 dillon Exp $
+# $DragonFly: src/sbin/ipfstat/Makefile,v 1.3 2003/08/08 04:18:39 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
@@ -7,7 +7,7 @@ PROG=	ipfstat
 MAN=	ipfstat.8
 SRCS=	fils.c parse.c opt.c kmem.c facpri.c common.c printstate.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP
-CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 2a239126d3..90464db97e 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -17,7 +17,7 @@
  * NEW command line interface for IP firewall facility
  *
  * $FreeBSD: src/sbin/ipfw/ipfw.c,v 1.80.2.26 2003/01/14 19:15:58 dillon Exp $
- * $DragonFly: src/sbin/ipfw/Attic/ipfw.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/ipfw/Attic/ipfw.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -48,9 +48,9 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/ip_fw.h>
+#include <net/ipfw/ip_fw.h>
 #include <net/route.h> /* def. of struct route */
-#include <netinet/ip_dummynet.h>
+#include <net/dummynet/ip_dummynet.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 2492ef81ae..15583baf29 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -18,7 +18,7 @@
  * NEW command line interface for IP firewall facility
  *
  * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.4.2.13 2003/05/27 22:21:11 gshapiro Exp $
- * $DragonFly: src/sbin/ipfw/ipfw2.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/ipfw/ipfw2.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -49,9 +49,9 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/ip_fw.h>
+#include <net/ipfw/ip_fw.h>
 #include <net/route.h> /* def. of struct route */
-#include <netinet/ip_dummynet.h>
+#include <net/dummynet/ip_dummynet.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index f1a1786f13..93d5f3ca57 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sbin/ipmon/Makefile,v 1.6.2.3 2002/04/27 18:13:36 darrenr Exp $
-# $DragonFly: src/sbin/ipmon/Makefile,v 1.2 2003/06/17 04:27:33 dillon Exp $
+# $DragonFly: src/sbin/ipmon/Makefile,v 1.3 2003/08/08 04:18:39 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
@@ -8,7 +8,7 @@ MAN=	ipl.4 ipmon.8
 SRCS=	ipmon.c
 
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 31e8672b73..8bb02d68a6 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sbin/ipnat/Makefile,v 1.4.2.6 2002/04/27 18:12:33 darrenr Exp $
-# $DragonFly: src/sbin/ipnat/Makefile,v 1.2 2003/06/17 04:27:33 dillon Exp $
+# $DragonFly: src/sbin/ipnat/Makefile,v 1.3 2003/08/08 04:18:39 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
@@ -7,7 +7,7 @@ PROG=	ipnat
 MAN=	ipnat.8 ipnat.4 ipnat.5
 SRCS=	ipnat.c kmem.c natparse.c common.c printnat.c
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/sbin/mount/mount_ufs.c b/sbin/mount/mount_ufs.c
index 406ab11aca..48770df9fb 100644
--- a/sbin/mount/mount_ufs.c
+++ b/sbin/mount/mount_ufs.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_ufs.c	8.4 (Berkeley) 4/26/95
  * $FreeBSD: src/sbin/mount/mount_ufs.c,v 1.16.2.3 2001/08/01 08:27:29 obrien Exp $
- * $DragonFly: src/sbin/mount/mount_ufs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount/mount_ufs.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 
 #include "extern.h"
 #include "mntopts.h"
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 4357e0040f..8850481101 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -40,14 +40,14 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_cd9660.c	8.7 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/mount_cd9660/mount_cd9660.c,v 1.15.2.3 2001/03/14 12:05:01 bp Exp $
- * $DragonFly: src/sbin/mount_cd9660/mount_cd9660.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_cd9660/mount_cd9660.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/cdio.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <sys/../isofs/cd9660/cd9660_mount.h>
+#include <sys/../vfs/isofs/cd9660/cd9660_mount.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 8551f04a47..3f7a1eed38 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_lfs.c	8.3 (Berkeley) 3/27/94
  * $FreeBSD: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.11 1999/10/09 11:54:09 phk Exp $
- * $DragonFly: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_ext2fs/mount_ext2fs.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 
 #include "mntopts.h"
 
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index 4c7d24676f..c1d70594a4 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -29,14 +29,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.1 1999/12/09 19:09:15 semenu Exp $
- * $DragonFly: src/sbin/mount_hpfs/mount_hpfs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_hpfs/mount_hpfs.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
-#include <fs/hpfs/hpfsmount.h>
+#include <vfs/hpfs/hpfsmount.h>
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 1268584a93..5994d004de 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -30,14 +30,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/mount_msdos/mount_msdos.c,v 1.19.2.1 2000/07/20 10:35:13 kris Exp $
- * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_msdos/mount_msdos.c,v 1.3 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-#include <msdosfs/msdosfsmount.h>
+#include <vfs/msdosfs/msdosfsmount.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index ad5eccc57a..603ddd8f49 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_nfs.c	8.11 (Berkeley) 5/4/95
  * $FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.36.2.6 2003/05/13 14:45:40 trhodes Exp $
- * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.3 2003/08/05 07:45:42 asmodai Exp $
+ * $DragonFly: src/sbin/mount_nfs/mount_nfs.c,v 1.4 2003/08/08 04:18:39 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -48,10 +48,10 @@
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_prot.h>
 
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-#include <nfs/nqnfs.h>
+#include <vfs/nfs/rpcv2.h>
+#include <vfs/nfs/nfsproto.h>
+#include <vfs/nfs/nfs.h>
+#include <vfs/nfs/nqnfs.h>
 
 #include <arpa/inet.h>
 
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 7bc75f1aa9..a89f37a07f 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/mount_ntfs/mount_ntfs.c,v 1.3.2.2 2001/10/12 22:08:43 semenu Exp $
- * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_ntfs/mount_ntfs.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #define NTFS
 #include <sys/mount.h>
 #include <sys/stat.h>
-#include <ntfs/ntfsmount.h>
+#include <vfs/ntfs/ntfsmount.h>
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index bd4719bf4c..4c1a349b12 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -36,12 +36,12 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_null.c	8.6 (Berkeley) 4/26/95
  * $FreeBSD: src/sbin/mount_null/mount_null.c,v 1.13 1999/10/09 11:54:11 phk Exp $
- * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_null/mount_null.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <miscfs/nullfs/null.h>
+#include <vfs/nullfs/null.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_nwfs/mount_nwfs.c b/sbin/mount_nwfs/mount_nwfs.c
index 152ca6925e..e6e16cdf35 100644
--- a/sbin/mount_nwfs/mount_nwfs.c
+++ b/sbin/mount_nwfs/mount_nwfs.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/mount_nwfs/mount_nwfs.c,v 1.4.2.1 2000/04/17 08:34:18 bp Exp $
- * $DragonFly: src/sbin/mount_nwfs/mount_nwfs.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_nwfs/mount_nwfs.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -52,7 +52,7 @@
 
 #include <netncp/ncp_lib.h>
 #include <netncp/ncp_rcfile.h>
-#include <nwfs/nwfs_mount.h>
+#include <vfs/nwfs/nwfs_mount.h>
 #include "mntopts.h"
 
 #define	NWFS_VFSNAME	"nwfs"
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 84c2cee5bb..0bfb576023 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -37,11 +37,11 @@
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
  * $FreeBSD: src/sbin/mount_portal/portald.h,v 1.5 1999/08/28 00:13:37 peter Exp $
- * $DragonFly: src/sbin/mount_portal/portald.h,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_portal/portald.h,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/cdefs.h>
-#include <miscfs/portal/portal.h>
+#include <vfs/portal/portal.h>
 
 /*
  * Meta-chars in an RE.  Paths in the config file containing
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 3c6096a4ad..72e0dadab1 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -36,14 +36,14 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_umap.c	8.5 (Berkeley) 4/26/95
  * $FreeBSD: src/sbin/mount_umap/mount_umap.c,v 1.15 1999/10/09 11:54:13 phk Exp $
- * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_umap/Attic/mount_umap.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-#include <miscfs/umapfs/umap.h>
+#include <vfs/umapfs/umap.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c
index c667880be1..cb17070dd0 100644
--- a/sbin/mount_union/mount_union.c
+++ b/sbin/mount_union/mount_union.c
@@ -36,13 +36,13 @@
  * @(#) Copyright (c) 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount_union.c	8.5 (Berkeley) 3/27/94
  * $FreeBSD: src/sbin/mount_union/mount_union.c,v 1.12 1999/10/09 11:54:14 phk Exp $
- * $DragonFly: src/sbin/mount_union/mount_union.c,v 1.2 2003/06/17 04:27:33 dillon Exp $
+ * $DragonFly: src/sbin/mount_union/mount_union.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
-#include <miscfs/union/union.h>
+#include <vfs/union/union.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 8da7d7d8e7..8ccf1547ec 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1989, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)mountd.c	8.15 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/mountd/mountd.c,v 1.39.2.5 2002/09/13 15:57:43 joerg Exp $
- * $DragonFly: src/sbin/mountd/mountd.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/mountd/mountd.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -47,13 +47,13 @@
 
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
-#include <ufs/ufs/ufsmount.h>
-#include <msdosfs/msdosfsmount.h>
-#include <ntfs/ntfsmount.h>
-#include <isofs/cd9660/cd9660_mount.h>	/* XXX need isofs in include */
+#include <vfs/nfs/rpcv2.h>
+#include <vfs/nfs/nfsproto.h>
+#include <vfs/nfs/nfs.h>
+#include <vfs/ufs/ufsmount.h>
+#include <vfs/msdosfs/msdosfsmount.h>
+#include <vfs/ntfs/ntfsmount.h>
+#include <vfs/isofs/cd9660/cd9660_mount.h>	/* XXX need isofs in include */
 
 #include <arpa/inet.h>
 
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 361ef88b89..2a46a54ff5 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -32,7 +32,7 @@
  *
  * @(#)mkfs.c	8.11 (Berkeley) 5/3/95
  * $FreeBSD: src/sbin/newfs/mkfs.c,v 1.29.2.6 2001/09/21 19:15:21 dillon Exp $
- * $DragonFly: src/sbin/newfs/mkfs.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/newfs/mkfs.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <err.h>
@@ -46,9 +46,9 @@
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/fs.h>
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #include <sys/mman.h>
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index c6fcb38b4a..2442c85a8a 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1989, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)newfs.c	8.13 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/newfs/newfs.c,v 1.30.2.9 2003/05/13 12:03:55 joerg Exp $
- * $DragonFly: src/sbin/newfs/newfs.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/newfs/newfs.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 /*
@@ -45,10 +45,10 @@
 #include <sys/file.h>
 #include <sys/mount.h>
 
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/fs.h>
+#include <vfs/ufs/ufsmount.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 36bf27caf7..664f0677dc 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)quotacheck.c	8.3 (Berkeley) 1/29/94
  * $FreeBSD: src/sbin/quotacheck/quotacheck.c,v 1.11 1999/08/28 00:14:01 peter Exp $
- * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/quotacheck/quotacheck.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 /*
@@ -45,9 +45,9 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ffs/fs.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/quota.h>
+#include <vfs/ufs/fs.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 22d12b29bf..cf1c58cbbb 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -37,7 +37,7 @@
  *
  * @(#)dirs.c	8.7 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/restore/dirs.c,v 1.14.2.5 2001/10/15 13:44:45 dd Exp $
- * $DragonFly: src/sbin/restore/dirs.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/dirs.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -45,8 +45,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
 #include <protocols/dumprestore.h>
 
 #include <err.h>
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index c76da20a30..37290790a5 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -32,14 +32,14 @@
  *
  * @(#)interactive.c	8.5 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/restore/interactive.c,v 1.8.2.1 2001/01/03 14:36:08 iedowse Exp $
- * $DragonFly: src/sbin/restore/interactive.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/interactive.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
 #include <protocols/dumprestore.h>
 
 #include <setjmp.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 6112288211..b0fa7b71c2 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -33,13 +33,13 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/4/95
  * $FreeBSD: src/sbin/restore/main.c,v 1.10.2.3 2001/10/02 08:30:17 cjc Exp $
- * $DragonFly: src/sbin/restore/main.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/main.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 #include <protocols/dumprestore.h>
 
 #include <err.h>
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index e067a134fe..e9c66414e8 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -32,12 +32,12 @@
  *
  * @(#)restore.c	8.3 (Berkeley) 9/13/94
  * $FreeBSD: src/sbin/restore/restore.c,v 1.7.2.1 2002/03/01 21:32:28 iedowse Exp $
- * $DragonFly: src/sbin/restore/restore.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/restore.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/types.h>
 
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 00382685c5..02cbfceaeb 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -32,7 +32,7 @@
  *
  * @(#)symtab.c	8.3 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/restore/symtab.c,v 1.7.2.1 2001/12/19 14:54:14 tobez Exp $
- * $DragonFly: src/sbin/restore/symtab.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/symtab.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 /*
@@ -47,7 +47,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 6b83e13453..2aa6321792 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -37,7 +37,7 @@
  *
  * @(#)tape.c	8.9 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/restore/tape.c,v 1.16.2.8 2002/06/30 22:57:52 iedowse Exp $
- * $DragonFly: src/sbin/restore/tape.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/tape.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include <ufs/ufs/dinode.h>
+#include <vfs/ufs/dinode.h>
 #include <protocols/dumprestore.h>
 
 #include <errno.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 0c352cb3c9..3f98901312 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -32,14 +32,14 @@
  *
  * @(#)utilities.c	8.5 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/restore/utilities.c,v 1.8.2.2 2001/07/30 10:30:08 dd Exp $
- * $DragonFly: src/sbin/restore/utilities.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/restore/utilities.c,v 1.3 2003/08/08 04:18:40 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
+#include <vfs/ufs/dinode.h>
+#include <vfs/ufs/dir.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/sbin/spppcontrol/spppcontrol.c b/sbin/spppcontrol/spppcontrol.c
index 15c47555ed..3ef4136851 100644
--- a/sbin/spppcontrol/spppcontrol.c
+++ b/sbin/spppcontrol/spppcontrol.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.7.2.2 2002/04/24 18:47:22 joerg Exp $
- * $DragonFly: src/sbin/spppcontrol/spppcontrol.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/spppcontrol/spppcontrol.c,v 1.3 2003/08/08 04:18:41 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -33,7 +33,7 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_sppp.h>
+#include <net/sppp/if_sppp.h>
 
 #include <err.h>
 #include <stdio.h>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 28ff6bd051..2d8176d098 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)tunefs.c	8.2 (Berkeley) 4/19/94
  * $FreeBSD: src/sbin/tunefs/tunefs.c,v 1.11.2.5 2001/10/14 21:50:39 iedowse Exp $
- * $DragonFly: src/sbin/tunefs/tunefs.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/tunefs/tunefs.c,v 1.3 2003/08/08 04:18:41 dillon Exp $
  */
 
 /*
@@ -43,8 +43,8 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/fs.h>
+#include <vfs/ufs/ufsmount.h>
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index cfe999f3b1..5c79f2ea1d 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sbin/vinum/Makefile,v 1.12.2.2 2001/08/01 09:13:24 obrien Exp $
-# $DragonFly: src/sbin/vinum/Makefile,v 1.2 2003/06/17 04:27:34 dillon Exp $
+# $DragonFly: src/sbin/vinum/Makefile,v 1.3 2003/08/08 04:18:41 dillon Exp $
 
 MAINTAINER  =  grog@FreeBSD.org
 PROG=	vinum
@@ -10,6 +10,6 @@ CFLAGS+=	-I${.CURDIR}/../../sys -Wall -DVINUMDEBUG
 DPADD=	${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP}
 LDADD=	-lreadline -ltermcap -ldevstat
 
-.PATH: ${.CURDIR}/../../sys/dev/vinum
+.PATH: ${.CURDIR}/../../sys/dev/raid/vinum
 
 .include <bsd.prog.mk>
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index b461b15158..a1004be302 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -38,7 +38,7 @@
  *
  * $Id: commands.c,v 1.14 2000/11/14 20:01:23 grog Exp grog $
  * $FreeBSD: src/sbin/vinum/commands.c,v 1.31.2.6 2003/06/06 05:13:29 grog Exp $
- * $DragonFly: src/sbin/vinum/commands.c,v 1.2 2003/06/17 04:27:34 dillon Exp $
+ * $DragonFly: src/sbin/vinum/commands.c,v 1.3 2003/08/08 04:18:41 dillon Exp $
  */
 
 #include <ctype.h>
@@ -54,8 +54,8 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <dev/vinum/vinumhdr.h>
-#include <dev/vinum/request.h>
+#include <dev/raid/vinum/vinumhdr.h>
+#include <dev/raid/vinum/request.h>
 #include "vext.h"
 #include <sys/types.h>
 #include <sys/linker.h>
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index cb7074f768..782fed41c6 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -41,7 +41,7 @@
  *
  * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $
  * $FreeBSD: src/sbin/vinum/list.c,v 1.25.2.4 2001/05/28 05:58:04 grog Exp $
- * $DragonFly: src/sbin/vinum/list.c,v 1.2 2003/06/17 04:27:35 dillon Exp $
+ * $DragonFly: src/sbin/vinum/list.c,v 1.3 2003/08/08 04:18:41 dillon Exp $
  */
 
 #include <ctype.h>
@@ -57,9 +57,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
-#include <dev/vinum/vinumhdr.h>
+#include <dev/raid/vinum/vinumhdr.h>
 #include "vext.h"
-#include <dev/vinum/request.h>
+#include <dev/raid/vinum/request.h>
 #include <devstat.h>
 
 /*
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index 17e3e8081c..c9241ce2e5 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -38,7 +38,7 @@
  *
  * $Id: v.c,v 1.31 2000/09/03 01:29:26 grog Exp grog $
  * $FreeBSD: src/sbin/vinum/v.c,v 1.26.2.3 2001/03/13 03:04:06 grog Exp $
- * $DragonFly: src/sbin/vinum/v.c,v 1.2 2003/06/17 04:27:35 dillon Exp $
+ * $DragonFly: src/sbin/vinum/v.c,v 1.3 2003/08/08 04:18:41 dillon Exp $
  */
 
 #include <ctype.h>
@@ -54,7 +54,7 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <dev/vinum/vinumhdr.h>
+#include <dev/raid/vinum/vinumhdr.h>
 #include "vext.h"
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index c9ffaa0b90..cba5353de2 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3.2.1 2002/07/22 14:21:51 ru Exp $
-# $DragonFly: src/share/mk/bsd.incs.mk,v 1.2 2003/06/17 04:37:02 dillon Exp $
+# $DragonFly: src/share/mk/bsd.incs.mk,v 1.3 2003/08/08 04:18:41 dillon Exp $
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.incs.mk cannot be included directly.
@@ -72,7 +72,7 @@ installincludes:
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -fs $$l $$t; \
+		ln -fhs $$l $$t; \
 	done; true
 .endif
 .endif !target(installincludes)
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index c1a9378d86..81349ef70f 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1988, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)fstat.c	8.3 (Berkeley) 5/2/95
  * $FreeBSD: src/usr.bin/fstat/fstat.c,v 1.21.2.7 2001/11/21 10:49:37 dwmalone Exp $
- * $DragonFly: src/usr.bin/fstat/fstat.c,v 1.3 2003/07/13 05:45:14 dillon Exp $
+ * $DragonFly: src/usr.bin/fstat/fstat.c,v 1.4 2003/08/08 04:18:43 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +55,8 @@
 #include <sys/conf.h>
 #define	_KERNEL
 #include <sys/file.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
+#include <vfs/ufs/quota.h>
+#include <vfs/ufs/inode.h>
 #include <sys/mount.h>
 #undef _KERNEL
 #include <nfs/nfsproto.h>
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 0470a036f6..71671c68cb 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,7 +1,7 @@
 set -e
 
 # $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.15.2.5 2002/11/15 18:22:31 ru Exp $
-# $DragonFly: src/usr.bin/kdump/mkioctls,v 1.2 2003/06/17 04:29:27 dillon Exp $
+# $DragonFly: src/usr.bin/kdump/mkioctls,v 1.3 2003/08/08 04:18:43 dillon Exp $
 
 if [ "x$1" = "x-s" ]; then
 	use_switch=1
@@ -20,10 +20,12 @@ LC_ALL=C; export LC_ALL
 # Build a list of headers that have ioctls in them.
 # XXX should we use an ANSI cpp?
 # XXX netipx conflicts with netns (leave out netns).
+# XXX leave out bus/ and netproto/ because even though they are
+# the 'real' directories, they are duped by softlinks in /usr/include.
 ioctl_includes=`
 	cd $1
 	find -s * -name '*.h' -follow |
-		egrep -v '^(netns)/' |
+		egrep -v '^(netns)/|^(bus)/|^(netproto)' |
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\\\n", $1)}'
@@ -50,7 +52,7 @@ BEGIN {
 	print "#include <netatm/atm_sap.h>"
 	print "#include <netatm/atm_sys.h>"
 	print "#include <netinet/in.h>"
-	print "#include <netinet/ip_mroute.h>"
+	print "#include <net/ip_mroute/ip_mroute.h>"
 	print "#include <netinet6/in6_var.h>"
 	print "#include <netinet6/nd6.h>"
 	print "#include <netinet6/ip6_mroute.h>"
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 3038a8aa61..f2e09a5b38 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -32,7 +32,7 @@
  *
  * @(#)if.c	8.3 (Berkeley) 4/28/95
  * $FreeBSD: src/usr.bin/netstat/if.c,v 1.32.2.9 2001/09/17 14:35:46 ru Exp $
- * $DragonFly: src/usr.bin/netstat/if.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/if.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -45,15 +45,15 @@
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/bridge.h>
+#include <net/bridge/bridge.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
+#include <netproto/ipx/ipx.h>
+#include <netproto/ipx/ipx_if.h>
 #ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
+#include <netproto/ns/ns.h>
+#include <netproto/ns/ns_if.h>
 #endif
 #ifdef ISO
 #include <netiso/iso.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index b5bf74d236..b1a89451e6 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1988, 1993 Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.4 (Berkeley) 3/1/94
  * $FreeBSD: src/usr.bin/netstat/main.c,v 1.34.2.12 2001/09/17 15:17:46 ru Exp $
- * $DragonFly: src/usr.bin/netstat/main.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/main.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 
 #include <netinet/in.h>
 
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index 24465e07ad..18053f223b 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -37,7 +37,7 @@
  *	@(#)mroute.c	8.2 (Berkeley) 4/28/95
  *
  * $FreeBSD: src/usr.bin/netstat/mroute.c,v 1.11.2.4 2001/09/17 14:53:17 ru Exp $
- * $DragonFly: src/usr.bin/netstat/mroute.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/mroute.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  */
 
 /*
@@ -58,7 +58,7 @@
 #include <netinet/in.h>
 #include <netinet/igmp.h>
 #include <net/route.h>
-#include <netinet/ip_mroute.h>
+#include <net/ip_mroute/ip_mroute.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 7ced9a432c..8008fcc0c2 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -32,7 +32,7 @@
  * OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/netstat/netgraph.c,v 1.3.2.2 2001/08/10 09:07:09 ru Exp $
- * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  *
  * $Id: atalk.c,v 1.11 1998/07/06 21:01:22 bde Exp $
  */
@@ -48,8 +48,8 @@
 
 #include <netgraph.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_socket.h>
-#include <netgraph/ng_socketvar.h>
+#include <netgraph/socket/ng_socket.h>
+#include <netgraph/socket/ng_socketvar.h>
 
 #include <nlist.h>
 #include <errno.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index ed166e42c6..10c43d7fba 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -32,7 +32,7 @@
  *
  * @(#)route.c	8.6 (Berkeley) 4/28/95
  * $FreeBSD: src/usr.bin/netstat/route.c,v 1.41.2.14 2002/07/17 02:22:22 kbyanc Exp $
- * $DragonFly: src/usr.bin/netstat/route.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/route.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <netipx/ipx.h>
 #include <netatalk/at.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 
 #ifdef NS
 #include <netns/ns.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 50f9d9c1da..224981ea2e 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)quota.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/quota/quota.c,v 1.11.2.5 2002/11/30 23:54:21 iedowse Exp $
- * $DragonFly: src/usr.bin/quota/quota.c,v 1.2 2003/06/17 04:29:30 dillon Exp $
+ * $DragonFly: src/usr.bin/quota/quota.c,v 1.3 2003/08/08 04:18:43 dillon Exp $
  */
 
 /*
@@ -54,7 +54,7 @@
 #include <rpc/pmap_prot.h>
 #include <rpcsvc/rquota.h>
 
-#include <ufs/ufs/quota.h>
+#include <vfs/ufs/quota.h>
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index a13d80d203..f6e46fd6e8 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.bin/truss/Makefile,v 1.10.2.2 2002/07/23 09:18:30 ru Exp $
-# $DragonFly: src/usr.bin/truss/Makefile,v 1.2 2003/06/17 04:29:33 dillon Exp $
+# $DragonFly: src/usr.bin/truss/Makefile,v 1.3 2003/08/08 04:18:44 dillon Exp $
 
 PROG=	truss
 SRCS=	main.c setup.c syscalls.c syscalls.h ioctl.c
@@ -15,7 +15,7 @@ CLEANFILES+=i386l-syscalls.master syscalls.master linux_syscalls.h \
 
 .SUFFIXES: .master
 
-i386l-syscalls.master:	${.CURDIR}/../../sys/i386/linux/syscalls.master
+i386l-syscalls.master:	${.CURDIR}/../../sys/emulation/linux/i386/syscalls.master
 	cp ${.ALLSRC} i386l-syscalls.master
 
 linux_syscalls.h:	i386l-syscalls.master
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 793f5eb7f8..ada93e78c6 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usbhid.c,v 1.14 2000/07/03 02:51:37 matt Exp $	*/
 /*	$FreeBSD: src/usr.bin/usbhidctl/usbhid.c,v 1.6.2.1 2002/04/03 16:48:25 joe Exp $ */
-/*	$DragonFly: src/usr.bin/usbhidctl/usbhid.c,v 1.2 2003/06/17 04:29:33 dillon Exp $ */
+/*	$DragonFly: src/usr.bin/usbhidctl/usbhid.c,v 1.3 2003/08/08 04:18:44 dillon Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <libusbhid.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbhid.h>
+#include <bus/usb/usb.h>
+#include <bus/usb/usbhid.h>
 
 int verbose = 0;
 int all = 0;
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 30e9632d9c..20ea23b9cf 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -1,6 +1,6 @@
 /* 
  * $FreeBSD: src/usr.sbin/amd/include/config.h,v 1.15.2.1 2001/08/29 08:46:52 alfred Exp $
- * $DragonFly: src/usr.sbin/amd/include/config.h,v 1.2 2003/06/17 04:29:52 dillon Exp $
+ * $DragonFly: src/usr.sbin/amd/include/config.h,v 1.3 2003/08/08 04:18:44 dillon Exp $
  *
  * portions derived from 
  *	$NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $
@@ -1883,10 +1883,10 @@
 /* Define if you have the <tmpfs/tmp.h> header file.  */
 /* #undef HAVE_TMPFS_TMP_H */
 
-/* Define if you have the <ufs/ufs/ufsmount.h> header file.  */
+/* Define if you have the <vfs/ufs/ufsmount.h> header file.  */
 #define HAVE_UFS_UFS_UFSMOUNT_H 1
 
-/* Define if you have the <ufs/ufs_mount.h> header file.  */
+/* Define if you have the <vfs/ufs_mount.h> header file.  */
 #define HAVE_UFS_UFS_MOUNT_H 1
 
 /* Define if you have the <unistd.h> header file.  */
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 72a12afa14..96d96d4f52 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp $
- * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.2 2003/06/17 04:29:52 dillon Exp $
+ * $DragonFly: src/usr.sbin/ancontrol/ancontrol.c,v 1.3 2003/08/08 04:18:44 dillon Exp $
  *
  * @(#) Copyright (c) 1997, 1998, 1999 Bill Paul. All rights reserved.
  * @(#) $FreeBSD: src/usr.sbin/ancontrol/ancontrol.c,v 1.1.2.9 2003/02/01 03:25:13 ambrisko Exp
@@ -48,7 +48,7 @@
 #include <net/if_var.h>
 #include <net/ethernet.h>
 
-#include <dev/an/if_aironet_ieee.h>
+#include <dev/netif/an/if_aironet_ieee.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 6af4889b57..2822cf2813 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)edquota.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/edquota/edquota.c,v 1.9.2.6 2002/10/31 22:38:43 iedowse Exp $
- * $DragonFly: src/usr.sbin/edquota/edquota.c,v 1.2 2003/06/17 04:29:53 dillon Exp $
+ * $DragonFly: src/usr.sbin/edquota/edquota.c,v 1.3 2003/08/08 04:18:44 dillon Exp $
  */
 
 /*
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/wait.h>
-#include <ufs/ufs/quota.h>
+#include <vfs/ufs/quota.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index ea6a2daf80..08a97913b4 100644
--- a/usr.sbin/fwcontrol/Makefile
+++ b/usr.sbin/fwcontrol/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD: src/usr.sbin/fwcontrol/Makefile,v 1.1.2.5 2003/05/01 06:26:35 simokawa Exp $
-# $DragonFly: src/usr.sbin/fwcontrol/Makefile,v 1.2 2003/06/17 04:29:53 dillon Exp $
+# $DragonFly: src/usr.sbin/fwcontrol/Makefile,v 1.3 2003/08/08 04:18:44 dillon Exp $
 
 PROG=	fwcontrol
 SRCS=	fwcontrol.c fwcrom.c fwdv.c
 MAN=	fwcontrol.8
 
-.PATH:	${.CURDIR}/../../sys/dev/firewire
+.PATH:	${.CURDIR}/../../sys/bus/firewire
 
 SDIR= ${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR} -I${SDIR}
diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c
index 2d25c3dd88..16312e2ea9 100644
--- a/usr.sbin/fwcontrol/fwcontrol.c
+++ b/usr.sbin/fwcontrol/fwcontrol.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.1.2.8 2003/05/01 06:26:35 simokawa Exp $
- * $DragonFly: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.2 2003/06/17 04:29:53 dillon Exp $
+ * $DragonFly: src/usr.sbin/fwcontrol/fwcontrol.c,v 1.3 2003/08/08 04:18:44 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -40,8 +40,8 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
-#include <dev/firewire/firewire.h>
-#include <dev/firewire/iec13213.h>
+#include <bus/firewire/firewire.h>
+#include <bus/firewire/iec13213.h>
 
 #include <netinet/in.h>
 #include <fcntl.h>
diff --git a/usr.sbin/fwcontrol/fwdv.c b/usr.sbin/fwcontrol/fwdv.c
index c16404437a..73ff239ac2 100644
--- a/usr.sbin/fwcontrol/fwdv.c
+++ b/usr.sbin/fwcontrol/fwdv.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/usr.sbin/fwcontrol/fwdv.c,v 1.2.2.4 2003/04/28 03:29:18 simokawa Exp $
- * $DragonFly: src/usr.sbin/fwcontrol/fwdv.c,v 1.2 2003/06/17 04:29:53 dillon Exp $
+ * $DragonFly: src/usr.sbin/fwcontrol/fwdv.c,v 1.3 2003/08/08 04:18:44 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -52,8 +52,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <dev/firewire/firewire.h>
-#include <dev/firewire/iec68113.h>
+#include <bus/firewire/firewire.h>
+#include <bus/firewire/iec68113.h>
 
 #define DEBUG		0
 #define FIX_FRAME	1
diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index 206c8d5f7f..28ba274391 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -70,13 +70,13 @@
  *	$Id: g711conv.c,v 1.5 1999/12/13 21:25:24 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.4.2.1 2001/08/01 17:45:02 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.2 2003/06/17 04:29:54 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/g711conv/g711conv.c,v 1.3 2003/08/08 04:18:44 dillon Exp $
  *
  *---------------------------------------------------------------------------*/
 
 #include <stdio.h>
 #include <unistd.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
 
 /* copy from CCITT G.711 specifications */
 
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index e76fce2aa1..0db6c5e354 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -28,7 +28,7 @@
  *	-----------------------------
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.6.2.5 2002/04/24 18:50:07 joerg Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.2 2003/06/17 04:29:54 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnd/isdnd.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 31 12:42:58 2001]
  *
@@ -68,10 +68,10 @@
 #include <sys/rtprio.h>
 #endif
 
-#include <net/if_sppp.h>
+#include <net/sppp/if_sppp.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_cause.h>
 
 #include "config.h"		/* compile time configuration	*/
 #include "pathnames.h"		/* location of files		*/
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index 8b49c1cbd3..19a0c354a8 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -28,7 +28,7 @@
  *	------------------------------
  *
  * $FreeBSD: src/usr.sbin/i4b/isdndebug/main.c,v 1.8.2.1 2001/08/01 17:45:04 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdndebug/main.c,v 1.2 2003/06/17 04:29:54 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdndebug/main.c,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon May 21 10:09:23 2001]
  *
@@ -48,8 +48,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_debug.h>
+#include <i4b_machine/i4b_ioctl.h>
 
 char *bin_str(unsigned long val, int length);
 
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index 210b6335e7..814b8b7c0c 100644
--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@@ -30,7 +30,7 @@
  *	$Id: decode.h,v 1.6 1999/12/13 21:25:25 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/isdndecode/decode.h,v 1.6.2.1 2001/08/01 17:45:05 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdndecode/decode.h,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdndecode/decode.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 13 21:49:50 1999]
  *
@@ -51,8 +51,8 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_trace.h>
 
 #include "pcause.h"
 
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index 04435e1104..4c7f3ffba2 100644
--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@@ -30,7 +30,7 @@
  *	$Id: monprivate.h,v 1.10 1999/12/13 21:25:26 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.1.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:25 1999]
  *
@@ -63,7 +63,7 @@
 #if defined (__FreeBSD__) || defined(__NetBSD__) || \
     defined (__OpenBSD__) || defined(__bsdi__)
 
-#include <machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
 
 #else
 
diff --git a/usr.sbin/i4b/isdnphone/defs.h b/usr.sbin/i4b/isdnphone/defs.h
index 889b2c19a5..7cf1c5ebea 100644
--- a/usr.sbin/i4b/isdnphone/defs.h
+++ b/usr.sbin/i4b/isdnphone/defs.h
@@ -30,7 +30,7 @@
  *	$Id: defs.h,v 1.6 1999/12/13 21:25:26 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnphone/defs.h,v 1.2.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnphone/defs.h,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnphone/defs.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:46 1999]
  *
@@ -55,8 +55,8 @@
 #include <sys/time.h>
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_tel_ioctl.h>
 
 /* device file prefixes */
 
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 4775a52ec9..04b50f4bfa 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -30,7 +30,7 @@
  *	$Id: defs.h,v 1.10 1999/12/13 21:25:26 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntel/defs.h,v 1.6.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntel/defs.h,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntel/defs.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:50 1999]
  *
@@ -54,7 +54,7 @@
 #endif
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
 
 #define GOOD	0
 #define	ERROR	(-1)
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 2a8d52a101..aea205f04a 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -30,7 +30,7 @@
  *	$Id: main.c,v 1.12 1999/12/13 21:25:26 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntelctl/main.c,v 1.8.2.2 2001/08/01 17:45:07 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntelctl/main.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntelctl/main.c,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:50 1999]
  *
@@ -51,8 +51,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_tel_ioctl.h>
 
 static void usage ( void );
 
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index 5a9231993b..5a4e848b12 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -30,7 +30,7 @@
  *	$Id: main.c,v 1.16 2000/03/13 16:18:38 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntest/main.c,v 1.7.2.1 2001/08/01 17:45:07 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntest/main.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntest/main.c,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Mar 13 17:19:26 2000]
  *
@@ -50,8 +50,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_cause.h>
 
 static void kbdrdhdl ( void );
 static void isdnrdhdl (int isdnfd );
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index c710ad78e0..968ed09911 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -38,7 +38,7 @@
  *	$Id: trace.h,v 1.12 2000/02/14 16:25:22 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntrace/trace.h,v 1.6.2.1 2001/08/01 17:45:08 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntrace/trace.h,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntrace/trace.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
  *
  *      last edit-date: [Mon Feb 14 14:43:40 2000]
  *
@@ -60,8 +60,8 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_trace.h>
 
 #include "pcause_1tr6.h"	/* obsolete german national ISDN */
 #include "pcause_q850.h"
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index f4f7c4dbea..563333eb11 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/ipftest/Makefile,v 1.4.2.5 2002/04/27 18:19:04 darrenr Exp $
-# $DragonFly: src/usr.sbin/ipftest/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $
+# $DragonFly: src/usr.sbin/ipftest/Makefile,v 1.3 2003/08/08 04:18:45 dillon Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet \
 	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
@@ -12,7 +12,7 @@ SRCS=	opt_ipfilter.h \
 	printstate.c printnat.c
 
 CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG
-CFLAGS+=-I- -I${.OBJDIR}
+CFLAGS+= -I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index e80a5c7fbe..710ef3d061 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/ipresend/Makefile,v 1.4.2.3 2001/11/14 14:15:04 guido Exp $
-# $DragonFly: src/usr.sbin/ipresend/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $
+# $DragonFly: src/usr.sbin/ipresend/Makefile,v 1.3 2003/08/08 04:18:45 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
@@ -8,7 +8,7 @@ PROG=	ipresend
 SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 \
-	-I- -I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
+	-I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index fa686cc428..04aa62c77c 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/ipsend/Makefile,v 1.8.2.3 2001/11/14 14:15:05 guido Exp $
-# $DragonFly: src/usr.sbin/ipsend/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $
+# $DragonFly: src/usr.sbin/ipsend/Makefile,v 1.3 2003/08/08 04:18:46 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter/iplang \
@@ -11,7 +11,7 @@ SRCS=	ipsend.c ip.c ipsopt.c sbpf.c sock.c 44arp.c iplang_y.y iplang_l.l \
 MAN=	ipsend.1 ipsend.5
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 \
-	-I- -I. -I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
+	-I. -I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter/iplang \
 	-I${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index 0357945217..1a12e5e5ae 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/iptest/Makefile,v 1.4.2.3 2001/11/14 14:15:05 guido Exp $
-# $DragonFly: src/usr.sbin/iptest/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $
+# $DragonFly: src/usr.sbin/iptest/Makefile,v 1.3 2003/08/08 04:18:46 dillon Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter
@@ -8,7 +8,7 @@ PROG=	iptest
 SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 \
-	-I- -I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
+	-I${.CURDIR}/../../sys/contrib/ipfilter/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/usr.sbin/lptcontrol/lptcontrol.c b/usr.sbin/lptcontrol/lptcontrol.c
index ae32a92010..cce6cfe210 100644
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.9.2.2 2001/07/30 10:22:57 dd Exp $
- * $DragonFly: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ * $DragonFly: src/usr.sbin/lptcontrol/lptcontrol.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <ctype.h>
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <dev/ppbus/lptio.h>
+#include <dev/misc/lpt/lptio.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
diff --git a/usr.sbin/mlxcontrol/command.c b/usr.sbin/mlxcontrol/command.c
index b63d307210..2c11bfdf80 100644
--- a/usr.sbin/mlxcontrol/command.c
+++ b/usr.sbin/mlxcontrol/command.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/usr.sbin/mlxcontrol/command.c,v 1.2.2.1 2000/04/24 19:44:46 msmith Exp $
- *	$DragonFly: src/usr.sbin/mlxcontrol/command.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ *	$DragonFly: src/usr.sbin/mlxcontrol/command.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <fcntl.h>
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <err.h>
 
-#include <dev/mlx/mlxio.h>
-#include <dev/mlx/mlxreg.h>
+#include <dev/raid/mlx/mlxio.h>
+#include <dev/raid/mlx/mlxreg.h>
 
 #include "mlxcontrol.h"
 
diff --git a/usr.sbin/mlxcontrol/config.c b/usr.sbin/mlxcontrol/config.c
index cf3fe3d4c8..c30843e850 100644
--- a/usr.sbin/mlxcontrol/config.c
+++ b/usr.sbin/mlxcontrol/config.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/usr.sbin/mlxcontrol/config.c,v 1.2.2.1 2000/04/24 19:44:46 msmith Exp $
- *	$DragonFly: src/usr.sbin/mlxcontrol/config.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ *	$DragonFly: src/usr.sbin/mlxcontrol/config.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <fcntl.h>
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <err.h>
 
-#include <dev/mlx/mlxio.h>
-#include <dev/mlx/mlxreg.h>
+#include <dev/raid/mlx/mlxio.h>
+#include <dev/raid/mlx/mlxreg.h>
 
 #include "mlxcontrol.h"
 
diff --git a/usr.sbin/mlxcontrol/interface.c b/usr.sbin/mlxcontrol/interface.c
index f1ffab037a..8fa1d7ad39 100644
--- a/usr.sbin/mlxcontrol/interface.c
+++ b/usr.sbin/mlxcontrol/interface.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/usr.sbin/mlxcontrol/interface.c,v 1.2.2.1 2000/04/24 19:44:46 msmith Exp $
- *	$DragonFly: src/usr.sbin/mlxcontrol/interface.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ *	$DragonFly: src/usr.sbin/mlxcontrol/interface.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <fcntl.h>
@@ -34,8 +34,8 @@
 #include <string.h>
 #include <cam/scsi/scsi_all.h>
 
-#include <dev/mlx/mlxio.h>
-#include <dev/mlx/mlxreg.h>
+#include <dev/raid/mlx/mlxio.h>
+#include <dev/raid/mlx/mlxreg.h>
 
 #include "mlxcontrol.h"
 
diff --git a/usr.sbin/mlxcontrol/util.c b/usr.sbin/mlxcontrol/util.c
index f0206b0471..b8e9f5f0d6 100644
--- a/usr.sbin/mlxcontrol/util.c
+++ b/usr.sbin/mlxcontrol/util.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/usr.sbin/mlxcontrol/util.c,v 1.2.2.1 2000/04/24 19:44:47 msmith Exp $
- *	$DragonFly: src/usr.sbin/mlxcontrol/util.c,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ *	$DragonFly: src/usr.sbin/mlxcontrol/util.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -32,8 +32,8 @@
 #include <paths.h>
 #include <string.h>
 
-#include <dev/mlx/mlxio.h>
-#include <dev/mlx/mlxreg.h>
+#include <dev/raid/mlx/mlxio.h>
+#include <dev/raid/mlx/mlxreg.h>
 
 #include "mlxcontrol.h"
 
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index ef34264733..b27ee0444f 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -8,7 +8,7 @@
  *
  *
  * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.12.2.1 2001/07/19 01:41:11 kris Exp $
- * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.3 2003/08/08 04:18:46 dillon Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
@@ -50,7 +50,7 @@
 #undef rtentry
 #endif
 #endif
-#include <netinet/ip_mroute.h>
+#include <net/ip_mroute/ip_mroute.h>
 #ifdef RSRR
 #include <sys/un.h>
 #endif /* RSRR */
diff --git a/usr.sbin/ngctl/ngctl.h b/usr.sbin/ngctl/ngctl.h
index 50f8e7854b..ed68e9a406 100644
--- a/usr.sbin/ngctl/ngctl.h
+++ b/usr.sbin/ngctl/ngctl.h
@@ -35,7 +35,7 @@
  * OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ngctl/ngctl.h,v 1.6.2.3 2002/02/01 18:17:43 archie Exp $
- * $DragonFly: src/usr.sbin/ngctl/ngctl.h,v 1.2 2003/06/17 04:29:57 dillon Exp $
+ * $DragonFly: src/usr.sbin/ngctl/ngctl.h,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -55,7 +55,7 @@
 #include <err.h>
 
 #include <netgraph.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/socket/ng_socket.h>
 #include <netgraph/ng_message.h>
 
 #define MAX_CMD_ALIAS	8
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index 9ac9d6322f..1b3f141e0e 100644
--- a/usr.sbin/pccard/pccardc/beep.c
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/beep.c,v 1.2 1999/08/28 01:17:31 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/beep.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/beep.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 int
 beep_main(argc, argv)
diff --git a/usr.sbin/pccard/pccardc/dumpcis.c b/usr.sbin/pccard/pccardc/dumpcis.c
index 6560d323e6..9693bb508a 100644
--- a/usr.sbin/pccard/pccardc/dumpcis.c
+++ b/usr.sbin/pccard/pccardc/dumpcis.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/dumpcis.c,v 1.12 1999/08/28 01:17:31 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/dumpcis.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/dumpcis.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 #include "readcis.h"
 
 int     nocards;
diff --git a/usr.sbin/pccard/pccardc/enabler.c b/usr.sbin/pccard/pccardc/enabler.c
index 1501c88ed7..8851a6b017 100644
--- a/usr.sbin/pccard/pccardc/enabler.c
+++ b/usr.sbin/pccard/pccardc/enabler.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/enabler.c,v 1.13 1999/08/28 01:17:32 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/enabler.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/enabler.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 
 static void    usage __P((char *));
 
diff --git a/usr.sbin/pccard/pccardc/pccardmem.c b/usr.sbin/pccard/pccardc/pccardmem.c
index 3951f76113..583f6d44c7 100644
--- a/usr.sbin/pccard/pccardc/pccardmem.c
+++ b/usr.sbin/pccard/pccardc/pccardmem.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/pccardmem.c,v 1.12 1999/08/28 01:17:32 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/pccardmem.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/pccardmem.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 static void
 usage()
diff --git a/usr.sbin/pccard/pccardc/power.c b/usr.sbin/pccard/pccardc/power.c
index c5726deb10..f32b05a16c 100644
--- a/usr.sbin/pccard/pccardc/power.c
+++ b/usr.sbin/pccard/pccardc/power.c
@@ -25,7 +25,7 @@
  *
  * $PAO: power.c,v 1.3 1999/02/11 05:00:54 kuriyama Exp $
  * $FreeBSD: src/usr.sbin/pccard/pccardc/power.c,v 1.2 1999/12/02 05:56:36 imp Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/power.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/power.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 /*
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 int
 power_main(argc, argv)
diff --git a/usr.sbin/pccard/pccardc/printcis.c b/usr.sbin/pccard/pccardc/printcis.c
index 9d463f2eb6..2e41b45673 100644
--- a/usr.sbin/pccard/pccardc/printcis.c
+++ b/usr.sbin/pccard/pccardc/printcis.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/printcis.c,v 1.11.2.2 2001/05/09 18:41:57 dmlb Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/printcis.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/printcis.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 /* 
@@ -39,8 +39,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 
 #include "readcis.h"
 
diff --git a/usr.sbin/pccard/pccardc/rdattr.c b/usr.sbin/pccard/pccardc/rdattr.c
index 1f90c77263..60ecc4b55c 100644
--- a/usr.sbin/pccard/pccardc/rdattr.c
+++ b/usr.sbin/pccard/pccardc/rdattr.c
@@ -22,6 +22,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/rdattr.c,v 1.2 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -31,7 +33,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 int
 rdattr_main(argc, argv)
diff --git a/usr.sbin/pccard/pccardc/rdmap.c b/usr.sbin/pccard/pccardc/rdmap.c
index 5bd770d387..0a7bf94d30 100644
--- a/usr.sbin/pccard/pccardc/rdmap.c
+++ b/usr.sbin/pccard/pccardc/rdmap.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/rdmap.c,v 1.12 1999/08/28 01:17:33 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/rdmap.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/rdmap.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,8 +35,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 
 static void
 dump_io(fd, nio)
diff --git a/usr.sbin/pccard/pccardc/rdreg.c b/usr.sbin/pccard/pccardc/rdreg.c
index 1ec2a7d0c8..924f54b5e9 100644
--- a/usr.sbin/pccard/pccardc/rdreg.c
+++ b/usr.sbin/pccard/pccardc/rdreg.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/rdreg.c,v 1.12 1999/08/28 01:17:33 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/rdreg.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/rdreg.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 void
 dumpslot(sl)
diff --git a/usr.sbin/pccard/pccardc/wrattr.c b/usr.sbin/pccard/pccardc/wrattr.c
index c765fea2da..802657b428 100644
--- a/usr.sbin/pccard/pccardc/wrattr.c
+++ b/usr.sbin/pccard/pccardc/wrattr.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/wrattr.c,v 1.13 1999/08/28 01:17:33 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/wrattr.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/wrattr.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 static void
 usage()
diff --git a/usr.sbin/pccard/pccardc/wrreg.c b/usr.sbin/pccard/pccardc/wrreg.c
index b4ecad644a..386059fcf3 100644
--- a/usr.sbin/pccard/pccardc/wrreg.c
+++ b/usr.sbin/pccard/pccardc/wrreg.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardc/wrreg.c,v 1.12 1999/08/28 01:17:34 peter Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/wrreg.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardc/Attic/wrreg.c,v 1.3 2003/08/08 04:18:46 dillon Exp $
  */
 
 #include <err.h>
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
+#include <bus/pccard/cardinfo.h>
 
 static void
 usage()
diff --git a/usr.sbin/pccard/pccardd/cardd.h b/usr.sbin/pccard/pccardd/cardd.h
index e01a65c7ce..5fd07182b2 100644
--- a/usr.sbin/pccard/pccardd/cardd.h
+++ b/usr.sbin/pccard/pccardd/cardd.h
@@ -24,14 +24,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardd/cardd.h,v 1.18.2.6 2001/05/23 21:56:40 dmlb Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardd/Attic/cardd.h,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardd/Attic/cardd.h,v 1.3 2003/08/08 04:18:47 dillon Exp $
  *
  *	Common include file for PCMCIA daemon
  */
 #include <bitstring.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 
 #include "readcis.h"
 
diff --git a/usr.sbin/pccard/pccardd/readcis.c b/usr.sbin/pccard/pccardd/readcis.c
index 820ec57634..4325e3e79e 100644
--- a/usr.sbin/pccard/pccardd/readcis.c
+++ b/usr.sbin/pccard/pccardd/readcis.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pccard/pccardd/readcis.c,v 1.17.2.4 2001/05/23 21:53:50 dmlb Exp $
- * $DragonFly: src/usr.sbin/pccard/pccardd/Attic/readcis.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pccard/pccardd/Attic/readcis.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 /*
@@ -39,8 +39,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include <pccard/cardinfo.h>
-#include <pccard/cis.h>
+#include <bus/pccard/cardinfo.h>
+#include <bus/pccard/cis.h>
 
 #include "readcis.h"
 
diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index 1c5914d03b..bc5607332d 100644
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pciconf/pciconf.c,v 1.11.2.3 2002/09/17 22:09:15 jdp Exp $
- * $DragonFly: src/usr.sbin/pciconf/pciconf.c,v 1.2 2003/06/17 04:29:59 dillon Exp $
+ * $DragonFly: src/usr.sbin/pciconf/pciconf.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -41,7 +41,7 @@
 #include <sys/pciio.h>
 #include <sys/queue.h>
 
-#include <pci/pcireg.h>
+#include <bus/pci/pcireg.h>
 
 #include "pathnames.h"
 
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index aebecdb0c5..f13108396c 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -24,14 +24,14 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/bundle.c,v 1.84.2.12 2002/09/01 02:12:22 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/bundle.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/bundle.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#include <net/if_tun.h>		/* For TUNS* ioctls */
+#include <net/tun/if_tun.h>		/* For TUNS* ioctls */
 #include <net/route.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index b43728051c..5aa9e09e9b 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/ether.c,v 1.9.2.14 2002/09/01 02:12:26 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/ether.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/ether.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -39,10 +39,10 @@
 #include <net/route.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netgraph/ng_ether.h>
+#include <netgraph/ether/ng_ether.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_pppoe.h>
-#include <netgraph/ng_socket.h>
+#include <netgraph/pppoe/ng_pppoe.h>
+#include <netgraph/socket/ng_socket.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c
index 17a5d273aa..a7b0d51f23 100644
--- a/usr.sbin/ppp/i4b.c
+++ b/usr.sbin/ppp/i4b.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/i4b.c,v 1.8.2.3 2002/09/01 02:12:27 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/i4b.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/i4b.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -38,15 +38,15 @@
 #include <errno.h>
 #include <fcntl.h>
 #ifdef __FreeBSD__
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_rbch_ioctl.h>
+#include <i4b_machine/i4b_ioctl.h>
+#include <i4b_machine/i4b_rbch_ioctl.h>
 #else
 #ifdef __NetBSD__
 #include <netisdn/i4b_ioctl.h>
 #include <netisdn/i4b_rbch_ioctl.h>
 #else
-#include <i4b/i4b_ioctl.h>
-#include <i4b/i4b_rbch_ioctl.h>
+#include <net/i4b/i4b_ioctl.h>
+#include <net/i4b/i4b_rbch_ioctl.h>
 #endif
 #endif
 #include <stdio.h>
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index b8e4f9d068..968930e8c9 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/tty.c,v 1.21.2.3 2002/09/01 02:12:32 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/tty.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/tty.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -45,10 +45,10 @@
 #include <unistd.h>
 #ifndef NONETGRAPH
 #include <netgraph.h>
-#include <netgraph/ng_async.h>
+#include <netgraph/async/ng_async.h>
 #include <netgraph/ng_message.h>
-#include <netgraph/ng_ppp.h>
-#include <netgraph/ng_tty.h>
+#include <netgraph/ppp/ng_ppp.h>
+#include <netgraph/tty/ng_tty.h>
 #endif
 
 #include "layer.h"
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index 7ad2e0082f..db2e50aac0 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/tun.c,v 1.20.2.4 2002/09/01 02:12:32 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/tun.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/tun.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -36,7 +36,7 @@
 #include <net/route.h>
 #include <netinet/in.h>
 #include <net/if_types.h>
-#include <net/if_tun.h>
+#include <net/tun/if_tun.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/un.h>
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index 006970a07c..6910e684c6 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -25,7 +25,7 @@
  * OR MODIFICATIONS.
  *
  * $FreeBSD: src/usr.sbin/pppd/ccp.c,v 1.10 1999/08/28 01:19:00 peter Exp $
- * $DragonFly: src/usr.sbin/pppd/ccp.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppd/ccp.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <string.h>
@@ -36,7 +36,7 @@
 #include "pppd.h"
 #include "fsm.h"
 #include "ccp.h"
-#include <net/ppp_comp.h>
+#include <net/ppp_layer/ppp_comp.h>
 
 /*
  * Protocol entry points from main code.
diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c
index ea0d2aed91..7ba8fc14b9 100644
--- a/usr.sbin/pppd/options.c
+++ b/usr.sbin/pppd/options.c
@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $FreeBSD: src/usr.sbin/pppd/options.c,v 1.20.2.2 2002/08/31 18:16:01 dwmalone Exp $
- * $DragonFly: src/usr.sbin/pppd/options.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppd/options.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <ctype.h>
@@ -58,7 +58,7 @@
 #include "ipxcp.h"
 #endif /* IPX_CHANGE */
 
-#include <net/ppp_comp.h>
+#include <net/ppp_layer/ppp_comp.h>
 
 #define FALSE	0
 #define TRUE	1
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index 666128ea8f..91f8cc1274 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -17,7 +17,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $FreeBSD: src/usr.sbin/pppd/pppd.h,v 1.13 1999/08/28 01:19:08 peter Exp $
- * $DragonFly: src/usr.sbin/pppd/pppd.h,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppd/pppd.h,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 /*
@@ -31,7 +31,7 @@
 #include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
 #include <sys/types.h>		/* for u_int32_t, if defined */
 #include <sys/time.h>		/* for struct timeval */
-#include <net/ppp_defs.h>
+#include <net/ppp_layer/ppp_defs.h>
 
 #if __STDC__
 #include <stdarg.h>
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 4ad95a79b2..349886b44d 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -20,7 +20,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $FreeBSD: src/usr.sbin/pppd/sys-bsd.c,v 1.17.2.1 2002/09/17 16:53:55 nectar Exp $
- * $DragonFly: src/usr.sbin/pppd/sys-bsd.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppd/sys-bsd.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 /*	$NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $	*/
@@ -52,8 +52,8 @@
 #endif
 
 #include <net/if.h>
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
+#include <net/ppp_layer/ppp_defs.h>
+#include <net/ppp/if_ppp.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index 63f450005e..bd21f135a8 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -31,7 +31,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.13 1999/08/28 01:19:11 peter Exp $
- * $DragonFly: src/usr.sbin/pppstats/pppstats.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppstats/pppstats.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <stdio.h>
@@ -47,12 +47,12 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <net/ppp_defs.h>
+#include <net/ppp_layer/ppp_defs.h>
 
 #ifndef STREAMS
 #include <sys/socket.h>		/* *BSD, Linux, NeXT, Ultrix etc. */
 #include <net/if.h>
-#include <net/if_ppp.h>
+#include <net/ppp/if_ppp.h>
 
 #else	/* STREAMS */
 #include <sys/stropts.h>	/* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index c189fc821d..5065298e64 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)pstat.c	8.16 (Berkeley) 5/9/95
  * $FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.49.2.5 2002/07/12 09:12:49 des Exp $
- * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -42,12 +42,12 @@
 #include <sys/ucred.h>
 #define _KERNEL
 #include <sys/file.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
+#include <vfs/ufs/quota.h>
+#include <vfs/ufs/inode.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
 #include <sys/namei.h>
-#include <miscfs/union/union.h>
+#include <vfs/union/union.h>
 #undef _KERNEL
 #include <sys/stat.h>
 #include <nfs/rpcv2.h>
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index cc6d5b2a59..e8e4819fb7 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -29,15 +29,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/quot/quot.c,v 1.11.2.4 2002/03/15 18:12:41 mikeh Exp $
- * $DragonFly: src/usr.sbin/quot/quot.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/quot/quot.c,v 1.3 2003/08/08 04:18:47 dillon Exp $
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/time.h>
-#include <ufs/ffs/fs.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
+#include <vfs/ufs/fs.h>
+#include <vfs/ufs/quota.h>
+#include <vfs/ufs/inode.h>
 
 #include <err.h>
 #include <fcntl.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 20a035074b..3c99c3d611 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)quotaon.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.4.2.1 2001/07/19 05:17:06 kris Exp $
- * $DragonFly: src/usr.sbin/quotaon/quotaon.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/quotaon/quotaon.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
  */
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mount.h>
-#include <ufs/ufs/quota.h>
+#include <vfs/ufs/quota.h>
 #include <err.h>
 #include <fstab.h>
 #include <stdio.h>
diff --git a/usr.sbin/raycontrol/raycontrol.c b/usr.sbin/raycontrol/raycontrol.c
index 830fa39f8e..a677d541c8 100644
--- a/usr.sbin/raycontrol/raycontrol.c
+++ b/usr.sbin/raycontrol/raycontrol.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/raycontrol/raycontrol.c,v 1.1.2.3 2002/12/16 08:39:41 roam Exp $
- * $DragonFly: src/usr.sbin/raycontrol/Attic/raycontrol.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/raycontrol/Attic/raycontrol.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -44,8 +44,8 @@
 #include <net/ethernet.h>
 #include <net/if_ieee80211.h>
 
-#include <dev/ray/if_rayreg.h>
-#include <dev/ray/if_raymib.h>
+#include <dev/netif/ray/if_rayreg.h>
+#include <dev/netif/ray/if_raymib.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 4579daf17e..bbbb7b81a6 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1980, 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)repquota.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.9.2.2 2002/03/15 22:18:25 mikeh Exp $
- * $DragonFly: src/usr.sbin/repquota/repquota.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/repquota/repquota.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
  */
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <ufs/ufs/quota.h>
+#include <vfs/ufs/quota.h>
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index a71835a08f..3fd8280b8d 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # $FreeBSD: src/usr.sbin/setkey/Makefile,v 1.1.2.5 2001/04/25 14:05:11 ru Exp $
-# $DragonFly: src/usr.sbin/setkey/Makefile,v 1.2 2003/06/17 04:30:03 dillon Exp $
+# $DragonFly: src/usr.sbin/setkey/Makefile,v 1.3 2003/08/08 04:18:48 dillon Exp $
 
 PROG=	setkey
 SRCS=	setkey.c parse.y token.l
@@ -38,7 +38,7 @@ YFLAGS+=-d
 
 # libpfkey.
 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey
+.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netproto/key
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
 CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
 
diff --git a/usr.sbin/sicontrol/sicontrol.c b/usr.sbin/sicontrol/sicontrol.c
index 10431549b8..a81e2b2ac1 100644
--- a/usr.sbin/sicontrol/sicontrol.c
+++ b/usr.sbin/sicontrol/sicontrol.c
@@ -31,7 +31,7 @@
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
  * $FreeBSD: src/usr.sbin/sicontrol/sicontrol.c,v 1.12.2.1 2000/12/11 01:03:39 obrien Exp $
- * $DragonFly: src/usr.sbin/sicontrol/sicontrol.c,v 1.2 2003/06/17 04:30:03 dillon Exp $
+ * $DragonFly: src/usr.sbin/sicontrol/sicontrol.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
  */
 
 #include <ctype.h>
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 
-#include <dev/si/si.h>
+#include <dev/serial/si/si.h>
 
 struct lv {
 	char	*lv_name;
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index 9ca262144d..2f16a100dc 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -21,7 +21,7 @@
  *	- Initial distribution.
  *
  * $FreeBSD: src/usr.sbin/slstat/slstat.c,v 1.14 1999/08/28 01:20:00 peter Exp $
- * $DragonFly: src/usr.sbin/slstat/slstat.c,v 1.2 2003/06/17 04:30:03 dillon Exp $
+ * $DragonFly: src/usr.sbin/slstat/slstat.c,v 1.3 2003/08/08 04:18:48 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/slcompress.h>
-#include <net/if_slvar.h>
+#include <net/sl/if_slvar.h>
 
 static	void usage __P((void));
 static	void intpr __P((void));
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 8dca8abb94..a3dc7de088 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usbd.c,v 1.4 1998/12/09 00:57:19 augustss Exp $	*/
 /*	$FreeBSD: src/usr.sbin/usbd/usbd.c,v 1.10.2.6 2002/12/31 09:05:27 maxim Exp $	*/
-/*	$DragonFly: src/usr.sbin/usbd/usbd.c,v 1.2 2003/06/17 04:30:03 dillon Exp $	*/
+/*	$DragonFly: src/usr.sbin/usbd/usbd.c,v 1.3 2003/08/08 04:18:48 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 #include <sys/wait.h>
 #include <regex.h>
 
-#include <dev/usb/usb.h>
+#include <bus/usb/usb.h>
 
 /* default name of configuration file
  */
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 6905dc9241..15c3ddebd1 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: usbdevs.c,v 1.17 2001/02/19 23:22:48 cgd Exp $	*/
 /*	$FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.5.2.3 2002/11/13 15:15:21 joe Exp $	*/
-/*	$DragonFly: src/usr.sbin/usbdevs/usbdevs.c,v 1.2 2003/06/17 04:30:03 dillon Exp $	*/
+/*	$DragonFly: src/usr.sbin/usbdevs/usbdevs.c,v 1.3 2003/08/08 04:18:48 dillon Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include <err.h>
 #include <errno.h>
-#include <dev/usb/usb.h>
+#include <bus/usb/usb.h>
 #if defined(__FreeBSD__)
 #include <sys/ioctl.h>
 #endif
diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index 05145a6d7f..b015eae5b7 100644
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -39,7 +39,7 @@
  *
  * @(#)vnconfig.c	8.1 (Berkeley) 12/15/93
  * $FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.13.2.7 2003/06/02 09:10:27 maxim Exp $
- * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.2 2003/06/17 04:30:04 dillon Exp $
+ * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.3 2003/08/08 04:18:49 dillon Exp $
  */
 
 #include <ctype.h>
@@ -58,7 +58,7 @@
 #include <sys/module.h>
 #include <sys/stat.h>
 #include <sys/vnioctl.h>
-#include <ufs/ufs/ufsmount.h>
+#include <vfs/ufs/ufsmount.h>
 
 #define LINESIZE	1024
 #define ZBUFSIZE	32768
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 1faa3e9b30..0c48707229 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -31,7 +31,7 @@
  *
  * @(#) Copyright (c) 1997, 1998, 1999 Bill Paul. All rights reserved.
  * $FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.9.2.7 2002/08/03 07:24:17 imp Exp $
- * $DragonFly: src/usr.sbin/wicontrol/Attic/wicontrol.c,v 1.2 2003/06/17 04:30:04 dillon Exp $
+ * $DragonFly: src/usr.sbin/wicontrol/Attic/wicontrol.c,v 1.3 2003/08/08 04:18:49 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -46,9 +46,9 @@
 #include <net/ethernet.h>
 
 #include <net/if_ieee80211.h>
-#include <dev/wi/if_wavelan_ieee.h>
-#include <dev/wi/wi_hostap.h>
-#include <dev/wi/if_wireg.h>
+#include <dev/netif/wi/if_wavelan_ieee.h>
+#include <dev/netif/wi/wi_hostap.h>
+#include <dev/netif/wi/if_wireg.h>
 
 #include <stdio.h>
 #include <string.h>