diff --git a/headers/private/kernel/arch/cpu.h b/headers/private/kernel/arch/cpu.h
index 3bb4060d44..4bc77487c7 100644
--- a/headers/private/kernel/arch/cpu.h
+++ b/headers/private/kernel/arch/cpu.h
@@ -10,20 +10,23 @@
 
 
 #include <OS.h>
-#include <boot/kernel_args.h>
 
 
 #define PAGE_ALIGN(x) (((x) + (B_PAGE_SIZE - 1)) & ~(B_PAGE_SIZE - 1))
 
+
+struct kernel_args;
+
+
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
-status_t arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu);
-status_t arch_cpu_init(kernel_args *args);
-status_t arch_cpu_init_percpu(kernel_args *args, int curr_cpu);
-status_t arch_cpu_init_post_vm(kernel_args *args);
-status_t arch_cpu_init_post_modules(kernel_args *args);
+status_t arch_cpu_preboot_init_percpu(struct kernel_args *args, int curr_cpu);
+status_t arch_cpu_init(struct kernel_args *args);
+status_t arch_cpu_init_percpu(struct kernel_args *args, int curr_cpu);
+status_t arch_cpu_init_post_vm(struct kernel_args *args);
+status_t arch_cpu_init_post_modules(struct kernel_args *args);
 status_t arch_cpu_shutdown(bool reboot);
 
 void arch_cpu_invalidate_TLB_range(addr_t start, addr_t end);
@@ -47,7 +50,7 @@ void arch_cpu_memory_write_barrier(void);
 
 #ifdef __cplusplus
 }
-#endif 
+#endif
 
 #include <arch_cpu.h>
 
diff --git a/headers/private/kernel/arch/int.h b/headers/private/kernel/arch/int.h
index 0af0039a6f..9ebe6b0717 100644
--- a/headers/private/kernel/arch/int.h
+++ b/headers/private/kernel/arch/int.h
@@ -24,7 +24,7 @@ struct kernel_args;
 
 status_t arch_int_init(struct kernel_args* args);
 status_t arch_int_init_post_vm(struct kernel_args* args);
-status_t arch_int_init_io(kernel_args* args);
+status_t arch_int_init_io(struct kernel_args* args);
 status_t arch_int_init_post_device_manager(struct kernel_args* args);
 
 void arch_int_enable_interrupts(void);
diff --git a/headers/private/kernel/cpu.h b/headers/private/kernel/cpu.h
index 6e9e5422c3..acb293e422 100644
--- a/headers/private/kernel/cpu.h
+++ b/headers/private/kernel/cpu.h
@@ -13,7 +13,6 @@
 
 #include <smp.h>
 #include <timer.h>
-#include <boot/kernel_args.h>
 #include <arch/cpu.h>
 
 
@@ -23,6 +22,7 @@
 #endif
 
 
+struct kernel_args;
 struct thread;
 
 
@@ -55,7 +55,8 @@ typedef struct cpu_ent {
 } cpu_ent __attribute__((aligned(64)));
 
 
-extern cpu_ent gCPU[MAX_BOOT_CPUS];
+//extern cpu_ent gCPU[MAX_BOOT_CPUS];
+extern cpu_ent gCPU[];
 
 
 #ifdef __cplusplus
@@ -64,7 +65,7 @@ extern "C" {
 
 status_t cpu_preboot_init_percpu(struct kernel_args *args, int curr_cpu);
 status_t cpu_init(struct kernel_args *args);
-status_t cpu_init_percpu(kernel_args *ka, int curr_cpu);
+status_t cpu_init_percpu(struct kernel_args *ka, int curr_cpu);
 status_t cpu_init_post_vm(struct kernel_args *args);
 status_t cpu_init_post_modules(struct kernel_args *args);
 bigtime_t cpu_get_active_time(int32 cpu);
diff --git a/headers/private/kernel/int.h b/headers/private/kernel/int.h
index c43ed84054..8fe8fd59d7 100644
--- a/headers/private/kernel/int.h
+++ b/headers/private/kernel/int.h
@@ -25,7 +25,7 @@ extern "C" {
 
 status_t int_init(struct kernel_args* args);
 status_t int_init_post_vm(struct kernel_args* args);
-status_t int_init_io(kernel_args* args);
+status_t int_init_io(struct kernel_args* args);
 status_t int_init_post_device_manager(struct kernel_args* args);
 int int_io_interrupt_handler(int vector, bool levelTriggered);
 
diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
index cb19c1fd0f..854d0f183f 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
@@ -21,7 +21,6 @@
 #include <AutoDeleter.h>
 
 #include <Notifications.h>
-#include <util/KMessage.h>
 
 #include "ErrorOutput.h"
 #include "FDCloser.h"
diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.h b/src/add-ons/kernel/file_systems/packagefs/Volume.h
index 169e143383..51bacff925 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Volume.h
+++ b/src/add-ons/kernel/file_systems/packagefs/Volume.h
@@ -12,6 +12,7 @@
 #include <lock.h>
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
+#include <util/KMessage.h>
 
 #include "Node.h"
 #include "PackageDomain.h"
diff --git a/src/system/kernel/arch/ppc/arch_real_time_clock.cpp b/src/system/kernel/arch/ppc/arch_real_time_clock.cpp
index a16f346895..85ec57bb1e 100644
--- a/src/system/kernel/arch/ppc/arch_real_time_clock.cpp
+++ b/src/system/kernel/arch/ppc/arch_real_time_clock.cpp
@@ -6,6 +6,7 @@
 #include <arch/real_time_clock.h>
 
 #include <arch_platform.h>
+#include <boot/kernel_args.h>
 #include <real_time_data.h>
 #include <smp.h>
 
diff --git a/src/system/kernel/arch/x86/arch_debug.cpp b/src/system/kernel/arch/x86/arch_debug.cpp
index d240a42ce3..476e5ba61a 100644
--- a/src/system/kernel/arch/x86/arch_debug.cpp
+++ b/src/system/kernel/arch/x86/arch_debug.cpp
@@ -13,6 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <TypeConstants.h>
+
 #include <cpu.h>
 #include <debug.h>
 #include <debug_heap.h>
diff --git a/src/system/kernel/arch/x86/arch_vm.cpp b/src/system/kernel/arch/x86/arch_vm.cpp
index 9f389aa14c..51715ecadd 100644
--- a/src/system/kernel/arch/x86/arch_vm.cpp
+++ b/src/system/kernel/arch/x86/arch_vm.cpp
@@ -17,6 +17,7 @@
 
 #include <KernelExport.h>
 
+#include <boot/kernel_args.h>
 #include <smp.h>
 #include <util/AutoLock.h>
 #include <vm/vm.h>
diff --git a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
index e46df82117..aa20762e29 100644
--- a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
+++ b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
@@ -10,6 +10,8 @@
 
 #include <arch/vm_translation_map.h>
 
+#include <boot/kernel_args.h>
+
 #include "paging/32bit/X86PagingMethod32Bit.h"
 #include "paging/pae/X86PagingMethodPAE.h"
 
diff --git a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
index b18364ae5c..97e2ee1261 100644
--- a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
+++ b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
@@ -16,6 +16,7 @@
 #include <AutoDeleter.h>
 
 #include <arch_system_info.h>
+#include <boot/kernel_args.h>
 #include <int.h>
 #include <thread.h>
 #include <vm/vm.h>
diff --git a/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp
index 114535015b..4ca19ba6d9 100644
--- a/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp
+++ b/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp
@@ -15,6 +15,7 @@
 
 #include <AutoDeleter.h>
 
+#include <boot/kernel_args.h>
 #include <util/AutoLock.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp
index 9be80c70c5..96cdfc6762 100644
--- a/src/system/kernel/debug/debug.cpp
+++ b/src/system/kernel/debug/debug.cpp
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 
+#include <boot/kernel_args.h>
 #include <cpu.h>
 #include <debug.h>
 #include <debug_heap.h>
diff --git a/src/system/kernel/device_manager/legacy_drivers.cpp b/src/system/kernel/device_manager/legacy_drivers.cpp
index ca53196ddc..deee432ca7 100644
--- a/src/system/kernel/device_manager/legacy_drivers.cpp
+++ b/src/system/kernel/device_manager/legacy_drivers.cpp
@@ -16,6 +16,7 @@
 #include <NodeMonitor.h>
 
 #include <boot_device.h>
+#include <boot/kernel_args.h>
 #include <elf.h>
 #include <fs/devfs.h>
 #include <fs/KPath.h>
@@ -714,7 +715,7 @@ handle_driver_events(void */*_fs*/, int /*iteration*/)
 					driver->binary_updated = true;
 				break;
 			}
-			
+
 			case kRemoveDriver:
 			{
 				// Mark removed drivers as updated
diff --git a/src/system/kernel/elf.cpp b/src/system/kernel/elf.cpp
index b7f5bb602f..faac374f68 100644
--- a/src/system/kernel/elf.cpp
+++ b/src/system/kernel/elf.cpp
@@ -20,6 +20,7 @@
 #include <ctype.h>
 
 #include <AutoDeleter.h>
+#include <boot/kernel_args.h>
 #include <debug.h>
 #include <image_defs.h>
 #include <kernel.h>
diff --git a/src/system/kernel/module.cpp b/src/system/kernel/module.cpp
index 53523bddad..7a02d10af2 100644
--- a/src/system/kernel/module.cpp
+++ b/src/system/kernel/module.cpp
@@ -22,6 +22,7 @@
 
 #include <boot_device.h>
 #include <boot/elf.h>
+#include <boot/kernel_args.h>
 #include <elf.h>
 #include <fs/KPath.h>
 #include <fs/node_monitor.h>
diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp
index 2d538f31fd..5926124b60 100644
--- a/src/system/kernel/smp.cpp
+++ b/src/system/kernel/smp.cpp
@@ -20,6 +20,7 @@
 #include <arch/debug.h>
 #include <arch/int.h>
 #include <arch/smp.h>
+#include <boot/kernel_args.h>
 #include <cpu.h>
 #include <generic_syscall.h>
 #include <int.h>
diff --git a/src/tools/gensyscalls/gensyscalls.cpp b/src/tools/gensyscalls/gensyscalls.cpp
index 0a11045a10..340c0a5a1e 100644
--- a/src/tools/gensyscalls/gensyscalls.cpp
+++ b/src/tools/gensyscalls/gensyscalls.cpp
@@ -420,6 +420,10 @@ public:
 		file << "#ifndef _ASSEMBLER" << endl;
 		file << endl;
 
+		// includes
+		file << "#include <TypeConstants.h>" << endl;
+		file << endl;
+
 		// output syscall count
 		file << "const int kSyscallCount = SYSCALL_COUNT;" << endl;
 		file << endl;