40 files changed, 131 insertions, 160 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index b5df27e..2497d0a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,6 +1,6 @@
 CC="i686-sb-gcc"
 AS="i686-sb-as"
-OBJ = arch/i386/boot.o init/kernel.o cpu/gdt.o cpu/reload_gdt.o cpu/idt.o cpu/io.o libc/stdio/print.o drivers/keyboard.o log.o drivers/pit.o libc/string/memcpy.o libc/string/strlen.o libc/string/memcmp.o drivers/ata.o libc/string/memset.o cpu/syscall.o  read_eip.o libc/exit/assert.o process.o cpu/int_syscall.o libc/string/strcpy.o arch/i386/mmu.o kmalloc.o fs/ext2.o fs/vfs.o fs/devfs.o cpu/spinlock.o random.o libc/string/strcmp.o crypto/ChaCha20/chacha20.o crypto/SHA1/sha1.o fs/tmpfs.o libc/string/isequal.o drivers/pst.o halts.o scalls/ppoll.o scalls/ftruncate.o kubsan.o scalls/mmap.o drivers/serial.o scalls/accept.o scalls/bind.o scalls/socket.o socket.o poll.o fs/fifo.o hashmap/hashmap.o fs/shm.o scalls/shm.o elf.o ksbrk.o sched/scheduler.o scalls/stat.o libc/string/copy.o libc/string/strncpy.o drivers/mouse.o libc/string/strlcpy.o libc/string/strcat.o drivers/vbe.o scalls/msleep.o scalls/uptime.o scalls/mkdir.o drivers/pci.o drivers/rtl8139.o network/ethernet.o network/arp.o network/bytes.o network/ipv4.o network/udp.o scalls/recvfrom.o math.o scalls/sendto.o signal.o scalls/kill.o scalls/sigaction.o network/tcp.o drivers/ahci.o crypto/xoshiro256plusplus/xoshiro256plusplus.o scalls/chdir.o scalls/getcwd.o
+OBJ = arch/i386/boot.o init/kernel.o cpu/gdt.o cpu/reload_gdt.o cpu/idt.o cpu/io.o libc/stdio/print.o drivers/keyboard.o log.o drivers/pit.o libc/string/memcpy.o libc/string/strlen.o libc/string/memcmp.o drivers/ata.o libc/string/memset.o cpu/syscall.o  read_eip.o libc/exit/assert.o process.o cpu/int_syscall.o libc/string/strcpy.o arch/i386/mmu.o kmalloc.o fs/ext2.o fs/vfs.o fs/devfs.o cpu/spinlock.o random.o libc/string/strcmp.o crypto/ChaCha20/chacha20.o crypto/SHA1/sha1.o fs/tmpfs.o libc/string/isequal.o drivers/pst.o halts.o syscalls/ppoll.o syscalls/ftruncate.o kubsan.o syscalls/mmap.o drivers/serial.o syscalls/accept.o syscalls/bind.o syscalls/socket.o socket.o poll.o fs/fifo.o hashmap/hashmap.o fs/shm.o syscalls/shm.o elf.o ksbrk.o sched/scheduler.o syscalls/stat.o libc/string/copy.o libc/string/strncpy.o drivers/mouse.o libc/string/strlcpy.o libc/string/strcat.o drivers/vbe.o syscalls/msleep.o syscalls/uptime.o syscalls/mkdir.o drivers/pci.o drivers/rtl8139.o network/ethernet.o network/arp.o network/bytes.o network/ipv4.o network/udp.o syscalls/recvfrom.o math.o syscalls/sendto.o signal.o syscalls/kill.o syscalls/sigaction.o network/tcp.o drivers/ahci.o crypto/xoshiro256plusplus/xoshiro256plusplus.o syscalls/chdir.o syscalls/getcwd.o
 CFLAGS = -O0 -fsanitize=vla-bound,shift-exponent,pointer-overflow,shift,signed-integer-overflow,bounds -ggdb -ffreestanding -Wall -Werror -mgeneral-regs-only -Wimplicit-fallthrough -I./libc/include/ -I. -Wno-pointer-sign
 INCLUDE=-I./includes/ -I./libc/include/
 
diff --git a/kernel/cpu/syscall.c b/kernel/cpu/syscall.c
index 40a5b07..a1e39ac 100644
--- a/kernel/cpu/syscall.c
+++ b/kernel/cpu/syscall.c
@@ -7,23 +7,7 @@
 #include <fs/tmpfs.h>
 #include <fs/vfs.h>
 #include <kmalloc.h>
-#include <scalls/accept.h>
-#include <scalls/bind.h>
-#include <scalls/chdir.h>
-#include <scalls/ftruncate.h>
-#include <scalls/getcwd.h>
-#include <scalls/kill.h>
-#include <scalls/mkdir.h>
-#include <scalls/mmap.h>
-#include <scalls/msleep.h>
-#include <scalls/ppoll.h>
-#include <scalls/recvfrom.h>
-#include <scalls/sendto.h>
-#include <scalls/shm.h>
-#include <scalls/sigaction.h>
-#include <scalls/socket.h>
-#include <scalls/stat.h>
-#include <scalls/uptime.h>
+#include <syscalls.h>
 #include <string.h>
 #include <typedefs.h>
 
diff --git a/kernel/includes/syscalls.h b/kernel/includes/syscalls.h
new file mode 100644
index 0000000..7ee0105
--- /dev/null
+++ b/kernel/includes/syscalls.h
@@ -0,0 +1,109 @@
+#include <socket.h>
+#include <fs/vfs.h>
+#include <signal.h>
+#include <socket.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <time.h>
+#include <typedefs.h>
+#include <types.h>
+
+typedef struct SYS_ACCEPT_PARAMS {
+  int socket;
+  struct sockaddr *address;
+  socklen_t *address_len;
+} __attribute__((packed)) SYS_ACCEPT_PARAMS;
+
+int syscall_accept(SYS_ACCEPT_PARAMS *args);
+
+typedef struct SYS_BIND_PARAMS {
+  int sockfd;
+  const struct sockaddr *addr;
+  socklen_t addrlen;
+} __attribute__((packed)) SYS_BIND_PARAMS;
+
+int syscall_bind(SYS_BIND_PARAMS *args);
+int syscall_chdir(const char *path);
+
+typedef struct SYS_CLOCK_GETTIME_PARAMS {
+  clockid_t clk;
+  struct timespec *ts;
+} __attribute__((packed)) SYS_CLOCK_GETTIME_PARAMS;
+
+int syscall_clock_gettime(SYS_CLOCK_GETTIME_PARAMS *args);
+int syscall_ftruncate(int fd, size_t length);
+
+char *syscall_getcwd(char *buf, size_t size);
+int syscall_kill(pid_t pid, int sig);
+int syscall_mkdir(const char *path, int mode);
+
+typedef struct SYS_MMAP_PARAMS {
+  void *addr;
+  size_t length;
+  int prot;
+  int flags;
+  int fd;
+  size_t offset;
+} __attribute__((packed)) SYS_MMAP_PARAMS;
+
+void *syscall_mmap(SYS_MMAP_PARAMS *args);
+#ifndef MSLEEP_H
+#define MSLEEP_H
+void syscall_msleep(u32 ms);
+#endif
+
+typedef struct SYS_POLL_PARAMS {
+  struct pollfd *fds;
+  size_t nfds;
+  int timeout;
+} __attribute__((packed)) SYS_POLL_PARAMS;
+
+int syscall_poll(SYS_POLL_PARAMS *args);
+
+struct two_args {
+  u32 a;
+  u32 b;
+};
+
+size_t syscall_recvfrom(
+    int socket, void *buffer, size_t length, int flags,
+    struct two_args
+        *extra_args /*struct sockaddr *address, socklen_t *address_len*/);
+
+struct t_two_args {
+  u32 a;
+  u32 b;
+};
+size_t syscall_sendto(int socket, const void *message, size_t length,
+           int flags, struct t_two_args *extra_args /*
+	   const struct sockaddr *dest_addr,
+           socklen_t dest_len*/);
+#ifndef SYS_SHM_H
+#define SYS_SHM_H
+
+typedef struct SYS_SHM_OPEN_PARAMS {
+  const char *name;
+  int oflag;
+  mode_t mode;
+} __attribute__((packed)) SYS_SHM_OPEN_PARAMS;
+
+int syscall_shm_open(SYS_SHM_OPEN_PARAMS *args);
+#endif
+int syscall_sigaction(int sig, const struct sigaction *restrict act,
+                      struct sigaction *restrict oact);
+
+typedef struct SYS_SOCKET_PARAMS {
+  int domain;
+  int type;
+  int protocol;
+} __attribute__((packed)) SYS_SOCKET_PARAMS;
+
+int syscall_socket(SYS_SOCKET_PARAMS *args);
+
+typedef struct SYS_STAT_PARAMS {
+  const char *pathname;
+  struct stat *statbuf;
+} __attribute__((packed)) SYS_STAT_PARAMS;
+
+int syscall_stat(SYS_STAT_PARAMS *args);
+u32 syscall_uptime(void);
diff --git a/kernel/time.h b/kernel/includes/time.h
index 2d4eef6..aa9a4ce 100644
--- a/kernel/time.h
+++ b/kernel/includes/time.h
@@ -1,8 +1,8 @@
+typedef int clockid_t;
 #ifndef TIME_H
 #define TIME_H
 #include <sys/types.h>
 
-typedef int clockid_t;
 struct timespec {
   time_t tv_sec; // Seconds.
   long tv_nsec;  // Nanoseconds.
diff --git a/kernel/scalls/accept.h b/kernel/scalls/accept.h
deleted file mode 100644
index d022999..0000000
--- a/kernel/scalls/accept.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "../socket.h"
-
-typedef struct SYS_ACCEPT_PARAMS {
-  int socket;
-  struct sockaddr *address;
-  socklen_t *address_len;
-} __attribute__((packed)) SYS_ACCEPT_PARAMS;
-
-int syscall_accept(SYS_ACCEPT_PARAMS *args);
diff --git a/kernel/scalls/bind.h b/kernel/scalls/bind.h
deleted file mode 100644
index 5661ad0..0000000
--- a/kernel/scalls/bind.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "../socket.h"
-
-typedef struct SYS_BIND_PARAMS {
-  int sockfd;
-  const struct sockaddr *addr;
-  socklen_t addrlen;
-} __attribute__((packed)) SYS_BIND_PARAMS;
-
-int syscall_bind(SYS_BIND_PARAMS *args);
diff --git a/kernel/scalls/chdir.h b/kernel/scalls/chdir.h
deleted file mode 100644
index 574ca0d..0000000
--- a/kernel/scalls/chdir.h
+++ /dev/null
@@ -1 +0,0 @@
-int syscall_chdir(const char *path);
diff --git a/kernel/scalls/clock_gettime.h b/kernel/scalls/clock_gettime.h
deleted file mode 100644
index 145aa24..0000000
--- a/kernel/scalls/clock_gettime.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <time.h>
-
-typedef struct SYS_CLOCK_GETTIME_PARAMS {
-    clockid_t clk;
-    struct timespec *ts;
-} __attribute__((packed)) SYS_CLOCK_GETTIME_PARAMS;
-
-int syscall_clock_gettime(SYS_CLOCK_GETTIME_PARAMS *args);
diff --git a/kernel/scalls/ftruncate.h b/kernel/scalls/ftruncate.h
deleted file mode 100644
index 9213e85..0000000
--- a/kernel/scalls/ftruncate.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <stddef.h>
-int syscall_ftruncate(int fd, size_t length);
diff --git a/kernel/scalls/getcwd.h b/kernel/scalls/getcwd.h
deleted file mode 100644
index 671d7bd..0000000
--- a/kernel/scalls/getcwd.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stddef.h>
-
-char *syscall_getcwd(char *buf, size_t size);
diff --git a/kernel/scalls/kill.h b/kernel/scalls/kill.h
deleted file mode 100644
index acf5f30..0000000
--- a/kernel/scalls/kill.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <signal.h>
-int syscall_kill(pid_t pid, int sig);
diff --git a/kernel/scalls/mkdir.h b/kernel/scalls/mkdir.h
deleted file mode 100644
index 0bf0043..0000000
--- a/kernel/scalls/mkdir.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <fs/vfs.h>
-int syscall_mkdir(const char *path, int mode);
diff --git a/kernel/scalls/mmap.h b/kernel/scalls/mmap.h
deleted file mode 100644
index 6b27005..0000000
--- a/kernel/scalls/mmap.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stddef.h>
-#include <typedefs.h>
-
-typedef struct SYS_MMAP_PARAMS {
-  void *addr;
-  size_t length;
-  int prot;
-  int flags;
-  int fd;
-  size_t offset;
-} __attribute__((packed)) SYS_MMAP_PARAMS;
-
-void *syscall_mmap(SYS_MMAP_PARAMS *args);
diff --git a/kernel/scalls/msleep.h b/kernel/scalls/msleep.h
deleted file mode 100644
index 03be904..0000000
--- a/kernel/scalls/msleep.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef MSLEEP_H
-#define MSLEEP_H
-#include <typedefs.h>
-void syscall_msleep(u32 ms);
-#endif
diff --git a/kernel/scalls/ppoll.h b/kernel/scalls/ppoll.h
deleted file mode 100644
index 13700b5..0000000
--- a/kernel/scalls/ppoll.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stddef.h>
-
-typedef struct SYS_POLL_PARAMS {
-  struct pollfd *fds;
-  size_t nfds;
-  int timeout;
-} __attribute__((packed)) SYS_POLL_PARAMS;
-
-int syscall_poll(SYS_POLL_PARAMS *args);
diff --git a/kernel/scalls/recvfrom.h b/kernel/scalls/recvfrom.h
deleted file mode 100644
index 72e4712..0000000
--- a/kernel/scalls/recvfrom.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <socket.h>
-
-struct two_args {
-  u32 a;
-  u32 b;
-};
-
-size_t syscall_recvfrom(
-    int socket, void *buffer, size_t length, int flags,
-    struct two_args
-        *extra_args /*struct sockaddr *address, socklen_t *address_len*/);
diff --git a/kernel/scalls/sendto.h b/kernel/scalls/sendto.h
deleted file mode 100644
index 40c32ee..0000000
--- a/kernel/scalls/sendto.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <socket.h>
-#include <typedefs.h>
-
-struct t_two_args {
-  u32 a;
-  u32 b;
-};
-size_t syscall_sendto(int socket, const void *message, size_t length,
-           int flags, struct t_two_args *extra_args /*
-	   const struct sockaddr *dest_addr,
-           socklen_t dest_len*/);
diff --git a/kernel/scalls/shm.h b/kernel/scalls/shm.h
deleted file mode 100644
index a247cfd..0000000
--- a/kernel/scalls/shm.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef SYS_SHM_H
-#define SYS_SHM_H
-#include <stddef.h>
-#include <typedefs.h>
-#include <sys/types.h>
-
-typedef struct SYS_SHM_OPEN_PARAMS {
-  const char *name;
-  int oflag;
-  mode_t mode;
-} __attribute__((packed)) SYS_SHM_OPEN_PARAMS;
-
-int syscall_shm_open(SYS_SHM_OPEN_PARAMS *args);
-#endif
diff --git a/kernel/scalls/sigaction.h b/kernel/scalls/sigaction.h
deleted file mode 100644
index 0f0aa5f..0000000
--- a/kernel/scalls/sigaction.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <signal.h>
-int syscall_sigaction(int sig, const struct sigaction *restrict act,
-              struct sigaction *restrict oact) ;
diff --git a/kernel/scalls/socket.h b/kernel/scalls/socket.h
deleted file mode 100644
index 6540b0f..0000000
--- a/kernel/scalls/socket.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "../socket.h"
-
-typedef struct SYS_SOCKET_PARAMS {
-  int domain;
-  int type;
-  int protocol;
-} __attribute__((packed)) SYS_SOCKET_PARAMS;
-
-int syscall_socket(SYS_SOCKET_PARAMS *args);
diff --git a/kernel/scalls/stat.h b/kernel/scalls/stat.h
deleted file mode 100644
index 24c5d7c..0000000
--- a/kernel/scalls/stat.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <types.h>
-#include <time.h>
-
-typedef struct SYS_STAT_PARAMS {
-  const char *pathname;
-  struct stat *statbuf;
-} __attribute__((packed)) SYS_STAT_PARAMS;
-
-int syscall_stat(SYS_STAT_PARAMS *args);
diff --git a/kernel/scalls/uptime.h b/kernel/scalls/uptime.h
deleted file mode 100644
index b432454..0000000
--- a/kernel/scalls/uptime.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <typedefs.h>
-u32 syscall_uptime(void);
diff --git a/kernel/scalls/accept.c b/kernel/syscalls/accept.c
index 3c3f5ad..0be578c 100644
--- a/kernel/scalls/accept.c
+++ b/kernel/syscalls/accept.c
@@ -1,4 +1,4 @@
-#include "accept.h"
+#include <syscalls.h>
 
 int syscall_accept(SYS_ACCEPT_PARAMS *args) {
   return accept(args->socket, args->address, args->address_len);
diff --git a/kernel/scalls/bind.c b/kernel/syscalls/bind.c
index 76e36ab..53eeb79 100644
--- a/kernel/scalls/bind.c
+++ b/kernel/syscalls/bind.c
@@ -1,4 +1,4 @@
-#include "bind.h"
+#include <syscalls.h>
 
 int syscall_bind(SYS_BIND_PARAMS *args) {
   return bind(args->sockfd, args->addr, args->addrlen);
diff --git a/kernel/scalls/chdir.c b/kernel/syscalls/chdir.c
index ec6ba92..4b1f714 100644
--- a/kernel/scalls/chdir.c
+++ b/kernel/syscalls/chdir.c
@@ -1,5 +1,5 @@
 #include <fs/vfs.h>
-#include <scalls/chdir.h>
+#include <syscalls.h>
 
 int syscall_chdir(const char *path) {
   return vfs_chdir(path);
diff --git a/kernel/scalls/clock_gettime.c b/kernel/syscalls/clock_gettime.c
index 632ea08..c0696d7 100644
--- a/kernel/scalls/clock_gettime.c
+++ b/kernel/syscalls/clock_gettime.c
@@ -1,4 +1,4 @@
-#include <scalls/clock_gettime.h>
+#include <syscalls.h>
 
 int syscall_clock_gettime(SYS_CLOCK_GETTIME_PARAMS *args) {
   // FIXME: Actually implement this
diff --git a/kernel/scalls/ftruncate.c b/kernel/syscalls/ftruncate.c
index 6bc1170..2ed5ccc 100644
--- a/kernel/scalls/ftruncate.c
+++ b/kernel/syscalls/ftruncate.c
@@ -1,5 +1,5 @@
 #include <fs/vfs.h>
-#include <scalls/ftruncate.h>
+#include <syscalls.h>
 
 int syscall_ftruncate(int fd, size_t length) {
   return vfs_ftruncate(fd, length);
diff --git a/kernel/scalls/getcwd.c b/kernel/syscalls/getcwd.c
index 629d0f5..6f35739 100644
--- a/kernel/scalls/getcwd.c
+++ b/kernel/syscalls/getcwd.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include <scalls/getcwd.h>
+#include <syscalls.h>
 #include <sched/scheduler.h>
 
 char *syscall_getcwd(char *buf, size_t size) {
diff --git a/kernel/scalls/kill.c b/kernel/syscalls/kill.c
index d5b7445..6f8c865 100644
--- a/kernel/scalls/kill.c
+++ b/kernel/syscalls/kill.c
@@ -1,4 +1,4 @@
-#include <scalls/kill.h>
+#include <syscalls.h>
 #include <sched/scheduler.h>
 #include <signal.h>
 
diff --git a/kernel/scalls/mkdir.c b/kernel/syscalls/mkdir.c
index 43f2424..e7dec0b 100644
--- a/kernel/scalls/mkdir.c
+++ b/kernel/syscalls/mkdir.c
@@ -1,4 +1,4 @@
-#include <scalls/mkdir.h>
+#include <syscalls.h>
 
 int syscall_mkdir(const char *path, int mode) {
   return vfs_mkdir(path, mode);
diff --git a/kernel/scalls/mmap.c b/kernel/syscalls/mmap.c
index 83fff6a..295bc13 100644
--- a/kernel/scalls/mmap.c
+++ b/kernel/syscalls/mmap.c
@@ -1,4 +1,4 @@
-#include <scalls/mmap.h>
+#include <syscalls.h>
 #include <sched/scheduler.h>
 
 void *syscall_mmap(SYS_MMAP_PARAMS *args) {
diff --git a/kernel/scalls/msleep.c b/kernel/syscalls/msleep.c
index 77c4272..9880b63 100644
--- a/kernel/scalls/msleep.c
+++ b/kernel/syscalls/msleep.c
@@ -1,5 +1,5 @@
 #include <drivers/pit.h>
-#include <scalls/msleep.h>
+#include <syscalls.h>
 #include <sched/scheduler.h>
 #include <stdio.h>
 
diff --git a/kernel/scalls/ppoll.c b/kernel/syscalls/ppoll.c
index 8feb35c..fa85e8c 100644
--- a/kernel/scalls/ppoll.c
+++ b/kernel/syscalls/ppoll.c
@@ -1,4 +1,4 @@
-#include <scalls/ppoll.h>
+#include <syscalls.h>
 #include <fs/vfs.h>
 #include <poll.h>
 #include <sched/scheduler.h>
diff --git a/kernel/scalls/recvfrom.c b/kernel/syscalls/recvfrom.c
index af4e809..ecc9fdf 100644
--- a/kernel/scalls/recvfrom.c
+++ b/kernel/syscalls/recvfrom.c
@@ -2,7 +2,7 @@
 #include <fs/vfs.h>
 #include <math.h>
 #include <poll.h>
-#include <scalls/recvfrom.h>
+#include <syscalls.h>
 
 size_t syscall_recvfrom(
     int socket, void *buffer, size_t length, int flags,
diff --git a/kernel/scalls/sendto.c b/kernel/syscalls/sendto.c
index 48c4020..ffedd75 100644
--- a/kernel/scalls/sendto.c
+++ b/kernel/syscalls/sendto.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <network/bytes.h>
 #include <network/udp.h>
-#include <scalls/sendto.h>
+#include <syscalls.h>
 
 size_t syscall_sendto(int socket, const void *message, size_t length,
            int flags, struct t_two_args *extra_args /*
diff --git a/kernel/scalls/shm.c b/kernel/syscalls/shm.c
index 979084a..18b672a 100644
--- a/kernel/scalls/shm.c
+++ b/kernel/syscalls/shm.c
@@ -1,5 +1,5 @@
-#include "shm.h"
-#include "../fs/shm.h"
+#include <syscalls.h>
+#include <fs/shm.h>
 
 int syscall_shm_open(SYS_SHM_OPEN_PARAMS *args) {
   return shm_open(args->name, args->oflag, args->mode);
diff --git a/kernel/scalls/sigaction.c b/kernel/syscalls/sigaction.c
index 0166fab..98024ea 100644
--- a/kernel/scalls/sigaction.c
+++ b/kernel/syscalls/sigaction.c
@@ -1,4 +1,4 @@
-#include <scalls/sigaction.h>
+#include <syscalls.h>
 #include <signal.h>
 #include <sched/scheduler.h>
 
diff --git a/kernel/scalls/socket.c b/kernel/syscalls/socket.c
index 594c745..b5c8000 100644
--- a/kernel/scalls/socket.c
+++ b/kernel/syscalls/socket.c
@@ -1,4 +1,4 @@
-#include "socket.h"
+#include <syscalls.h>
 
 int syscall_socket(SYS_SOCKET_PARAMS *args) {
   return socket(args->domain, args->type, args->protocol);
diff --git a/kernel/scalls/stat.c b/kernel/syscalls/stat.c
index 9fc115b..103ac34 100644
--- a/kernel/scalls/stat.c
+++ b/kernel/syscalls/stat.c
@@ -1,6 +1,6 @@
 #include <errno.h>
 #include <fs/vfs.h>
-#include <scalls/stat.h>
+#include <syscalls.h>
 
 int syscall_stat(SYS_STAT_PARAMS *args) {
   const char *pathname = copy_and_allocate_user_string(args->pathname);
diff --git a/kernel/scalls/uptime.c b/kernel/syscalls/uptime.c
index 748915e..3de80ba 100644
--- a/kernel/scalls/uptime.c
+++ b/kernel/syscalls/uptime.c
@@ -1,4 +1,4 @@
-#include <scalls/uptime.h>
+#include <syscalls.h>
 #include <drivers/pit.h>
 
 u32 syscall_uptime(void) { return (u32)pit_num_ms(); }