diff --git a/src/kernel/core/arch/x86/arch_debug.c b/src/kernel/core/arch/x86/arch_debug.c
index 21c58438c7..e6156b3911 100755
--- a/src/kernel/core/arch/x86/arch_debug.c
+++ b/src/kernel/core/arch/x86/arch_debug.c
@@ -1,12 +1,13 @@
-/* 
-** Copyright 2002-2004, The Haiku Team. 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.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2001, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
 
-#include <Errors.h>
+
+#include <kernel.h>
 #include <debug.h>
 #include <thread.h>
 #include <elf.h>
diff --git a/src/kernel/core/arch/x86/arch_thread.c b/src/kernel/core/arch/x86/arch_thread.c
index 5cdf3aaf99..a26706ffeb 100755
--- a/src/kernel/core/arch/x86/arch_thread.c
+++ b/src/kernel/core/arch/x86/arch_thread.c
@@ -10,7 +10,10 @@
 #include <thread.h>
 #include <arch/thread.h>
 #include <arch_cpu.h>
+#include <kernel.h>
+#include <debug.h>
 #include <int.h>
+#include <vm.h>
 #include <tls.h>
 
 #include <string.h>