From 9694d1a5a0de22bfd8c92483d61adba22226d75b Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Sat, 20 Sep 2025 10:54:31 +0200
Subject: [PATCH] Use unified header file ulib.h

---
 ulib/ulib.h       | 25 +++++++++++++++++++++++++
 user/init/main.c  | 11 +----------
 user/pctl/ls.c    |  9 +--------
 user/pctl/main.c  |  4 +---
 user/tb/interp.c  | 11 +----------
 user/tb/main.c    | 14 +-------------
 user/tb/runtime.c |  5 +----
 7 files changed, 31 insertions(+), 48 deletions(-)
 create mode 100644 ulib/ulib.h

diff --git a/ulib/ulib.h b/ulib/ulib.h
new file mode 100644
index 0000000..bd7596e
--- /dev/null
+++ b/ulib/ulib.h
@@ -0,0 +1,25 @@
+#ifndef ULIB_ULIB_H_
+#define ULIB_ULIB_H_
+
+#include <ansiq/all.h>
+#include <args/args.h>
+#include <dlmalloc/malloc.h>
+#include <string/string.h>
+#include <string/char.h>
+#include <sync/spinlock.h>
+#include <syscall/syscall.h>
+#include <system/system.h>
+#include <util/util.h>
+#include <uprintf.h>
+#include <linklist.h>
+#include <log.h>
+
+#include <errors.h>
+#include <sysdefs/ioctl.h>
+#include <sysdefs/ipcpipe.h>
+#include <sysdefs/mman.h>
+#include <sysdefs/processctl.h>
+#include <sysdefs/sched.h>
+#include <sysdefs/syscall.h>
+
+#endif // ULIB_ULIB_H_
diff --git a/user/init/main.c b/user/init/main.c
index 51b0f97..39c133e 100644
--- a/user/init/main.c
+++ b/user/init/main.c
@@ -1,14 +1,5 @@
 #include <stdint.h>
-#include <string/string.h>
-#include <system/system.h>
-#include <sysdefs/ipcpipe.h>
-#include <sysdefs/processctl.h>
-#include <uprintf.h>
-#include <ansiq/all.h>
-#include <string/char.h>
-#include <util/util.h>
-#include <dlmalloc/malloc.h>
-#include <errors.h>
+#include <ulib.h>
 
 uint64_t PID;
 
diff --git a/user/pctl/ls.c b/user/pctl/ls.c
index c0c01dd..d6eb595 100644
--- a/user/pctl/ls.c
+++ b/user/pctl/ls.c
@@ -1,13 +1,6 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <system/system.h>
-#include <sysdefs/processctl.h>
-#include <util/util.h>
-#include <errors.h>
-#include <uprintf.h>
-#include <string/string.h>
-#include <dlmalloc/malloc.h>
-#include <args/args.h>
+#include <ulib.h>
 #include "ls.h"
 #include "macros.h"
 
diff --git a/user/pctl/main.c b/user/pctl/main.c
index 991d439..ab7d995 100644
--- a/user/pctl/main.c
+++ b/user/pctl/main.c
@@ -1,8 +1,6 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <uprintf.h>
-#include <args/args.h>
-#include <string/string.h>
+#include <ulib.h>
 #include "ls.h"
 
 void main(void) {
diff --git a/user/tb/interp.c b/user/tb/interp.c
index a9af90b..25336f5 100644
--- a/user/tb/interp.c
+++ b/user/tb/interp.c
@@ -1,15 +1,6 @@
 #include <stddef.h>
 #include <stdbool.h>
-#include <util/util.h>
-#include <string/string.h>
-#include <string/char.h>
-#include <linklist.h>
-#include <dlmalloc/malloc.h>
-#include <system/system.h>
-#include <sysdefs/processctl.h>
-#include <sysdefs/ipcpipe.h>
-#include <uprintf.h>
-#include <errors.h>
+#include <ulib.h>
 #include "interp.h"
 #include "runtime.h"
 
diff --git a/user/tb/main.c b/user/tb/main.c
index 67570ff..d8314f9 100644
--- a/user/tb/main.c
+++ b/user/tb/main.c
@@ -1,18 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <uprintf.h>
-#include <args/args.h>
-#include <string/string.h>
-#include <string/char.h>
-#include <log.h>
-#include <ansiq/all.h>
-#include <system/system.h>
-#include <sysdefs/ipcpipe.h>
-#include <sysdefs/ioctl.h>
-#include <sysdefs/processctl.h>
-#include <dlmalloc/malloc.h>
-#include <errors.h>
-#include <util/util.h>
+#include <ulib.h>
 #include "interp.h"
 
 // keys
diff --git a/user/tb/runtime.c b/user/tb/runtime.c
index 8dce508..3903a82 100644
--- a/user/tb/runtime.c
+++ b/user/tb/runtime.c
@@ -1,9 +1,6 @@
 #include <stddef.h>
 #include <stdbool.h>
-#include <linklist.h>
-#include <dlmalloc/malloc.h>
-#include <string/string.h>
-#include <uprintf.h>
+#include <ulib.h>
 #include "runtime.h"
 #include "interp.h"