diff --git a/headers/private/kernel/arch/x86/bios.h b/headers/private/kernel/arch/x86/bios.h
index c88fe772dd..145f08fbf9 100644
--- a/headers/private/kernel/arch/x86/bios.h
+++ b/headers/private/kernel/arch/x86/bios.h
@@ -9,6 +9,8 @@
 #include <SupportDefs.h>
 
 
+#ifndef __x86_64__
+
 #define BIOS32_PCI_SERVICE	'ICP$'
 
 struct bios32_service {
@@ -29,4 +31,6 @@ status_t bios_init(void);
 }
 #endif
 
+#endif	/* __x86_64__ */
+
 #endif	/* ARCH_x86_BIOS_H */
diff --git a/src/system/kernel/arch/x86/apm.cpp b/src/system/kernel/arch/x86/32/apm.cpp
similarity index 100%
rename from src/system/kernel/arch/x86/apm.cpp
rename to src/system/kernel/arch/x86/32/apm.cpp
diff --git a/src/system/kernel/arch/x86/bios.cpp b/src/system/kernel/arch/x86/32/bios.cpp
similarity index 100%
rename from src/system/kernel/arch/x86/bios.cpp
rename to src/system/kernel/arch/x86/32/bios.cpp
diff --git a/src/system/kernel/arch/x86/vm86.cpp b/src/system/kernel/arch/x86/32/vm86.cpp
similarity index 100%
rename from src/system/kernel/arch/x86/vm86.cpp
rename to src/system/kernel/arch/x86/32/vm86.cpp
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index 8834924481..2d4150920a 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -41,22 +41,22 @@ if $(TARGET_ARCH) = x86_64 {
 	SEARCH_SOURCE += [ FDirName $(SUBDIR) paging pae ] ;
 
 	archSpecificSources =
+		apm.cpp
 		arch.S
+		bios.cpp
 		cpuid.S
 		int.cpp
 		interrupts.S
 		thread.cpp
+		vm86.cpp
 
 		arch_commpage.cpp
 		arch_debug.cpp
 		arch_user_debugger.cpp
-		apm.cpp
-		bios.cpp
 		ioapic.cpp
 		irq_routing_table.cpp
 		msi.cpp
 		syscall.S
-		vm86.cpp
 		x86_signals.cpp
 		x86_signals_asm.S
 		x86_syscalls.cpp