diff --git a/headers/private/kernel/arch/cpu.h b/headers/private/kernel/arch/cpu.h
index a1eceef7a6..79801cb7c6 100644
--- a/headers/private/kernel/arch/cpu.h
+++ b/headers/private/kernel/arch/cpu.h
@@ -2,6 +2,7 @@
 ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
+
 #ifndef _KERNEL_ARCH_CPU_H
 #define _KERNEL_ARCH_CPU_H
 
@@ -28,6 +29,7 @@ int arch_cpu_preboot_init(kernel_args *ka);
 int arch_cpu_init(kernel_args *ka);
 int arch_cpu_init2(kernel_args *ka);
 void reboot(void);
+
 #ifdef __cplusplus
 }
 #endif 
@@ -41,6 +43,8 @@ int arch_cpu_user_strcpy(char *to, const char *from, addr *fault_handler);
 int arch_cpu_user_strncpy(char *to, const char *from, size_t size, addr *fault_handler);
 int arch_cpu_user_memset(void *s, char c, size_t count, addr *fault_handler);
 
+void arch_cpu_idle(void);
+
 #include <arch_cpu.h>
 
 #endif /* _KERNEL_ARCH_CPU_H */
diff --git a/headers/private/kernel/arch/x86/stage2_priv.h b/headers/private/kernel/arch/x86/stage2_priv.h
index 817e445193..f4f2c6586f 100755
--- a/headers/private/kernel/arch/x86/stage2_priv.h
+++ b/headers/private/kernel/arch/x86/stage2_priv.h
@@ -2,20 +2,22 @@
 ** Copyright 2001, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
 */
+
 #ifndef _STAGE2_PRIV_H
 #define _STAGE2_PRIV_H
 
 #include <stage2.h>
+#include <ktypes.h>
 
 extern void _start(unsigned int mem, int in_vesa, unsigned int vesa_ptr);
 extern void clearscreen(void);
 extern void kputs(const char *str);
 extern int dprintf(const char *fmt, ...);
-extern void sleep(long long time);
-extern long long system_time(void);
+extern void sleep(uint64 time);
+extern uint64 system_time(void);
 extern void execute_n_instructions(int count);
 void system_time_setup(long a);
-long long rdtsc();
+uint64 rdtsc();
 unsigned int get_eflags(void);
 void set_eflags(unsigned int val);
 void cpuid(unsigned int selector, unsigned int *data);
@@ -37,8 +39,6 @@ void cpuid(unsigned int selector, unsigned int *data);
 #define SCREEN_HEIGHT 24
 #define ADDR_MASK 0xfffff000
 
-#define NULL ((void *)0)
-
 #define _PACKED __attribute__((packed))
 
 #define IDT_LIMIT 0x800
@@ -196,5 +196,4 @@ struct mp_ext_bus
 	char          name[6];
 };
 
-#endif
-
+#endif	/* _STAGE2_PRIV_H */
diff --git a/headers/private/kernel/defines.h b/headers/private/kernel/defines.h
index 69a9b397c5..e00f43e8e8 100755
--- a/headers/private/kernel/defines.h
+++ b/headers/private/kernel/defines.h
@@ -13,7 +13,6 @@
 #define SYS_MAX_OS_NAME_LEN   32
 
 #define SYS_THREAD_ARG_LENGTH_MAX 255
-
 #define SYS_THREAD_STRING_LENGTH_MAX 2048
 
-#endif
+#endif	/* _SYS_DEFINES_H */