Force includes to use absolute paths.

mentos/src/klib/assert.c

@@ -6,7 +6,7 @@
 
 #include "assert.h"
 #include "stdio.h"
-#include "panic.h"
+#include "system/panic.h"
 
 void __assert_fail(const char *assertion, const char *file, const char *function, unsigned int line)
 {

mentos/src/klib/hashmap.c

@@ -4,10 +4,10 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "hashmap.h"
+#include "klib/hashmap.h"
 #include "assert.h"
 #include "string.h"
-#include "slab.h"
+#include "mem/slab.h"
 
 /// @brief Stores information of an entry of the hashmap.
 struct hashmap_entry_t {

mentos/src/klib/libgen.c

@@ -4,13 +4,13 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "syscall.h"
+#include "system/syscall.h"
 #include "libgen.h"
 #include "string.h"
-#include "initrd.h"
+#include "fs/initrd.h"
 #include "limits.h"
 #include "assert.h"
-#include "paging.h"
+#include "mem/paging.h"
 
 int parse_path(char *out, char **cur, char sep, size_t max)
 {

mentos/src/klib/list.c

@@ -4,10 +4,10 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "list.h"
+#include "klib/list.h"
 #include "assert.h"
 #include "string.h"
-#include "slab.h"
+#include "mem/slab.h"
 
 static inline listnode_t *__node_alloc()
 {

mentos/src/klib/mutex.c

@@ -4,8 +4,8 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "mutex.h"
-#include "debug.h"
+#include "klib/mutex.h"
+#include "misc/debug.h"
 
 void mutex_lock(mutex_t *mutex, uint32_t owner)
 {

mentos/src/klib/ndtree.c

@@ -4,11 +4,11 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "debug.h"
-#include "ndtree.h"
+#include "misc/debug.h"
+#include "klib/ndtree.h"
 #include "assert.h"
-#include "list_head.h"
-#include "slab.h"
+#include "klib/list_head.h"
+#include "mem/slab.h"
 
 // ============================================================================
 // Tree types.

mentos/src/klib/rbtree.c

@@ -4,11 +4,11 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "rbtree.h"
+#include "klib/rbtree.h"
 
 #include "assert.h"
-#include "debug.h"
-#include "slab.h"
+#include "misc/debug.h"
+#include "mem/slab.h"
 
 /// @brief Stores information of a node.
 struct rbtree_node_t {

mentos/src/klib/spinlock.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "spinlock.h"
+#include "klib/spinlock.h"
 
 void spinlock_init(spinlock_t *spinlock)
 {

mentos/src/klib/string.c

@@ -4,7 +4,7 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "kheap.h"
+#include "mem/kheap.h"
 #include "stdio.h"
 #include "fcntl.h"
 #include "string.h"

mentos/src/klib/time.c

@@ -4,13 +4,13 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "debug.h"
+#include "misc/debug.h"
 #include "time.h"
 #include "stdio.h"
 #include "stddef.h"
-#include "port_io.h"
-#include "timer.h"
-#include "rtc.h"
+#include "io/port_io.h"
+#include "hardware/timer.h"
+#include "drivers/rtc.h"
 
 static const char *str_weekdays[] = { "Sunday", "Monday", "Tuesday", "Wednesday",
                                       "Thursday", "Friday", "Saturday" };

mentos/src/klib/vscanf.c

@@ -4,10 +4,10 @@
 /// @copyright (c) 2014-2021 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "vfs.h"
+#include "fs/vfs.h"
 #include "ctype.h"
 #include "string.h"
-#include "debug.h"
+#include "misc/debug.h"
 #include "stdio.h"
 
 static int vsscanf(const char *buf, const char *s, va_list ap)

mentos/src/klib/vsprintf.c

@@ -11,7 +11,7 @@
 #include "stdbool.h"
 #include "stdint.h"
 #include "stdio.h"
-#include "video.h"
+#include "io/video.h"
 #include "fcvt.h"
 
 /// Size of the buffer used to call cvt functions.