diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 2e87b95895e7..0f1367f859f2 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,40 +1,42 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for amd64 links, tags file
 
 # SYS is normally set in Make.tags.inc
 SYS=/sys
 
 TAGDIR=	amd64
 
 .include "../kern/Make.tags.inc"
 
 all:
 	@echo "make links or tags only"
 
 # Directories in which to place amd64 tags links
-DAMD64=	acpica amd64 ia32 include linux linux32 pci vmm
+DAMD64=	acpica amd64 ia32 include linux linux32 pci sgx vmm
 
 links::
 	-for i in ${COMMDIR1}; do \
 	    (cd $$i && { rm -f tags; ln -s ../${TAGDIR}/tags tags; }) done
 	-for i in ${COMMDIR2}; do \
 	    (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done
 	-for i in ${DAMD64}; do \
-	    (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
+	    (cd ${SYS}/amd64/$$i && { rm -f tags; ln -s ../tags tags; }) done
 
 SAMD64=	${SYS}/amd64/acpica/*.[ch] \
 	${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \
 	${SYS}/amd64/include/*.[ch] ${SYS}/amd64/linux/*.[ch] \
 	${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch] \
-	${SYS}/amd64/vmm/*.[ch]
+	${SYS}/amd64/sgx/*.[ch] ${SYS}/amd64/vmm/*.[ch]
 AAMD64=	${SYS}/amd64/amd64/*.S
 
 tags::
 	-ctags -wdt ${COMM} ${SAMD64}
 	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMD64} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> tags
 	sort -o tags tags
 	chmod 444 tags
+	rm -f ${SYS}/amd64/tags
+	mv tags ${SYS}/amd64/tags
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index cdefa98a32f6..23a85150c19a 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -1,95 +1,89 @@
 # $FreeBSD$
 #	@(#)Make.tags.inc	8.1 (Berkeley) 6/11/93
 
 SYS?=	${.CURDIR}/..
 
 # Common files for "make tags", included by the Makefile for each
 # architecture.
 
 # Put the /sys/sys include files at the end so that subroutine definitions
 # win when there is a struct tag with the same name (e.g., vmmeter).  The
 # better solution would be for ctags to generate "struct vmmeter" tags.
 
 COMM=	${SYS}/sys/vnode.h \
 	${SYS}/dev/alc/*.[ch] \
-	${SYS}/dev/en/*.[ch] \
 	${SYS}/dev/iicbus/*.[ch] \
 	${SYS}/dev/isp/*.[ch] \
 	${SYS}/dev/ppbus/*.[ch] \
 	${SYS}/dev/smbus/*.[ch] \
-	${SYS}/dev/vx/*.[ch] \
 	${SYS}/fs/autofs/*.[ch] \
 	${SYS}/fs/cd9660/*.[ch] \
 	${SYS}/fs/cuse/*.[ch] \
 	${SYS}/fs/deadfs/*.[ch] \
 	${SYS}/fs/devfs/*.[ch] \
 	${SYS}/fs/ext2fs/*.[ch] \
 	${SYS}/fs/fdescfs/*.[ch] \
 	${SYS}/fs/fifofs/*.[ch] \
 	${SYS}/fs/fuse/*.[ch] \
 	${SYS}/fs/msdosfs/*.[ch] \
 	${SYS}/fs/nfs/*.[ch] \
 	${SYS}/fs/nfsclient/*.[ch] \
 	${SYS}/fs/nfsserver/*.[ch] \
 	${SYS}/fs/nullfs/*.[ch] \
 	${SYS}/fs/procfs/*.[ch] \
 	${SYS}/fs/pseudofs/*.[ch] \
 	${SYS}/fs/smbfs/*.[ch] \
 	${SYS}/fs/tmpfs/*.[ch] \
 	${SYS}/fs/udf/*.[ch] \
 	${SYS}/fs/unionfs/*.[ch] \
 	${SYS}/geom/*.[ch] \
 	${SYS}/kern/*.[ch] \
 	${SYS}/net/*.[ch] \
 	${SYS}/netinet/*.[ch] \
 	${SYS}/netinet6/*.[ch] \
 	${SYS}/netipsec/*.[ch] \
-	${SYS}/netnatm/*.[ch] \
 	${SYS}/ddb/*.[ch] \
 	${SYS}/ufs/ffs/*.[ch] \
 	${SYS}/ufs/ufs/*.[ch] \
 	${SYS}/vm/*.[ch] \
 	${SYS}/sys/*.[ch]
 
 COMMDIR1= ${SYS}/conf \
 	${SYS}/geom \
 	${SYS}/kern \
 	${SYS}/net \
 	${SYS}/netinet \
 	${SYS}/netinet6 \
 	${SYS}/netipsec \
-	${SYS}/netnatm \
 	${SYS}/ddb \
 	${SYS}/vm \
 	${SYS}/sys
 
 COMMDIR2= ${SYS}/dev/alc \
-	${SYS}/dev/en \
 	${SYS}/dev/iicbus \
 	${SYS}/dev/isp \
 	${SYS}/dev/md \
 	${SYS}/dev/ppbus \
 	${SYS}/dev/smbus \
-	${SYS}/dev/vx \
 	${SYS}/fs/autofs \
 	${SYS}/fs/cd9660 \
 	${SYS}/fs/cuse \
 	${SYS}/fs/deadfs \
 	${SYS}/fs/devfs \
 	${SYS}/fs/ext2fs \
 	${SYS}/fs/fdescfs \
 	${SYS}/fs/fifofs \
 	${SYS}/fs/fuse \
 	${SYS}/fs/msdosfs \
 	${SYS}/fs/nfs \
 	${SYS}/fs/nfsclient \
 	${SYS}/fs/nfsserver \
 	${SYS}/fs/nullfs \
 	${SYS}/fs/procfs \
 	${SYS}/fs/pseudofs \
 	${SYS}/fs/smbfs \
 	${SYS}/fs/tmpfs \
 	${SYS}/fs/udf \
 	${SYS}/fs/unionfs \
 	${SYS}/ufs/ffs \
 	${SYS}/ufs/ufs