diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index aeac81df9..5e571d497 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -127,8 +127,6 @@ extern "C" {
 #include <sys/systm.h>
 #include <sys/misc.h>
 #include <sys/random.h>
-#include <sys/callb.h>
-#include <sys/trace.h>
 
 #include <sys/zfs_context_os.h>
 
diff --git a/scripts/spdxcheck.pl b/scripts/spdxcheck.pl
index 59300ea86..e1af3150b 100755
--- a/scripts/spdxcheck.pl
+++ b/scripts/spdxcheck.pl
@@ -124,7 +124,7 @@ my $untagged_patterns = q(
 	include/os/freebsd/spl/sys/inttypes.h
 	include/os/freebsd/spl/sys/mode.h
 	include/os/freebsd/spl/sys/trace.h
-	include/os/freebsd/spl/sys/trace_zfs.h
+	include/os/freebsd/zfs/sys/trace_zfs.h
 	include/os/freebsd/zfs/sys/zpl.h
 	include/os/linux/kernel/linux/page_compat.h
 	lib/libspl/include/sys/string.h