diff --git a/src/kernel/core/syscalls.c b/src/kernel/core/syscalls.c
index f7cdad5e7a..372ffedab3 100644
--- a/src/kernel/core/syscalls.c
+++ b/src/kernel/core/syscalls.c
@@ -17,7 +17,7 @@
 #include <sem.h>
 #include <port.h>
 #include <cpu.h>
-#include <arch/cpu.h>
+#include <arch_config.h>
 #include <sys/resource.h>
 #include <fd.h>
 #include <fs/node_monitor.h>
diff --git a/src/kernel/libroot/os/atomic.c b/src/kernel/libroot/os/atomic.c
index 9492de668d..b87406f65e 100644
--- a/src/kernel/libroot/os/atomic.c
+++ b/src/kernel/libroot/os/atomic.c
@@ -1,14 +1,17 @@
 /* 
 ** Copyright 2003, Marcus Overhagen. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
+** Distributed under the terms of the Haiku License.
 */
 
+
 #include <SupportDefs.h>
 
-#include <arch_cpu.h>
+#include <arch_config.h>
 #include <syscalls.h>
 
+
 #ifdef ATOMIC_FUNCS_ARE_SYSCALLS
+
 int32
 atomic_set(vint32 *value, int32 newValue)
 {
@@ -44,9 +47,11 @@ atomic_get(vint32 *value)
 {
 	return _kern_atomic_get(value);
 }
-#endif
+
+#endif	/* ATOMIC_FUNCS_ARE_SYSCALLS */
 
 #ifdef ATOMIC64_FUNCS_ARE_SYSCALLS
+
 int64
 atomic_set64(vint64 *value, int64 newValue)
 {
@@ -82,4 +87,5 @@ atomic_get64(vint64 *value)
 {
 	return _kern_atomic_get64(value);
 }
-#endif
+
+#endif	/* ATOMIC64_FUNCS_ARE_SYSCALLS */