17 files changed, 42 insertions, 30 deletions

diff --git a/arch/x86/machine/acpimp.c b/arch/x86/machine/acpimp.c
index ef93bc43..2c3dc6c2 100644
--- a/arch/x86/machine/acpimp.c
+++ b/arch/x86/machine/acpimp.c
@@ -15,15 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
 #include <kern/assert.h>
 #include <kern/init.h>
 #include <kern/kmem.h>
 #include <kern/macros.h>
 #include <kern/panic.h>
 #include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
 #include <machine/acpimp.h>
 #include <machine/biosmem.h>
 #include <machine/cpu.h>
diff --git a/arch/x86/machine/atomic.h b/arch/x86/machine/atomic.h
index c990526c..b56da522 100644
--- a/arch/x86/machine/atomic.h
+++ b/arch/x86/machine/atomic.h
@@ -23,7 +23,7 @@
 #ifndef _X86_ATOMIC_H
 #define _X86_ATOMIC_H
 
-#include <kern/stdint.h>
+#include <stdint.h>
 
 #define ATOMIC_ADD(ptr, delta)      \
     asm volatile("lock add %1, %0"  \
diff --git a/arch/x86/machine/biosmem.c b/arch/x86/machine/biosmem.c
index 6e6410cf..4208b72b 100644
--- a/arch/x86/machine/biosmem.c
+++ b/arch/x86/machine/biosmem.c
@@ -16,6 +16,9 @@
  */
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
 #include <kern/assert.h>
 #include <kern/init.h>
@@ -23,9 +26,6 @@
 #include <kern/panic.h>
 #include <kern/param.h>
 #include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
 #include <machine/biosmem.h>
 #include <machine/boot.h>
 #include <machine/cpu.h>
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index a3fd3146..2ab1c6d5 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -43,6 +43,9 @@
  */
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
 #include <kern/evcnt.h>
 #include <kern/init.h>
@@ -54,9 +57,6 @@
 #include <kern/percpu.h>
 #include <kern/printk.h>
 #include <kern/sref.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
 #include <kern/thread.h>
 #include <machine/biosmem.h>
 #include <machine/boot.h>
diff --git a/arch/x86/machine/cga.c b/arch/x86/machine/cga.c
index 1ab23582..c926ec3d 100644
--- a/arch/x86/machine/cga.c
+++ b/arch/x86/machine/cga.c
@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <string.h>
+
 #include <kern/init.h>
 #include <kern/macros.h>
 #include <kern/param.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
 #include <machine/io.h>
 #include <machine/cga.h>
 #include <vm/vm_page.h>
diff --git a/arch/x86/machine/cga.h b/arch/x86/machine/cga.h
index 0486fd96..2dc12cf4 100644
--- a/arch/x86/machine/cga.h
+++ b/arch/x86/machine/cga.h
@@ -21,7 +21,7 @@
 #ifndef _X86_CGA_H
 #define _X86_CGA_H
 
-#include <kern/stdint.h>
+#include <stdint.h>
 
 /*
  * Initialize the cga module.
diff --git a/arch/x86/machine/cpu.c b/arch/x86/machine/cpu.c
index 5fc21315..19282121 100644
--- a/arch/x86/machine/cpu.c
+++ b/arch/x86/machine/cpu.c
@@ -15,6 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
 #include <kern/assert.h>
 #include <kern/init.h>
 #include <kern/macros.h>
@@ -22,9 +26,6 @@
 #include <kern/param.h>
 #include <kern/percpu.h>
 #include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
-#include <kern/string.h>
 #include <kern/thread.h>
 #include <kern/xcall.h>
 #include <machine/acpimp.h>
diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h
index a18712c8..862799e8 100644
--- a/arch/x86/machine/cpu.h
+++ b/arch/x86/machine/cpu.h
@@ -95,9 +95,10 @@
 
 #ifndef __ASSEMBLER__
 
+#include <stdint.h>
+
 #include <kern/macros.h>
 #include <kern/percpu.h>
-#include <kern/stdint.h>
 #include <machine/lapic.h>
 #include <machine/pit.h>
 
diff --git a/arch/x86/machine/io.h b/arch/x86/machine/io.h
index 6b10f0eb..fb566b95 100644
--- a/arch/x86/machine/io.h
+++ b/arch/x86/machine/io.h
@@ -18,7 +18,7 @@
 #ifndef _X86_IO_H
 #define _X86_IO_H
 
-#include <kern/stdint.h>
+#include <stdint.h>
 
 /*
  * Read a byte from an I/O port.
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c
index 26b0dd50..c0d10e5c 100644
--- a/arch/x86/machine/lapic.c
+++ b/arch/x86/machine/lapic.c
@@ -15,13 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <kern/init.h>
 #include <kern/macros.h>
 #include <kern/panic.h>
 #include <kern/param.h>
 #include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/stdint.h>
 #include <kern/thread.h>
 #include <machine/cpu.h>
 #include <machine/lapic.h>
diff --git a/arch/x86/machine/lapic.h b/arch/x86/machine/lapic.h
index 8c87adc6..802d1251 100644
--- a/arch/x86/machine/lapic.h
+++ b/arch/x86/machine/lapic.h
@@ -18,7 +18,8 @@
 #ifndef _X86_LAPIC_H
 #define _X86_LAPIC_H
 
-#include <kern/stdint.h>
+#include <stdint.h>
+
 #include <machine/trap.h>
 
 /*
diff --git a/arch/x86/machine/multiboot.h b/arch/x86/machine/multiboot.h
index 4a0502c8..02c8a330 100644
--- a/arch/x86/machine/multiboot.h
+++ b/arch/x86/machine/multiboot.h
@@ -46,8 +46,9 @@
 
 #ifndef __ASSEMBLER__
 
+#include <stdint.h>
+
 #include <kern/macros.h>
-#include <kern/stdint.h>
 
 /*
  * A multiboot module.
diff --git a/arch/x86/machine/pic.c b/arch/x86/machine/pic.c
index 440ca3a7..db26a166 100644
--- a/arch/x86/machine/pic.c
+++ b/arch/x86/machine/pic.c
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+
 #include <kern/assert.h>
 #include <kern/init.h>
 #include <kern/panic.h>
-#include <kern/stdint.h>
 #include <machine/io.h>
 #include <machine/cpu.h>
 #include <machine/pic.h>
diff --git a/arch/x86/machine/pmap.c b/arch/x86/machine/pmap.c
index ea49856e..7cf50866 100644
--- a/arch/x86/machine/pmap.c
+++ b/arch/x86/machine/pmap.c
@@ -18,6 +18,9 @@
  * TODO Review locking.
  */
 
+#include <stddef.h>
+#include <string.h>
+
 #include <kern/assert.h>
 #include <kern/condition.h>
 #include <kern/cpumap.h>
@@ -33,8 +36,6 @@
 #include <kern/percpu.h>
 #include <kern/spinlock.h>
 #include <kern/sprintf.h>
-#include <kern/stddef.h>
-#include <kern/string.h>
 #include <kern/thread.h>
 #include <machine/biosmem.h>
 #include <machine/boot.h>
diff --git a/arch/x86/machine/pmap.h b/arch/x86/machine/pmap.h
index 1806a6fb..4fdda23f 100644
--- a/arch/x86/machine/pmap.h
+++ b/arch/x86/machine/pmap.h
@@ -96,10 +96,11 @@
 
 #ifndef __ASSEMBLER__
 
+#include <stdint.h>
+
 #include <kern/cpumap.h>
 #include <kern/list.h>
 #include <kern/mutex.h>
-#include <kern/stdint.h>
 #include <kern/thread.h>
 #include <machine/cpu.h>
 #include <machine/trap.h>
diff --git a/arch/x86/machine/strace.c b/arch/x86/machine/strace.c
index e65efb08..e40b3645 100644
--- a/arch/x86/machine/strace.c
+++ b/arch/x86/machine/strace.c
@@ -15,12 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
+#include <string.h>
+
 #include <kern/init.h>
 #include <kern/kmem.h>
 #include <kern/param.h>
 #include <kern/printk.h>
-#include <kern/stddef.h>
-#include <kern/string.h>
 #include <machine/elf.h>
 #include <machine/multiboot.h>
 #include <machine/pmap.h>
diff --git a/arch/x86/machine/string.c b/arch/x86/machine/string.c
index 26ce941b..cdf00e3f 100644
--- a/arch/x86/machine/string.c
+++ b/arch/x86/machine/string.c
@@ -15,9 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stddef.h>
+#include <string.h>
+
 #include <kern/param.h>
-#include <kern/stddef.h>
-#include <kern/string.h>
 
 #ifdef ARCH_STRING_MEMCPY
 void *