Index: sys/conf/files.arm
===================================================================
--- sys/conf/files.arm
+++ sys/conf/files.arm
@@ -106,3 +106,22 @@
 libkern/ucmpdi2.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
+cddl/compat/opensolaris/kern/opensolaris.c		optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/compat/opensolaris/kern/opensolaris_cmn_err.c	optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/compat/opensolaris/kern/opensolaris_kmem.c		optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/compat/opensolaris/kern/opensolaris_misc.c		optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/compat/opensolaris/kern/opensolaris_sunddi.c	optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/compat/opensolaris/kern/opensolaris_atomic.c	optional opensolaris compile-with "${OPENSOLARIS_C}"
+cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	optional dtrace compile-with "${DTRACE_C}"
+cddl/dev/dtrace/arm/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
+cddl/dev/dtrace/arm/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
+cddl/compat/opensolaris/kern/opensolaris_taskq.c	optional dtrace compile-with "${DTRACE_C}"
+cddl/dev/dtmalloc/dtmalloc.c				optional dtrace_dtmalloc compile-with "${DTRACE_COMMON_C}"
+cddl/dev/lockstat/lockstat.c				optional dtrace_lockstat compile-with "${DTRACE_COMMON_C}"
+cddl/dev/profile/profile.c				optional dtrace_profile compile-with "${DTRACE_COMMON_C}"
+cddl/dev/sdt/sdt.c					optional dtrace_sdt compile-with "${DTRACE_COMMON_C}"
+cddl/dev/fbt/fbt.c					optional dtrace_fbt compile-with "${FBT_C}"
+cddl/dev/fbt/arm/fbt_isa.c				optional dtrace_fbt compile-with "${FBT_C}"
+cddl/dev/systrace/systrace.c				optional dtrace_systrace compile-with "${DTRACE_COMMON_C}"
+cddl/dev/prototype.c					optional dtrace_prototype compile-with "${DTRACE_COMMON_C}"
+fs/nfsclient/nfs_clkdtrace.c				optional dtrace_dtnfscl compile-with "${DTRACE_COMMON_C}"
Index: sys/conf/kern.post.mk
===================================================================
--- sys/conf/kern.post.mk
+++ sys/conf/kern.post.mk
@@ -185,10 +185,10 @@
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
 # We have "special" -I include paths for opensolaris/zfs files in 'depend'.
-CFILES_NOZFS=	${CFILES:N*/opensolaris/*}
-SFILES_NOZFS=	${SFILES:N*/opensolaris/*}
-CFILES_ZFS=	${CFILES:M*/opensolaris/*}
-SFILES_ZFS=	${SFILES:M*/opensolaris/*}
+CFILES_NOZFS=	${CFILES:N*/cddl/*:N*nfs_clkdtrace*}
+SFILES_NOZFS=	${SFILES:N*/cddl/*}
+CFILES_ZFS=	${CFILES:M*/cddl/*}
+SFILES_ZFS=	${SFILES:M*/cddl/*}
 
 kernel-depend: .depend
 # The argument list can be very long, so use make -V and xargs to
@@ -201,7 +201,7 @@
 	${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
 	${MAKE} -V CFILES_ZFS | \
-	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS}
+	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS} ${FBT_CFLAGS} ${DTRACE_CFLAGS}
 	${MAKE} -V SFILES_NOZFS | \
 	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
 	${MAKE} -V SFILES_ZFS | \
Index: sys/conf/kern.pre.mk
===================================================================
--- sys/conf/kern.pre.mk
+++ sys/conf/kern.pre.mk
@@ -149,6 +149,20 @@
 ZFS_C=		${CC} -c ${ZFS_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
 ZFS_S=		${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 
+CDDL_CFLAGS=	${CFLAGS} -DFREEBSD_NAMECACHE -nostdinc -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -Wno-unknown-pragmas
+
+OPENSOLARIS_CFLAGS=	-I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common/zmod -I$S/cddl/contrib/opensolaris/uts/common -I$S -I$S/cddl/contrib/opensolaris/common ${CDDL_CFLAGS}
+DTRACE_COMMON_CFLAGS=	-I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S ${CDDL_CFLAGS}
+DTRACE_CFLAGS=		-I$S/cddl/compat/opensolaris -I$S/cddl/dev/dtrace -I$S/cddl/dev/dtrace/${MACHINE_CPUARCH} -I$S/cddl/contrib/opensolaris/uts/common -I$S/cddl/contrib/opensolaris/common/util -I$S -DDIS_MEM -DSMP ${CDDL_CFLAGS}
+FBT_CFLAGS=		-I$S/cddl/dev/fbt/${MACHINE_CPUARCH} -I$S/cddl/dev/fbt -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S ${CDDL_CFLAGS}
+DTRACE_ASM_CFLAGS=	-x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS}
+
+OPENSOLARIS_C=		${CC} -c ${OPENSOLARIS_CFLAGS} ${CDDL_CFLAGS}	${WERROR} ${PROF} ${.IMPSRC}
+DTRACE_COMMON_C=	${CC} -c ${DTRACE_COMMON_CFLAGS} ${CDDL_CFLAGS}	${WERROR} ${PROF} ${.IMPSRC}
+DTRACE_C=		${CC} -c ${DTRACE_CFLAGS} ${CDDL_CFLAGS}	${WERROR} ${PROF} ${.IMPSRC}
+DTRACE_S=		${CC} -c ${DTRACE_ASM_CFLAGS} ${CDDL_CFLAGS}	${WERROR} ${.IMPSRC}
+FBT_C=			${CC} -c ${FBT_CFLAGS} ${CDDL_CFLAGS}		${WERROR} ${PROF} ${.IMPSRC}
+
 .if ${MK_CTF} != "no"
 NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .elif ${MAKE_VERSION} >= 5201111300