Index: Makefile.inc1
===================================================================
--- Makefile.inc1	(revision 306680)
+++ Makefile.inc1	(working copy)
@@ -2535,24 +2535,11 @@
 _xi-mtree: .PHONY
 	${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
 	mkdir -p ${XDDESTDIR}
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.xdev.dist \
 	    -p ${XDDESTDIR} >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-	    -p ${XDDESTDIR}/usr >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-	    -p ${XDDESTDIR}/usr/include >/dev/null
-.if defined(LIBCOMPAT)
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
-	    -p ${XDDESTDIR}/usr >/dev/null
-.endif
-.if ${MK_TESTS} != "no"
-	mkdir -p ${XDDESTDIR}${TESTSBASE}
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${XDDESTDIR}${TESTSBASE} >/dev/null
-.endif
 
-.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
-xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries .PHONY
+.ORDER: xdev-build _xi-mtree _xi-cross-tools
+xdev-install: xdev-build _xi-mtree _xi-cross-tools .PHONY
 
 _xi-cross-tools: .PHONY
 	@echo "_xi-cross-tools"
@@ -2568,14 +2555,6 @@
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
 .endfor
 
-_xi-includes: .PHONY
-	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 includes \
-		DESTDIR=${XDDESTDIR}
-
-_xi-libraries: .PHONY
-	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
-		DESTDIR=${XDDESTDIR}
-
 xdev-links: .PHONY
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
 	mkdir -p ../../../../usr/bin; \
Index: etc/mtree/BSD.xdev.dist
===================================================================
--- etc/mtree/BSD.xdev.dist	(nonexistent)
+++ etc/mtree/BSD.xdev.dist	(working copy)
@@ -0,0 +1,55 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.              
+
+    usr            
+
+        bin            
+        ..
+
+
+        include        
+        ..
+
+
+        lib            
+
+            clang          
+
+                3.8.0          
+
+                    include        
+                    ..
+
+                ..
+
+            ..
+
+
+            debug          
+
+                usr            
+
+                    bin            
+                    ..
+
+                ..
+
+            ..
+
+        ..
+
+
+        libdata        
+
+            ldscripts      
+            ..
+
+        ..
+
+    ..
+