diff --git a/headers/private/kernel/arch/cpu.h b/headers/private/kernel/arch/cpu.h
index a32232a9bd..9e7e9fd12d 100644
--- a/headers/private/kernel/arch/cpu.h
+++ b/headers/private/kernel/arch/cpu.h
@@ -2,13 +2,14 @@
 ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
-
 #ifndef _KERNEL_ARCH_CPU_H
 #define _KERNEL_ARCH_CPU_H
 
+
 #include <kernel.h>
 #include <ktypes.h>
-#include <boot/stage2.h>
+#include <boot/kernel_args.h>
+
 
 #define PAGE_ALIGN(x) (((x) + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1))
 
diff --git a/headers/private/kernel/arch/int.h b/headers/private/kernel/arch/int.h
index 3841afd7a3..feb267b360 100644
--- a/headers/private/kernel/arch/int.h
+++ b/headers/private/kernel/arch/int.h
@@ -5,7 +5,13 @@
 #ifndef KERNEL_ARCH_INT_H
 #define KERNEL_ARCH_INT_H
 
-#include <boot/stage2.h>
+
+#include <boot/kernel_args.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int arch_int_init(kernel_args *ka);
 int arch_int_init2(kernel_args *ka);
@@ -17,4 +23,8 @@ void arch_int_enable_io_interrupt(int irq);
 void arch_int_disable_io_interrupt(int irq);
 bool arch_int_is_interrupts_enabled(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* KERNEL_ARCH_INT_H */
diff --git a/headers/private/kernel/arch/smp.h b/headers/private/kernel/arch/smp.h
index 945dd53b17..54a9860c9e 100644
--- a/headers/private/kernel/arch/smp.h
+++ b/headers/private/kernel/arch/smp.h
@@ -11,11 +11,19 @@
 struct kernel_args;
 
 
-// must match MAX_BOOT_CPUS in stage2.h
+// must match MAX_BOOT_CPUS in platform_kernel_args.h
 #define SMP_MAX_CPUS MAX_BOOT_CPUS
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int arch_smp_init(struct kernel_args *ka);
 void arch_smp_send_ici(int target_cpu);
 void arch_smp_send_broadcast_ici(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* KERNEL_ARCH_SMP_H */