diff --git a/kernel/arch/i386/apic.c b/kernel/arch/i386/apic.c
index 54680df30..3fd7e68bf 100644
--- a/kernel/arch/i386/apic.c
+++ b/kernel/arch/i386/apic.c
@@ -12,7 +12,7 @@
 
 #include "kernel/proc.h"
 #include "kernel/glo.h"
-#include "proto.h"
+#include "arch_proto.h"
 
 #include <minix/u64.h>
 
diff --git a/kernel/arch/i386/arch_do_vmctl.c b/kernel/arch/i386/arch_do_vmctl.c
index 8a573e3a5..6556fae82 100644
--- a/kernel/arch/i386/arch_do_vmctl.c
+++ b/kernel/arch/i386/arch_do_vmctl.c
@@ -10,7 +10,7 @@
 #include "kernel/system.h"
 #include <minix/type.h>
 
-#include "proto.h"
+#include "arch_proto.h"
 
 /*===========================================================================*
  *				arch_do_vmctl				     *
diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index 438791d2d..5189f6e5b 100644
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -17,7 +17,7 @@
 #include <sys/sigcontext.h>
 
 #include "archconst.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include "serial.h"
 #include "oxpcie.h"
 #include "kernel/proc.h"
diff --git a/kernel/arch/i386/arch_watchdog.c b/kernel/arch/i386/arch_watchdog.c
index 08557bbd2..6becd4f69 100644
--- a/kernel/arch/i386/arch_watchdog.c
+++ b/kernel/arch/i386/arch_watchdog.c
@@ -1,6 +1,6 @@
 #include "kernel/kernel.h"
 #include "kernel/watchdog.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include <minix/minlib.h>
 #include <minix/u64.h>
 
diff --git a/kernel/arch/i386/breakpoints.c b/kernel/arch/i386/breakpoints.c
index 4a4af8d77..a16bd9429 100644
--- a/kernel/arch/i386/breakpoints.c
+++ b/kernel/arch/i386/breakpoints.c
@@ -1,5 +1,5 @@
 #include "kernel/kernel.h"
-#include "proto.h"
+#include "arch_proto.h"
 
 #include "debugreg.h"
 
diff --git a/kernel/arch/i386/do_int86.c b/kernel/arch/i386/do_int86.c
index 261875786..84021cbed 100644
--- a/kernel/arch/i386/do_int86.c
+++ b/kernel/arch/i386/do_int86.c
@@ -10,7 +10,7 @@
 #include <minix/endpoint.h>
 #include <machine/int86.h>
 
-#include "proto.h"
+#include "arch_proto.h"
 
 struct reg86u reg86;
 
diff --git a/kernel/arch/i386/do_iopenable.c b/kernel/arch/i386/do_iopenable.c
index ae79c68b2..083198702 100644
--- a/kernel/arch/i386/do_iopenable.c
+++ b/kernel/arch/i386/do_iopenable.c
@@ -12,7 +12,7 @@
 #include "kernel/kernel.h"
 #include <minix/endpoint.h>
 
-#include "proto.h"
+#include "arch_proto.h"
 
 /*===========================================================================*
  *			        do_iopenable				     *
diff --git a/kernel/arch/i386/do_sdevio.c b/kernel/arch/i386/do_sdevio.c
index 77e3d962d..f141a9c2b 100644
--- a/kernel/arch/i386/do_sdevio.c
+++ b/kernel/arch/i386/do_sdevio.c
@@ -14,7 +14,7 @@
 #include <minix/devio.h>
 #include <minix/endpoint.h>
 
-#include "proto.h"
+#include "arch_proto.h"
 
 #if USE_SDEVIO
 
diff --git a/kernel/arch/i386/exception.c b/kernel/arch/i386/exception.c
index e623185bb..42862a39d 100644
--- a/kernel/arch/i386/exception.c
+++ b/kernel/arch/i386/exception.c
@@ -4,7 +4,7 @@
  */
 
 #include "kernel/kernel.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include <signal.h>
 #include <string.h>
 #include <assert.h>
diff --git a/kernel/arch/i386/i8259.c b/kernel/arch/i386/i8259.c
index c76d68468..0cdd2f6cb 100644
--- a/kernel/arch/i386/i8259.c
+++ b/kernel/arch/i386/i8259.c
@@ -7,7 +7,7 @@
 
 #include "kernel/kernel.h"
 #include "kernel/proc.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include <minix/portio.h>
 #include <machine/cpu.h>
 
diff --git a/kernel/arch/i386/proto.h b/kernel/arch/i386/include/arch_proto.h
similarity index 100%
rename from kernel/arch/i386/proto.h
rename to kernel/arch/i386/include/arch_proto.h
diff --git a/kernel/arch/i386/memory.c b/kernel/arch/i386/memory.c
index 0feca6814..6d1394cae 100644
--- a/kernel/arch/i386/memory.c
+++ b/kernel/arch/i386/memory.c
@@ -16,7 +16,7 @@
 #include <machine/vm.h>
 
 #include "oxpcie.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include "kernel/proto.h"
 #include "kernel/debug.h"
 
diff --git a/kernel/arch/i386/pre_init.c b/kernel/arch/i386/pre_init.c
index e1197b0b0..feecf95c9 100644
--- a/kernel/arch/i386/pre_init.c
+++ b/kernel/arch/i386/pre_init.c
@@ -15,7 +15,7 @@
 #include <machine/partition.h>
 #include "../../../boot/image.h"
 #include "string.h"
-#include "proto.h"
+#include "arch_proto.h"
 #include "multiboot.h"
 
 /* Granularity used in image file and copying */
diff --git a/kernel/arch/i386/protect.c b/kernel/arch/i386/protect.c
index da9f0fa54..c752e6a3b 100644
--- a/kernel/arch/i386/protect.c
+++ b/kernel/arch/i386/protect.c
@@ -7,7 +7,7 @@
 #include "kernel/proc.h"
 #include "archconst.h"
 
-#include "proto.h"
+#include "arch_proto.h"
 
 #define INT_GATE_TYPE	(INT_286_GATE | DESC_386_BIT)
 #define TSS_TYPE	(AVL_286_TSS  | DESC_386_BIT)