Added and applied include-sorting

Worked better than I thought!

71 files changed, 179 insertions, 178 deletions

diff --git a/.clang-format b/.clang-format
index 390ea40..36ec190 100644
--- a/.clang-format
+++ b/.clang-format
@@ -499,7 +499,7 @@ PenaltyReturnTypeOnItsOwnLine: 60
 
 PointerAlignment: Right
 ReflowComments: false
-SortIncludes: false
+SortIncludes: true
 #SortUsingDeclarations: false # Unknown to clang-format-4.0
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
diff --git a/src/kernel/acpi/acpi.c b/src/kernel/acpi/acpi.c
index 2f1c29f..9feed08 100644
--- a/src/kernel/acpi/acpi.c
+++ b/src/kernel/acpi/acpi.c
@@ -1,16 +1,16 @@
 // Important specification: https://uefi.org/sites/default/files/resources/ACPI_6_2.pdf
 // HPET: https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/software-developers-hpet-spec-1-0a.pdf
 
-#include <stddef.h>
-#include <system.h>
-#include <multiboot.h>
+#include <acpi/acpi.h>
 #include <io/io.h>
 #include <lib/lib.h>
-#include <lib/stdlib.h>
 #include <lib/stdio.h>
-#include <acpi/acpi.h>
-#include <memory/paging.h>
+#include <lib/stdlib.h>
 #include <memory/alloc.h>
+#include <memory/paging.h>
+#include <multiboot.h>
+#include <stddef.h>
+#include <system.h>
 
 struct rsdt *rsdt;
 struct fadt *fadt;
diff --git a/src/kernel/acpi/acpi.h b/src/kernel/acpi/acpi.h
index d487bdd..9b64f7c 100644
--- a/src/kernel/acpi/acpi.h
+++ b/src/kernel/acpi/acpi.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_ACPI_H
 #define MELVIX_ACPI_H
 
-#include <stdint.h>
 #include <multiboot.h>
+#include <stdint.h>
 
 /**
  * Initialize the ACP interface
diff --git a/src/kernel/cmos/rtc.c b/src/kernel/cmos/rtc.c
index d6b0849..aa6d3d6 100644
--- a/src/kernel/cmos/rtc.c
+++ b/src/kernel/cmos/rtc.c
@@ -1,7 +1,7 @@
-#include <system.h>
-#include <io/io.h>
 #include <acpi/acpi.h>
+#include <io/io.h>
 #include <lib/stdio.h>
+#include <system.h>
 
 u8 second;
 u8 minute;
diff --git a/src/kernel/events/event.c b/src/kernel/events/event.c
index cfefb67..d479ab7 100644
--- a/src/kernel/events/event.c
+++ b/src/kernel/events/event.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
-#include <stddef.h>
 #include <common.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <system.h>
 
 typedef u32 (*event_func)(u8 *);
diff --git a/src/kernel/fs/ata.c b/src/kernel/fs/ata.c
index c7c7dc1..2e952a1 100644
--- a/src/kernel/fs/ata.c
+++ b/src/kernel/fs/ata.c
@@ -1,9 +1,9 @@
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
 #include <fs/ata.h>
-#include <system.h>
 #include <io/io.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
 
 static u16 sel_base_port = 0;
 static u8 sel_master_or_slave = 0;
diff --git a/src/kernel/fs/elf.c b/src/kernel/fs/elf.c
index 9a9b105..3d7fcde 100644
--- a/src/kernel/fs/elf.c
+++ b/src/kernel/fs/elf.c
@@ -1,13 +1,14 @@
-#include <stdint.h>
-#include <stddef.h>
-#include <system.h>
 #include <fs/elf.h>
+#include <fs/ext2.h>
+#include <gdt/gdt.h>
+#include <lib/lib.h>
 #include <lib/stdio.h>
+#include <lib/stdlib.h>
 #include <memory/alloc.h>
-#include <lib/lib.h>
 #include <memory/paging.h>
-#include <fs/ext2.h>
-#include <gdt/gdt.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
 #include <tasks/process.h>
 
 int is_elf(struct elf_header *header)
diff --git a/src/kernel/fs/ext2.c b/src/kernel/fs/ext2.c
index 78d1dc4..3193f87 100644
--- a/src/kernel/fs/ext2.c
+++ b/src/kernel/fs/ext2.c
@@ -1,12 +1,12 @@
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
 #include <fs/ata.h>
 #include <fs/ext2.h>
-#include <system.h>
-#include <memory/alloc.h>
 #include <lib/lib.h>
 #include <lib/stdlib.h>
+#include <memory/alloc.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
 
 static struct ext2_superblock superblock;
 static struct bgd *bgdt;
diff --git a/src/kernel/fs/ext2.h b/src/kernel/fs/ext2.h
index e5c26fe..797985a 100644
--- a/src/kernel/fs/ext2.h
+++ b/src/kernel/fs/ext2.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_EXT2_H
 #define MELVIX_EXT2_H
 
-#include <stdint.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define ROOT_INODE 2
 
diff --git a/src/kernel/fs/fs.c b/src/kernel/fs/fs.c
index a57a83e..a23b943 100644
--- a/src/kernel/fs/fs.c
+++ b/src/kernel/fs/fs.c
@@ -1,7 +1,7 @@
-#include <stdint.h>
 #include <fs/ext2.h>
-#include <system.h>
 #include <memory/alloc.h>
+#include <stdint.h>
+#include <system.h>
 
 u32 get_file_size(char *path)
 {
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index 0170f26..0e93273 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -1,8 +1,8 @@
+#include <fs/ext2.h>
 #include <fs/load.h>
-#include <system.h>
-#include <lib/stdio.h>
 #include <lib/lib.h>
-#include <fs/ext2.h>
+#include <lib/stdio.h>
+#include <system.h>
 
 void load_binaries()
 {
diff --git a/src/kernel/gdt/gdt.c b/src/kernel/gdt/gdt.c
index c6b329a..79a52a4 100644
--- a/src/kernel/gdt/gdt.c
+++ b/src/kernel/gdt/gdt.c
@@ -1,8 +1,8 @@
-#include <stdint.h>
 #include <gdt/gdt.h>
-#include <system.h>
 #include <lib/lib.h>
 #include <memory/alloc.h>
+#include <stdint.h>
+#include <system.h>
 
 struct gdt_entry {
 	u16 limit_low;
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index b2a31d7..6c80597 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -1,10 +1,10 @@
-#include <graphics/vesa.h>
 #include <fs/load.h>
-#include <system.h>
-#include <lib/stdlib.h>
+#include <graphics/vesa.h>
 #include <lib/stdio.h>
+#include <lib/stdlib.h>
 #include <memory/alloc.h>
 #include <memory/paging.h>
+#include <system.h>
 
 void vbe_error()
 {
diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c
index 41ab1bb..2ed825a 100644
--- a/src/kernel/input/ps2/keyboard.c
+++ b/src/kernel/input/ps2/keyboard.c
@@ -1,9 +1,9 @@
 #include <common.h>
 #include <events/event.h>
-#include <interrupts/interrupts.h>
-#include <io/io.h>
 #include <graphics/vesa.h>
 #include <input/input.h>
+#include <interrupts/interrupts.h>
+#include <io/io.h>
 #include <lib/string.h>
 #include <memory/alloc.h>
 
diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c
index d0a0861..f0b98df 100644
--- a/src/kernel/input/ps2/mouse.c
+++ b/src/kernel/input/ps2/mouse.c
@@ -1,10 +1,10 @@
 #include <common.h>
 #include <events/event.h>
-#include <memory/alloc.h>
+#include <graphics/vesa.h>
 #include <interrupts/interrupts.h>
 #include <io/io.h>
-#include <graphics/vesa.h>
 #include <lib/stdio.h>
+#include <memory/alloc.h>
 
 char mouse_cycle = 0;
 char mouse_byte[3];
diff --git a/src/kernel/interrupts/interrupts.h b/src/kernel/interrupts/interrupts.h
index 50fd437..12f8f0a 100644
--- a/src/kernel/interrupts/interrupts.h
+++ b/src/kernel/interrupts/interrupts.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_INTERRUPTS_H
 #define MELVIX_INTERRUPTS_H
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 /**
  * Initialize the Interrupt Descriptor Table with 256 entries
diff --git a/src/kernel/interrupts/irq.c b/src/kernel/interrupts/irq.c
index 4c34d15..7c45718 100644
--- a/src/kernel/interrupts/irq.c
+++ b/src/kernel/interrupts/irq.c
@@ -1,5 +1,5 @@
-#include <io/io.h>
 #include <interrupts/interrupts.h>
+#include <io/io.h>
 #include <system.h>
 
 extern void irq0();
diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c
index d5866f5..9222406 100644
--- a/src/kernel/interrupts/isr.c
+++ b/src/kernel/interrupts/isr.c
@@ -1,12 +1,12 @@
-#include <stdint.h>
+#include <graphics/vesa.h>
 #include <interrupts/interrupts.h>
-#include <system.h>
-#include <lib/string.h>
-#include <lib/stdio.h>
+#include <io/io.h>
 #include <lib/lib.h>
-#include <graphics/vesa.h>
+#include <lib/stdio.h>
+#include <lib/string.h>
+#include <stdint.h>
+#include <system.h>
 #include <tasks/process.h>
-#include <io/io.h>
 
 // Install ISRs in IDT
 void isrs_install()
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 44b03fb..c3ae0f3 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -1,24 +1,24 @@
-#include <multiboot.h>
-#include <graphics/vesa.h>
+#include <acpi/acpi.h>
+#include <cmos/rtc.h>
+#include <fs/ata.h>
+#include <fs/elf.h>
+#include <fs/ext2.h>
+#include <fs/load.h>
 #include <gdt/gdt.h>
+#include <graphics/vesa.h>
+#include <input/input.h>
 #include <interrupts/interrupts.h>
 #include <io/io.h>
-#include <timer/timer.h>
-#include <memory/paging.h>
-#include <input/input.h>
-#include <acpi/acpi.h>
 #include <lib/lib.h>
-#include <lib/stdlib.h>
-#include <syscall/syscall.h>
-#include <pci/pci.h>
-#include <net/network.h>
-#include <fs/load.h>
-#include <fs/elf.h>
 #include <lib/stdio.h>
-#include <fs/ata.h>
-#include <fs/ext2.h>
-#include <cmos/rtc.h>
+#include <lib/stdlib.h>
 #include <memory/alloc.h>
+#include <memory/paging.h>
+#include <multiboot.h>
+#include <net/network.h>
+#include <pci/pci.h>
+#include <syscall/syscall.h>
+#include <timer/timer.h>
 
 u32 stack_hold;
 
diff --git a/src/kernel/lib/data/list.c b/src/kernel/lib/data/list.c
index 41f812f..7ecc950 100644
--- a/src/kernel/lib/data/list.c
+++ b/src/kernel/lib/data/list.c
@@ -1,9 +1,9 @@
-#include <stdint.h>
-#include <stddef.h>
+#include <lib/data.h>
 #include <lib/lib.h>
 #include <lib/stdlib.h>
-#include <lib/data.h>
 #include <memory/alloc.h>
+#include <stddef.h>
+#include <stdint.h>
 
 struct list *list_create()
 {
diff --git a/src/kernel/lib/data/tree.c b/src/kernel/lib/data/tree.c
index 2726a11..65b8433 100644
--- a/src/kernel/lib/data/tree.c
+++ b/src/kernel/lib/data/tree.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <lib/data.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 struct tree *tree_create()
 {
diff --git a/src/kernel/lib/lib.h b/src/kernel/lib/lib.h
index 4308af4..921e575 100644
--- a/src/kernel/lib/lib.h
+++ b/src/kernel/lib/lib.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_LIB_H
 #define MELVIX_LIB_H
 
+#include <multiboot.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <multiboot.h>
 
 /**
  * Copy n data from src to dest
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index 192e08d..61b1414 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -1,9 +1,9 @@
-#include <stddef.h>
-#include <stdint.h>
-#include <system.h>
 #include <lib/stdio.h>
 #include <memory/paging.h>
 #include <multiboot.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
 
 void *memcpy(void *dest, const void *src, u32 count)
 {
diff --git a/src/kernel/lib/stdio/debug.c b/src/kernel/lib/stdio/debug.c
index a96d73a..74eb594 100644
--- a/src/kernel/lib/stdio/debug.c
+++ b/src/kernel/lib/stdio/debug.c
@@ -1,9 +1,9 @@
-#include <stdarg.h>
-#include <stdint.h>
-#include <lib/string.h>
-#include <lib/stdlib.h>
 #include <io/io.h>
+#include <lib/stdlib.h>
+#include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdarg.h>
+#include <stdint.h>
 
 void serial_print(const char *data)
 {
diff --git a/src/kernel/lib/stdio/printf.c b/src/kernel/lib/stdio/printf.c
index cc65463..c1b08e7 100644
--- a/src/kernel/lib/stdio/printf.c
+++ b/src/kernel/lib/stdio/printf.c
@@ -1,5 +1,5 @@
-#include <stdarg.h>
 #include <lib/stdio.h>
+#include <stdarg.h>
 
 void printf(const char *fmt, ...)
 {
diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c
index 15d210a..37723b2 100644
--- a/src/kernel/lib/stdio/vprintf.c
+++ b/src/kernel/lib/stdio/vprintf.c
@@ -1,9 +1,9 @@
-#include <stdarg.h>
-#include <stdint.h>
 #include <lib/stdio.h>
-#include <lib/string.h>
 #include <lib/stdlib.h>
+#include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdarg.h>
+#include <stdint.h>
 
 void _puts(const char *data)
 {
diff --git a/src/kernel/lib/stdlib/atoi.c b/src/kernel/lib/stdlib/atoi.c
index cd855ab..b90958a 100644
--- a/src/kernel/lib/stdlib/atoi.c
+++ b/src/kernel/lib/stdlib/atoi.c
@@ -1,7 +1,7 @@
 #include <lib/math.h>
+#include <lib/string.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <lib/string.h>
 
 int atoi(char *str)
 {
diff --git a/src/kernel/lib/stdlib/htoa.c b/src/kernel/lib/stdlib/htoa.c
index 7a535dd..c4dbd5e 100644
--- a/src/kernel/lib/stdlib/htoa.c
+++ b/src/kernel/lib/stdlib/htoa.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <lib/string.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 static const char HTOA_TABLE[] = "0123456789ABCDEF";
 
diff --git a/src/kernel/lib/stdlib/htoi.c b/src/kernel/lib/stdlib/htoi.c
index 7d05239..367d30e 100644
--- a/src/kernel/lib/stdlib/htoi.c
+++ b/src/kernel/lib/stdlib/htoi.c
@@ -1,6 +1,6 @@
 #include <lib/math.h>
-#include <stddef.h>
 #include <lib/string.h>
+#include <stddef.h>
 
 int htoi(char *str)
 {
diff --git a/src/kernel/lib/stdlib/itoa.c b/src/kernel/lib/stdlib/itoa.c
index 165e260..b4a9db1 100644
--- a/src/kernel/lib/stdlib/itoa.c
+++ b/src/kernel/lib/stdlib/itoa.c
@@ -1,8 +1,8 @@
 #include <lib/math.h>
-#include <stdint.h>
 #include <lib/string.h>
 #include <memory/alloc.h>
 #include <memory/paging.h>
+#include <stdint.h>
 
 static const char ITOA_TABLE[] = "0123456789";
 
diff --git a/src/kernel/lib/string.h b/src/kernel/lib/string.h
index bd412d7..127dcc4 100644
--- a/src/kernel/lib/string.h
+++ b/src/kernel/lib/string.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_STRING_H
 #define MELVIX_STRING_H
 
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
 
 u32 strlen(const char *str);
 
diff --git a/src/kernel/lib/string/strstr.c b/src/kernel/lib/string/strstr.c
index bcf1539..720df8c 100644
--- a/src/kernel/lib/string/strstr.c
+++ b/src/kernel/lib/string/strstr.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <lib/stdlib.h>
+#include <stdint.h>
 
 char *strstr(const char *in, const char *str)
 {
diff --git a/src/kernel/memory/alloc.c b/src/kernel/memory/alloc.c
index da03d8c..bd4ecb3 100644
--- a/src/kernel/memory/alloc.c
+++ b/src/kernel/memory/alloc.c
@@ -1,9 +1,9 @@
+#include <lib/lib.h>
+#include <memory/alloc.h>
+#include <memory/paging.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <memory/paging.h>
-#include <memory/alloc.h>
 #include <system.h>
-#include <lib/lib.h>
 
 extern u32 end;
 u32 placement_address;
diff --git a/src/kernel/memory/alloc.h b/src/kernel/memory/alloc.h
index 5e51195..952b61c 100644
--- a/src/kernel/memory/alloc.h
+++ b/src/kernel/memory/alloc.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_ALLOC_H
 #define MELVIX_ALLOC_H
 
-#include <stdint.h>
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define KHEAP_MAGIC 0x04206969
 #define KHEAP_MAGIC2 0xDEADBEEF
diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c
index 7a98563..d538fe9 100644
--- a/src/kernel/memory/paging.c
+++ b/src/kernel/memory/paging.c
@@ -1,12 +1,12 @@
-#include <stdint.h>
-#include <memory/paging.h>
+#include <acpi/acpi.h>
+#include <interrupts/interrupts.h>
+#include <io/io.h>
+#include <lib/lib.h>
 #include <memory/alloc.h>
+#include <memory/paging.h>
+#include <stdint.h>
 #include <system.h>
-#include <lib/lib.h>
-#include <io/io.h>
-#include <acpi/acpi.h>
 #include <tasks/process.h>
-#include <interrupts/interrupts.h>
 
 struct page_directory *paging_current_directory = NULL;
 struct page_directory *paging_root_directory = NULL;
diff --git a/src/kernel/multiboot.c b/src/kernel/multiboot.c
index 04db300..af1a88b 100644
--- a/src/kernel/multiboot.c
+++ b/src/kernel/multiboot.c
@@ -1,11 +1,11 @@
-#include <stdint.h>
-#include <graphics/vesa.h>
-#include <system.h>
-#include <multiboot.h>
-#include <smbios/smbios.h>
 #include <acpi/acpi.h>
+#include <graphics/vesa.h>
 #include <lib/lib.h>
 #include <lib/stdio.h>
+#include <multiboot.h>
+#include <smbios/smbios.h>
+#include <stdint.h>
+#include <system.h>
 
 void multiboot_parse(u32 multiboot_address)
 {
diff --git a/src/kernel/net/rtl8139.c b/src/kernel/net/rtl8139.c
index 08efc0e..fce2062 100644
--- a/src/kernel/net/rtl8139.c
+++ b/src/kernel/net/rtl8139.c
@@ -1,9 +1,9 @@
-#include <io/io.h>
-#include <pci/pci.h>
-#include <system.h>
 #include <interrupts/interrupts.h>
+#include <io/io.h>
 #include <lib/stdio.h>
 #include <memory/alloc.h>
+#include <pci/pci.h>
+#include <system.h>
 
 int rtl_irq = 0;
 u8 mac[6];
diff --git a/src/kernel/pci/pci.c b/src/kernel/pci/pci.c
index 14881b1..6eca302 100644
--- a/src/kernel/pci/pci.c
+++ b/src/kernel/pci/pci.c
@@ -1,8 +1,8 @@
-#include <stdint.h>
-#include <system.h>
-#include <pci/pci.h>
 #include <io/io.h>
 #include <lib/lib.h>
+#include <pci/pci.h>
+#include <stdint.h>
+#include <system.h>
 
 void pci_write_field(u32 device, int field, u32 value)
 {
diff --git a/src/kernel/smbios/smbios.c b/src/kernel/smbios/smbios.c
index 7b275eb..3089d29 100644
--- a/src/kernel/smbios/smbios.c
+++ b/src/kernel/smbios/smbios.c
@@ -1,7 +1,7 @@
-#include <stddef.h>
 #include <multiboot.h>
-#include <system.h>
 #include <smbios/smbios.h>
+#include <stddef.h>
+#include <system.h>
 
 void smbios_init(struct multiboot_tag_smbios *tag)
 {
diff --git a/src/kernel/smbios/smbios.h b/src/kernel/smbios/smbios.h
index 0df4b6d..236761a 100644
--- a/src/kernel/smbios/smbios.h
+++ b/src/kernel/smbios/smbios.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_SMBIOS_H
 #define MELVIX_SMBIOS_H
 
-#include <stdint.h>
 #include <multiboot.h>
+#include <stdint.h>
 
 struct smbios_0 {
 	char *vendor;
diff --git a/src/kernel/sound/frequency.c b/src/kernel/sound/frequency.c
index c485955..caa4b07 100644
--- a/src/kernel/sound/frequency.c
+++ b/src/kernel/sound/frequency.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <io/io.h>
+#include <stdint.h>
 #include <timer/timer.h>
 
 void play_sound(u32 frequency)
diff --git a/src/kernel/syscall/actions/sys_exec.c b/src/kernel/syscall/actions/sys_exec.c
index 99c6539..a74bd29 100644
--- a/src/kernel/syscall/actions/sys_exec.c
+++ b/src/kernel/syscall/actions/sys_exec.c
@@ -1,6 +1,6 @@
+#include <io/io.h>
 #include <stdint.h>
 #include <tasks/process.h>
-#include <io/io.h>
 
 u32 sys_exec(char *path)
 {
diff --git a/src/kernel/syscall/actions/sys_fork.c b/src/kernel/syscall/actions/sys_fork.c
index 084659e..ae1b17f 100644
--- a/src/kernel/syscall/actions/sys_fork.c
+++ b/src/kernel/syscall/actions/sys_fork.c
@@ -1,10 +1,10 @@
-#include <stdint.h>
 #include <interrupts/interrupts.h>
-#include <memory/paging.h>
-#include <tasks/process.h>
+#include <io/io.h>
 #include <lib/lib.h>
+#include <memory/paging.h>
+#include <stdint.h>
 #include <system.h>
-#include <io/io.h>
+#include <tasks/process.h>
 
 u32 sys_fork(struct regs *r)
 {
diff --git a/src/kernel/syscall/actions/sys_free.c b/src/kernel/syscall/actions/sys_free.c
index a7daf2f..79e5096 100644
--- a/src/kernel/syscall/actions/sys_free.c
+++ b/src/kernel/syscall/actions/sys_free.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 u32 sys_free(u32 ptr)
 {
diff --git a/src/kernel/syscall/actions/sys_get_pid.c b/src/kernel/syscall/actions/sys_get_pid.c
index eb00abe..1184ce7 100644
--- a/src/kernel/syscall/actions/sys_get_pid.c
+++ b/src/kernel/syscall/actions/sys_get_pid.c
@@ -4,4 +4,4 @@
 u32 sys_get_pid()
 {
 	return current_proc->pid;
-}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_malloc.c b/src/kernel/syscall/actions/sys_malloc.c
index da21a2d..750530d 100644
--- a/src/kernel/syscall/actions/sys_malloc.c
+++ b/src/kernel/syscall/actions/sys_malloc.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <memory/alloc.h>
+#include <stdint.h>
 
 u32 sys_malloc(u32 count)
 {
diff --git a/src/kernel/syscall/actions/sys_map.c b/src/kernel/syscall/actions/sys_map.c
index 441722e..5af2c2a 100644
--- a/src/kernel/syscall/actions/sys_map.c
+++ b/src/kernel/syscall/actions/sys_map.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <events/event.h>
+#include <stdint.h>
 
 u32 sys_map(u32 id, u8 *function)
 {
diff --git a/src/kernel/syscall/actions/sys_read.c b/src/kernel/syscall/actions/sys_read.c
index 8b16064..b0428a8 100644
--- a/src/kernel/syscall/actions/sys_read.c
+++ b/src/kernel/syscall/actions/sys_read.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <fs/fs.h>
+#include <stdint.h>
 
 u32 sys_read(char *path, u32 offset, u32 count, u8 *buf)
 {
diff --git a/src/kernel/syscall/actions/sys_wait.c b/src/kernel/syscall/actions/sys_wait.c
index 4d12886..c716221 100644
--- a/src/kernel/syscall/actions/sys_wait.c
+++ b/src/kernel/syscall/actions/sys_wait.c
@@ -1,6 +1,6 @@
+#include <io/io.h>
 #include <stdint.h>
 #include <tasks/process.h>
-#include <io/io.h>
 
 u32 sys_wait(u32 pid, u32 *status, u32 options)
 {
@@ -24,4 +24,4 @@ u32 sys_wait(u32 pid, u32 *status, u32 options)
 	}
 
 	return ret;
-}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c
index 4d4275a..585a545 100644
--- a/src/kernel/syscall/actions/sys_write.c
+++ b/src/kernel/syscall/actions/sys_write.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <fs/fs.h>
+#include <stdint.h>
 
 u32 sys_write(char *path, u32 offset, u32 count, u8 *buf)
 {
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 956bc37..2ae60b2 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -1,10 +1,10 @@
-#include <stdint.h>
 #include <common.h>
-#include <syscall/syscall.h>
 #include <interrupts/interrupts.h>
-#include <system.h>
-#include <lib/stdio.h>
 #include <io/io.h>
+#include <lib/stdio.h>
+#include <stdint.h>
+#include <syscall/syscall.h>
+#include <system.h>
 #include <tasks/process.h>
 
 typedef u32 (*syscall_func)(u32, ...);
@@ -46,4 +46,4 @@ void syscall_handler(struct regs *r)
 void syscalls_install()
 {
 	isr_install_handler(0x80, syscall_handler);
-}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index c5167a4..7e37c81 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_SYSCALL_H
 #define MELVIX_SYSCALL_H
 
-#include <stdint.h>
 #include <interrupts/interrupts.h>
+#include <stdint.h>
 
 extern void idt_syscall();
 
diff --git a/src/kernel/system.c b/src/kernel/system.c
index 6d326da..8a27de1 100644
--- a/src/kernel/system.c
+++ b/src/kernel/system.c
@@ -1,11 +1,11 @@
-#include <timer/timer.h>
-#include <io/io.h>
 #include <graphics/vesa.h>
-#include <lib/string.h>
+#include <io/io.h>
+#include <lib/stdio.h>
 #include <lib/stdlib.h>
+#include <lib/string.h>
 #include <memory/paging.h>
-#include <lib/stdio.h>
 #include <stdarg.h>
+#include <timer/timer.h>
 
 void _debug(const char *f, const char *fmt, ...)
 {
diff --git a/src/kernel/system.h b/src/kernel/system.h
index 29d0f31..f9efe94 100644
--- a/src/kernel/system.h
+++ b/src/kernel/system.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_SYSTEM_H
 #define MELVIX_SYSTEM_H
 
-#include <stdint.h>
-#include <stddef.h>
 #include <multiboot.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /**
  * The ASM registers as packed structure
diff --git a/src/kernel/tasks/process.c b/src/kernel/tasks/process.c
index 32433d8..431f1fb 100644
--- a/src/kernel/tasks/process.c
+++ b/src/kernel/tasks/process.c
@@ -1,15 +1,15 @@
-#include <stdint.h>
-#include <stddef.h>
-#include <tasks/process.h>
-#include <tasks/userspace.h>
-#include <io/io.h>
+#include <fs/elf.h>
 #include <interrupts/interrupts.h>
-#include <system.h>
+#include <io/io.h>
 #include <lib/lib.h>
-#include <memory/paging.h>
 #include <memory/alloc.h>
+#include <memory/paging.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <system.h>
+#include <tasks/process.h>
+#include <tasks/userspace.h>
 #include <timer/timer.h>
-#include <fs/elf.h>
 
 u32 pid = 0;
 struct process *root;
@@ -250,4 +250,4 @@ u32 uexec(char *path)
 	proc->gid = current_proc->pid;
 	process_spawn(proc);
 	return 0;
-}
+}
\ No newline at end of file
diff --git a/src/kernel/tasks/process.h b/src/kernel/tasks/process.h
index 9aae9bc..17467c4 100644
--- a/src/kernel/tasks/process.h
+++ b/src/kernel/tasks/process.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_PROCESS_H
 #define MELVIX_PROCESS_H
 
-#include <stdint.h>
-#include <memory/paging.h>
 #include <interrupts/interrupts.h>
+#include <memory/paging.h>
+#include <stdint.h>
 
 struct mmap {
 	u32 text;
diff --git a/src/kernel/tasks/userspace.c b/src/kernel/tasks/userspace.c
index 77392a1..375e7bb 100644
--- a/src/kernel/tasks/userspace.c
+++ b/src/kernel/tasks/userspace.c
@@ -1,12 +1,12 @@
-#include <stdint.h>
+#include <interrupts/interrupts.h>
+#include <io/io.h>
+#include <lib/lib.h>
+#include <memory/paging.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <system.h>
-#include <tasks/userspace.h>
 #include <tasks/process.h>
-#include <memory/paging.h>
-#include <io/io.h>
-#include <interrupts/interrupts.h>
-#include <lib/lib.h>
+#include <tasks/userspace.h>
 
 struct process *proc_bottom = NULL;
 
@@ -63,4 +63,4 @@ u32 single_exit(struct regs *regs)
 	paging_switch_directory(proc_bottom->cr3);
 
 	return hold;
-}
+}
\ No newline at end of file
diff --git a/src/kernel/tasks/userspace.h b/src/kernel/tasks/userspace.h
index 208476a..d66ba54 100644
--- a/src/kernel/tasks/userspace.h
+++ b/src/kernel/tasks/userspace.h
@@ -1,9 +1,9 @@
 #ifndef MELVIX_USERSPACE_H
 #define MELVIX_USERSPACE_H
 
+#include <interrupts/interrupts.h>
 #include <stdint.h>
 #include <tasks/process.h>
-#include <interrupts/interrupts.h>
 
 u32 spawn_child(struct process *child);
 
diff --git a/src/kernel/timer/timer.c b/src/kernel/timer/timer.c
index dac1371..ad651f7 100644
--- a/src/kernel/timer/timer.c
+++ b/src/kernel/timer/timer.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
 #include <interrupts/interrupts.h>
 #include <io/io.h>
+#include <stdint.h>
 #include <system.h>
 
 unsigned long timer_ticks = 0;
diff --git a/src/kernel/timer/timer.h b/src/kernel/timer/timer.h
index 7b80b75..7b0401e 100644
--- a/src/kernel/timer/timer.h
+++ b/src/kernel/timer/timer.h
@@ -1,8 +1,8 @@
 #ifndef MELVIX_TIMER_H
 #define MELVIX_TIMER_H
 
-#include <stdint.h>
 #include <interrupts/interrupts.h>
+#include <stdint.h>
 
 void timer_handler(struct regs *r);
 
diff --git a/src/userspace/libc/stdio/vprintf.c b/src/userspace/libc/stdio/vprintf.c
index dc5ed23..691f153 100644
--- a/src/userspace/libc/stdio/vprintf.c
+++ b/src/userspace/libc/stdio/vprintf.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/userspace/libc/stdlib/atoi.c b/src/userspace/libc/stdlib/atoi.c
index dbfe0cb..80897eb 100644
--- a/src/userspace/libc/stdlib/atoi.c
+++ b/src/userspace/libc/stdlib/atoi.c
@@ -1,7 +1,7 @@
+#include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <math.h>
 
 int atoi(char *str)
 {
diff --git a/src/userspace/libc/stdlib/htoi.c b/src/userspace/libc/stdlib/htoi.c
index 8897d20..0d0ab30 100644
--- a/src/userspace/libc/stdlib/htoi.c
+++ b/src/userspace/libc/stdlib/htoi.c
@@ -1,6 +1,6 @@
-#include <stdint.h>
-#include <stddef.h>
 #include <math.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 int htoi(char *str)
diff --git a/src/userspace/libc/stdlib/itoa.c b/src/userspace/libc/stdlib/itoa.c
index b8aa73e..b960796 100644
--- a/src/userspace/libc/stdlib/itoa.c
+++ b/src/userspace/libc/stdlib/itoa.c
@@ -1,6 +1,6 @@
+#include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <math.h>
 #include <string.h>
 
 static const char ITOA_TABLE[] = "0123456789";
diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c
index 4b5c200..5a9fda8 100644
--- a/src/userspace/libc/syscall.c
+++ b/src/userspace/libc/syscall.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <common.h>
+#include <stdint.h>
 #include <syscall.h>
 
 /**
diff --git a/src/userspace/libgui/draw.c b/src/userspace/libgui/draw.c
index ee35d3c..4576808 100644
--- a/src/userspace/libgui/draw.c
+++ b/src/userspace/libgui/draw.c
@@ -1,6 +1,6 @@
+#include <gui.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <gui.h>
 
 void gui_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3])
 {
diff --git a/src/userspace/libgui/init.c b/src/userspace/libgui/init.c
index 04d6b49..2e5d9c5 100644
--- a/src/userspace/libgui/init.c
+++ b/src/userspace/libgui/init.c
@@ -1,7 +1,7 @@
+#include <gui.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <syscall.h>
-#include <gui.h>
 
 struct pointers *pointers;
 
diff --git a/src/userspace/libgui/util.c b/src/userspace/libgui/util.c
index 5019175..f108822 100644
--- a/src/userspace/libgui/util.c
+++ b/src/userspace/libgui/util.c
@@ -1,5 +1,5 @@
-#include <stdint.h>
 #include <gui.h>
+#include <stdint.h>
 
 void gui_convert_color(u32 *color_array, u32 color)
 {
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index e749e2f..6cb80ce 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,9 +1,9 @@
+#include <common.h>
+#include <gui.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <common.h>
 #include <syscall.h>
 #include <unistd.h>
-#include <gui.h>
 
 void test(u8 *data)
 {
@@ -21,7 +21,7 @@ void main()
 	printf("Initializing userspace...\n");
 
 	// TODO: Find out, why init gets PID 1 and stops
-	syscall_map(MAP_KEYBOARD, (u8)&test);
+	syscall_map(MAP_KEYBOARD, (u32)&test);
 
 	// TODO: Fix occasional race conditions with cli/sti
 	// TODO: Fix scheduler turning off randomly..
diff --git a/src/userspace/programs/root.c b/src/userspace/programs/root.c
index d02f72c..86b8bf7 100644
--- a/src/userspace/programs/root.c
+++ b/src/userspace/programs/root.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <syscall.h>
+#include <unistd.h>
 
 // This process only exists because it can't crash
 void main()
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index fc6b6d6..f8f93f3 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,10 +1,10 @@
+#include <common.h>
+#include <gui.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stddef.h>
-#include <common.h>
-#include <unistd.h>
 #include <syscall.h>
-#include <gui.h>
+#include <unistd.h>
 
 void main()
 {
@@ -18,4 +18,4 @@ void main()
 	while (1) {
 		//printf("A");
 	};
-}
+}
\ No newline at end of file