diff --git a/headers/private/kernel/syscalls.h b/headers/private/kernel/syscalls.h
index 868c5a354b..01c658d78e 100644
--- a/headers/private/kernel/syscalls.h
+++ b/headers/private/kernel/syscalls.h
@@ -6,8 +6,9 @@
 #define _KERNEL_SYSCALLS_H
 
 
-#include <OS.h>
+#include <arch_config.h>
 #include <image.h>
+#include <OS.h>
 #include <storage/DiskDeviceDefs.h>
 
 #include <signal.h>
diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile
index 7d87fc3533..4392dd5f3a 100644
--- a/src/add-ons/input_server/devices/keyboard/Jamfile
+++ b/src/add-ons/input_server/devices/keyboard/Jamfile
@@ -4,6 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders input ;
 UsePrivateHeaders kernel ;
+UseArchHeaders $(TARGET_ARCH) ;
 
 Addon <input>keyboard : input_server/devices : 
 	KeyboardInputDevice.cpp
diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 6e40945a0b..85d410e7af 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -6,6 +6,7 @@ UsePrivateHeaders app ;
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
 UsePrivateHeaders storage ;
+UseArchHeaders $(TARGET_ARCH) ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ;
 
 # standard commands that don't need any additional library
diff --git a/src/kits/storage/Jamfile b/src/kits/storage/Jamfile
index 26a5b93cf9..2acf26f092 100644
--- a/src/kits/storage/Jamfile
+++ b/src/kits/storage/Jamfile
@@ -4,6 +4,7 @@ SetSubDirSupportedPlatforms haiku libbe_test ;
 
 UsePrivateHeaders shared app kernel storage ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
+UseArchHeaders $(TARGET_ARCH) ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mime ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) sniffer ] ;
diff --git a/src/servers/registrar/Jamfile b/src/servers/registrar/Jamfile
index f68d428355..027094cb15 100644
--- a/src/servers/registrar/Jamfile
+++ b/src/servers/registrar/Jamfile
@@ -4,6 +4,7 @@ UsePrivateHeaders app ;
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
 UsePrivateHeaders storage ;
+UseArchHeaders $(TARGET_ARCH) ;
 
 Server registrar
  	:
diff --git a/src/system/libroot/os/atomic.c b/src/system/libroot/os/atomic.c
index b87406f65e..3a3b2ffba9 100644
--- a/src/system/libroot/os/atomic.c
+++ b/src/system/libroot/os/atomic.c
@@ -6,7 +6,6 @@
 
 #include <SupportDefs.h>
 
-#include <arch_config.h>
 #include <syscalls.h>