diff --git a/src/kernel/boot/arch/x86/Jamfile b/src/kernel/boot/arch/x86/Jamfile
index 5738dbd492..40ff66d354 100644
--- a/src/kernel/boot/arch/x86/Jamfile
+++ b/src/kernel/boot/arch/x86/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src kernel boot arch x86 ;
 
-KernelObjects 
+KernelMergeObject boot_arch_stage2.o :
 	<$(SOURCE_GRIST)>stage2.c 
 	<$(SOURCE_GRIST)>stage2_asm.S 
 	<$(SOURCE_GRIST)>smp_boot.c  
diff --git a/src/kernel/boot/arch/x86/smp_boot.c b/src/kernel/boot/arch/x86/smp_boot.c
index 5e61fe559b..c381861535 100644
--- a/src/kernel/boot/arch/x86/smp_boot.c
+++ b/src/kernel/boot/arch/x86/smp_boot.c
@@ -4,7 +4,7 @@
 */
 
 
-#include <stage2.h>
+#include <boot/stage2.h>
 #include <arch/x86/stage2_priv.h>
 #include <arch/x86/smp_apic.h>
 
@@ -270,7 +270,7 @@ smp_setup_apic(kernel_args *ka)
 	config = apic_read(APIC_SIVR) & 0xfffffc00;
 	config |= APIC_ENABLE | 0xff;
 	apic_write(APIC_SIVR, config);
-#if 0
+#if 1
 	/* setup LINT0 as ExtINT */
 	config = (apic_read(APIC_LINT0) & 0xffff1c00);
 	config |= APIC_LVT_DM_ExtINT | APIC_LVT_IIPP | APIC_LVT_TM;
diff --git a/src/kernel/boot/arch/x86/stage2.c b/src/kernel/boot/arch/x86/stage2.c
index d09ae4d252..4802615afa 100644
--- a/src/kernel/boot/arch/x86/stage2.c
+++ b/src/kernel/boot/arch/x86/stage2.c
@@ -3,8 +3,8 @@
 ** Distributed under the terms of the NewOS License.
 */
 
-#include <bootdir.h>
-#include <stage2.h>
+#include <boot/bootdir.h>
+#include <boot/stage2.h>
 #include "arch/x86/stage2_priv.h"
 #include "arch/x86/descriptors.h"
 #include "vesa.h"