diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index b33afa80aeb..0c6a73d5451 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -60,6 +60,7 @@
 #include <machine/bwx.h>
 #include <machine/intr.h>
 #include <machine/rpb.h>
+#include <machine/smp.h>
 
 #ifdef EVCNT_COUNTERS
 struct evcnt clock_intr_evcnt;	/* event counter for clock intrs. */
diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index d899462d00e..9ad8966ff89 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -50,6 +50,7 @@
 #include <machine/rpb.h>
 #include <machine/clock.h>
 #include <machine/prom.h>
+#include <machine/smp.h>
 
 /* Set to 1 once we're ready to let the APs out of the pen. */
 static volatile int aps_ready = 0;
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index d775e7d3829..e3dd31af815 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index d775e7d3829..e3dd31af815 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d775e7d3829..e3dd31af815 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index d775e7d3829..e3dd31af815 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d775e7d3829..e3dd31af815 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d775e7d3829..e3dd31af815 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -68,6 +68,7 @@
 #include <machine/mpapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
+#include <machine/smp.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 895a238bfef..1249391aaeb 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -66,6 +66,7 @@
 
 #include <machine/pcb.h>
 #include <machine/md_var.h>
+#include <machine/smp.h>
 
 #include <sys/signalvar.h>
 #ifdef DDB
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 1d90fe8d6ae..aa1d7825097 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -45,6 +45,8 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 
+#include <machine/smp.h>
+
 volatile u_int stopped_cpus;
 volatile u_int started_cpus;
 
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index e829719fd66..21c67f4054f 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -13,7 +13,6 @@
 #define _SYS_SMP_H_
 
 #ifdef _KERNEL
-#include <machine/smp.h>
 
 #ifndef LOCORE