diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 0bc256bdc8c..a881783e43f 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -259,6 +259,7 @@ SUBDIR=	${_3dfx} \
 	${_stg} \
 	stge \
 	${_streams} \
+	svr4 \
 	sym \
 	${_syscons} \
 	sysvipc \
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 31c57dca1cd..e6463e41c26 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -58,7 +58,7 @@ SRCS+=	cpufreq_if.h device_if.h isa_if.h pci_if.h pcib_if.h
 # XXX ACPI should not depend on the following headers but this is currently
 # needed for the build of assym.s.
 # This obviously needs a better and more structural fix.
-SRCS+=	opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h
+SRCS+=	opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h
 
 # Debugging support
 DBSRC=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index 04113630d7c..40263251beb 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -15,7 +15,7 @@ SRCS+=	agp_amd64.c
 SRCS+=	agp_amd64.c agp_i810.c agp_via.c
 .endif
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
-SRCS+=	opt_bus.h
+SRCS+=	opt_agp.h opt_bus.h
 MFILES=	kern/device_if.m kern/bus_if.m dev/agp/agp_if.m dev/pci/pci_if.m
 WERROR=
 
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index 5d16800a8fd..08e61a94c4f 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -23,7 +23,7 @@ SRCS+=		bus_if.h device_if.h vnode_if.h
 SRCS+=		assym.s
 
 # These are needed for assym.s
-SRCS+=		opt_compat.h opt_kstack_pages.h opt_nfs.h
+SRCS+=		opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
 
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=		opt_apic.h
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index fbf5a5851e2..0995c3aedb4 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -17,7 +17,7 @@ SRCS=	linux${SFX}_dummy.c linux_emul.c linux_file.c \
 	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h
 
 OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
 
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 447d048a28e..86f84465d19 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -9,6 +9,8 @@ SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_mac.h opt_svr4.h \
 	svr4_machdep.c svr4_resource.c svr4_ipc.c
 OBJS=	svr4_locore.o 
 
+SRCS+=	opt_ktrace.h opt_sysvipc.h opt_route.h
+
 CLEANFILES=	svr4_assym.h svr4_genassym.o
 
 svr4_assym.h: svr4_genassym.o