Rename & cleanup.

4 files changed, 6 insertions, 5 deletions

diff --git a/src/kernel/include/ipc.h b/src/kernel/include/ipc.h
index 0feddf2..05d14a8 100644
--- a/src/kernel/include/ipc.h
+++ b/src/kernel/include/ipc.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <token.h>
+#include <proto/token.h>
+
 #include <vfs.h>
 
 //  ---- Communication channels
diff --git a/src/kernel/include/process.h b/src/kernel/include/process.h
index 3b98451..d4fcfc3 100644
--- a/src/kernel/include/process.h
+++ b/src/kernel/include/process.h
@@ -17,8 +17,8 @@
 #include <vfs.h>
 #include <pager.h>
 
-#include <mmap.h>	// common header for mmaps
-#include <proc.h> 	// common header defining process statuses
+#include <proto/mmap.h>
+#include <proto/proc.h>
 
 #define USERSTACK_ADDR	0xB8000000
 #define USERSTACK_SIZE	0x00020000		// 32 KB - it is allocated on demand so no worries
diff --git a/src/kernel/include/sct.h b/src/kernel/include/sct.h
index 2d6acd5..8f675b1 100644
--- a/src/kernel/include/sct.h
+++ b/src/kernel/include/sct.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <idt.h>
-#include <syscallproto.h>
+#include <proto/syscall.h>
 
 void setup_syscall_table();
 
diff --git a/src/kernel/include/vfs.h b/src/kernel/include/vfs.h
index 3d225c5..c22ec9a 100644
--- a/src/kernel/include/vfs.h
+++ b/src/kernel/include/vfs.h
@@ -6,7 +6,7 @@
 #include <hashtbl.h>
 #include <mutex.h>
 
-#include <fs.h> 		// common header
+#include <proto/fs.h>
 
 #include <pager.h>