diff --git a/src/kernel/core/cpu.c b/src/kernel/core/cpu.c
index 1a87677999..e49a28f5ca 100644
--- a/src/kernel/core/cpu.c
+++ b/src/kernel/core/cpu.c
@@ -1,10 +1,10 @@
 /*
-** Copyright 2002-2004, The Haiku Team. All rights reserved.
-** Distributed under the terms of the Haiku License.
-**
-** Copyright 2002, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+ * Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2002, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
 
 /* This file contains the cpu functions (init, etc). */
 
diff --git a/src/kernel/core/elf.c b/src/kernel/core/elf.c
index 7d6847ff16..4ccf13e369 100644
--- a/src/kernel/core/elf.c
+++ b/src/kernel/core/elf.c
@@ -894,7 +894,7 @@ elf_lookup_symbol_address(addr_t address, addr_t *_baseAddress, const char **_sy
 	TRACE(("looking up %p\n", (void *)address));
 
 	mutex_lock(&sImageMutex);
-	
+
 	image = find_image_at_address(address);
 		// get image that may contain the address
 
diff --git a/src/kernel/core/image.c b/src/kernel/core/image.c
index eb186c38cb..8ae6c4321c 100644
--- a/src/kernel/core/image.c
+++ b/src/kernel/core/image.c
@@ -1,12 +1,15 @@
-/* User Runtime Loader support in the kernel
-** 
-** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the Haiku License.
-*/
+/*
+ * Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+/* User Runtime Loader support in the kernel */
 
 
 #include <KernelExport.h>
+#include <kernel.h>
 #include <kimage.h>
+#include <lock.h>
 #include <thread.h>
 #include <team.h>
 
diff --git a/src/kernel/core/module.c b/src/kernel/core/module.c
index a64e12330e..106331fd2f 100644
--- a/src/kernel/core/module.c
+++ b/src/kernel/core/module.c
@@ -13,6 +13,7 @@
 #include <lock.h>
 #include <khash.h>
 #include <elf.h>
+#include <vfs.h>
 #include <boot/elf.h>
 
 #include <sys/stat.h>
diff --git a/src/kernel/core/port.c b/src/kernel/core/port.c
index 5c2d5b213b..a811013d00 100644
--- a/src/kernel/core/port.c
+++ b/src/kernel/core/port.c
@@ -12,6 +12,7 @@
 #include <OS.h>
 
 #include <port.h>
+#include <kernel.h>
 #include <sem.h>
 #include <team.h>
 #include <util/list.h>
diff --git a/src/kernel/core/real_time_clock.c b/src/kernel/core/real_time_clock.c
index e426f47996..b59ae135a8 100644
--- a/src/kernel/core/real_time_clock.c
+++ b/src/kernel/core/real_time_clock.c
@@ -11,7 +11,6 @@
 #include <arch/real_time_clock.h>
 #include <real_time_clock.h>
 #include <real_time_data.h>
-#include <vm_types.h>
 
 #include <stdlib.h>
 
diff --git a/src/kernel/core/scheduler.c b/src/kernel/core/scheduler.c
index 4964c001d6..6f3c210182 100644
--- a/src/kernel/core/scheduler.c
+++ b/src/kernel/core/scheduler.c
@@ -1,13 +1,15 @@
 /*
-** Copyright 2002-2004, The Haiku Team. All rights reserved.
-** Distributed under the terms of the Haiku License.
-**
-** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+ * Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002, Angelo Mottola, a.mottola@libero.it.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
  
 /* The thread scheduler */
 
+
 #include <OS.h>
 
 #include <thread.h>
@@ -16,6 +18,7 @@
 #include <smp.h>
 #include <cpu.h>
 #include <khash.h>
+#include <debug.h>
 
 
 //#define TRACE_SCHEDULER
diff --git a/src/kernel/core/sem.c b/src/kernel/core/sem.c
index a92d0975be..152eeab346 100644
--- a/src/kernel/core/sem.c
+++ b/src/kernel/core/sem.c
@@ -1,16 +1,18 @@
 /*
-** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the Haiku License.
-**
-** Copyright 2001, Travis Geiselbrecht. All rights reserved.
-** Distributed under the terms of the NewOS License.
-*/
+ * Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2001, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
 
 /* Semaphore code */
 
+
 #include <OS.h>
 
 #include <sem.h>
+#include <kernel.h>
 #include <smp.h>
 #include <int.h>
 #include <arch/int.h>
@@ -22,8 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define TRACE_SEM 0
-#if TRACE_SEM
+//#define TRACE_SEM
+#ifdef TRACE_SEM
 #	define TRACE(x) dprintf x
 #	define TRACE_BLOCK(x) dprintf x
 #else
diff --git a/src/kernel/core/syscalls.c b/src/kernel/core/syscalls.c
index 57b2c53fe6..2d932eaee8 100644
--- a/src/kernel/core/syscalls.c
+++ b/src/kernel/core/syscalls.c
@@ -11,8 +11,8 @@
 #include <int.h>
 #include <debug.h>
 #include <vfs.h>
+#include <vm.h>
 #include <thread.h>
-#include <OS.h>
 #include <sem.h>
 #include <port.h>
 #include <cpu.h>
diff --git a/src/kernel/core/team.c b/src/kernel/core/team.c
index 91ac8e79bc..7b77c001ec 100644
--- a/src/kernel/core/team.c
+++ b/src/kernel/core/team.c
@@ -21,6 +21,10 @@
 #include <syscalls.h>
 #include <syscall_process_info.h>
 #include <tls.h>
+#include <defines.h>
+#include <kernel.h>
+#include <vm.h>
+#include <vfs.h>
 
 #include <sys/wait.h>
 #include <string.h>
diff --git a/src/kernel/core/thread.c b/src/kernel/core/thread.c
index e32b4f2d15..f7bd9911cc 100644
--- a/src/kernel/core/thread.c
+++ b/src/kernel/core/thread.c
@@ -23,6 +23,7 @@
 #include <ksignal.h>
 #include <syscalls.h>
 #include <tls.h>
+#include <vfs.h>
 
 #include <sys/resource.h>
 #include <string.h>