diff --git a/sys/arch/arm/allwinner/awin_board.c b/sys/arch/arm/allwinner/awin_board.c
index 994ed441a8ab..5b037505a178 100644
--- a/sys/arch/arm/allwinner/awin_board.c
+++ b/sys/arch/arm/allwinner/awin_board.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_board.c,v 1.24 2014/10/16 00:04:35 jmcneill Exp $	*/
+/*	$NetBSD: awin_board.c,v 1.25 2014/10/29 14:14:14 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,12 +30,13 @@
 
 #include "opt_allwinner.h"
 #include "opt_arm_debug.h"
+#include "opt_multiprocessor.h"
 
 #define	_ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.24 2014/10/16 00:04:35 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.25 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/arch/arm/arm/arm_machdep.c b/sys/arch/arm/arm/arm_machdep.c
index f79cd1ab9da6..56f36bc4cab5 100644
--- a/sys/arch/arm/arm/arm_machdep.c
+++ b/sys/arch/arm/arm/arm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm_machdep.c,v 1.42 2014/06/14 09:13:30 ozaki-r Exp $	*/
+/*	$NetBSD: arm_machdep.c,v 1.43 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -75,10 +75,11 @@
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_arm_debug.h"
+#include "opt_multiprocessor.h"
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.42 2014/06/14 09:13:30 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.43 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/exec.h>
 #include <sys/proc.h>
diff --git a/sys/arch/arm/arm32/arm32_boot.c b/sys/arch/arm/arm32/arm32_boot.c
index 83184f25cda0..dfff899ddcbe 100644
--- a/sys/arch/arm/arm32/arm32_boot.c
+++ b/sys/arch/arm/arm32/arm32_boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_boot.c,v 1.8 2014/09/14 20:35:45 ryo Exp $	*/
+/*	$NetBSD: arm32_boot.c,v 1.9 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -123,10 +123,11 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.8 2014/09/14 20:35:45 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.9 2014/10/29 14:14:14 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
+#include "opt_multiprocessor.h"
 
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/arch/arm/arm32/arm32_kvminit.c b/sys/arch/arm/arm32/arm32_kvminit.c
index d1b6db9fe659..075c9474c204 100644
--- a/sys/arch/arm/arm32/arm32_kvminit.c
+++ b/sys/arch/arm/arm32/arm32_kvminit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_kvminit.c,v 1.31 2014/10/24 07:08:26 skrll Exp $	*/
+/*	$NetBSD: arm32_kvminit.c,v 1.32 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -121,8 +121,10 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_multiprocessor.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.31 2014/10/24 07:08:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.32 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
diff --git a/sys/arch/arm/arm32/arm32_machdep.c b/sys/arch/arm/arm32/arm32_machdep.c
index 3c20d90edb4f..022d023555b6 100644
--- a/sys/arch/arm/arm32/arm32_machdep.c
+++ b/sys/arch/arm/arm32/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.107 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,11 +42,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.106 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.107 2014/10/29 14:14:14 skrll Exp $");
 
 #include "opt_modular.h"
 #include "opt_md.h"
 #include "opt_pmap_debug.h"
+#include "opt_multiprocessor.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm/arm32/arm32_tlb.c b/sys/arch/arm/arm32/arm32_tlb.c
index 071409e7292c..1938e8756730 100644
--- a/sys/arch/arm/arm32/arm32_tlb.c
+++ b/sys/arch/arm/arm32/arm32_tlb.c
@@ -26,8 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include "opt_multiprocessor.h"
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_tlb.c,v 1.4 2014/10/14 20:35:03 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_tlb.c,v 1.5 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/sys/arch/arm/arm32/db_interface.c b/sys/arch/arm/arm32/db_interface.c
index d68f9a700ee7..2014a4a4fbc5 100644
--- a/sys/arch/arm/arm32/db_interface.c
+++ b/sys/arch/arm/arm32/db_interface.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $	*/
+/*	$NetBSD: db_interface.c,v 1.54 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 1996 Scott K. Stevens
@@ -35,10 +35,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.53 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.54 2014/10/29 14:14:14 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
+#include "opt_multiprocessor.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff --git a/sys/arch/arm/cortex/gic.c b/sys/arch/arm/cortex/gic.c
index 49a5a7f914c9..3341d844660c 100644
--- a/sys/arch/arm/cortex/gic.c
+++ b/sys/arch/arm/cortex/gic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gic.c,v 1.10 2014/05/19 22:47:53 rmind Exp $	*/
+/*	$NetBSD: gic.c,v 1.11 2014/10/29 14:14:14 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,11 +29,12 @@
  */
 
 #include "opt_ddb.h"
+#include "opt_multiprocessor.h"
 
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.10 2014/05/19 22:47:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.11 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/arch/arm/include/arm32/pmap.h b/sys/arch/arm/include/arm32/pmap.h
index ad3e0beb2b68..33bbb21a2072 100644
--- a/sys/arch/arm/include/arm32/pmap.h
+++ b/sys/arch/arm/include/arm32/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.135 2014/07/31 08:04:57 skrll Exp $	*/
+/*	$NetBSD: pmap.h,v 1.136 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -75,6 +75,7 @@
 #ifndef _LOCORE
 #if defined(_KERNEL_OPT)
 #include "opt_arm32_pmap.h"
+#include "opt_multiprocessor.h"
 #endif
 #include <arm/cpufunc.h>
 #include <uvm/uvm_object.h>
diff --git a/sys/arch/arm/mainbus/cpu_mainbus.c b/sys/arch/arm/mainbus/cpu_mainbus.c
index 5936511b3537..dd13a0808c69 100644
--- a/sys/arch/arm/mainbus/cpu_mainbus.c
+++ b/sys/arch/arm/mainbus/cpu_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $	*/
+/*	$NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -42,9 +42,10 @@
  */
 
 #include "locators.h"
+#include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm/pic/picvar.h b/sys/arch/arm/pic/picvar.h
index 8d5cfe9eb22b..14fdd2a389bd 100644
--- a/sys/arch/arm/pic/picvar.h
+++ b/sys/arch/arm/pic/picvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: picvar.h,v 1.10 2014/05/19 22:47:53 rmind Exp $	*/
+/*	$NetBSD: picvar.h,v 1.11 2014/10/29 14:14:14 skrll Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,6 +30,8 @@
 #ifndef _ARM_PIC_PICVAR_H_
 #define _ARM_PIC_PICVAR_H_
 
+#include "opt_multiprocessor.h"
+
 #ifdef MULTIPROCESSOR
 #include <sys/kcpuset.h>
 #endif