6 files changed, 30 insertions, 32 deletions
diff --git a/src/sysbin/bam.lua b/src/sysbin/bam.lua
index d223beb..d9d5846 100644
--- a/src/sysbin/bam.lua
+++ b/src/sysbin/bam.lua
@@ -5,20 +5,19 @@ local function sysbin_settings(name)
 	return s
 end
 
-local function sysbin_exe(name, moredeps)
+local function sysbin_exe(name, deps)
 	local s = sysbin_settings(name)
 
 	local src = Collect('src/sysbin/' .. name .. '/*.c')
 	local obj = Compile(s, src)
 
-	return Link(s, 'sysbin/' .. name .. ".bin", {obj, libkogata, moredeps})
+	return Link(s, 'sysbin/' .. name .. ".bin", {obj, deps})
 end
 
 sysbin = {
-	sysbin_exe('init'),
-	sysbin_exe('giosrv'),
-	sysbin_exe('login'),
-	sysbin_exe('terminal'),
-	--sysbin_exe('shell', {liblua, liblualib}),
-	sysbin_exe('shell'),
+	sysbin_exe('init', {libkogata}),
+	sysbin_exe('giosrv', {libkogata}),
+	sysbin_exe('login', {libkogata}),
+	sysbin_exe('terminal', {libkogata}),
+	sysbin_exe('shell', {libkogata}),
 }
diff --git a/src/sysbin/giosrv/main.c b/src/sysbin/giosrv/main.c
index e0b76f5..37f0f3c 100644
--- a/src/sysbin/giosrv/main.c
+++ b/src/sysbin/giosrv/main.c
@@ -1,14 +1,14 @@
 #include <string.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 
-#include <syscall.h>
-#include <debug.h>
-#include <region_alloc.h>
+#include <kogata/syscall.h>
+#include <kogata/debug.h>
+#include <kogata/region_alloc.h>
 
 #include <proto/keyboard.h>
 
-#include <gip.h>
+#include <kogata/gip.h>
 
 //  ---- GIP server
 
diff --git a/src/sysbin/init/main.c b/src/sysbin/init/main.c
index 6be0a87..da51223 100644
--- a/src/sysbin/init/main.c
+++ b/src/sysbin/init/main.c
@@ -1,13 +1,11 @@
 #include <string.h>
-#include <printf.h>
+#include <stdlib.h>
 
-#include <malloc.h>
+#include <kogata/syscall.h>
+#include <kogata/debug.h>
+#include <kogata/printf.h>
 
-#include <syscall.h>
-#include <debug.h>
-#include <region_alloc.h>
-
-#include <btree.h>
+#include <kogata/btree.h>
 
 pid_t giosrv_pid = 0, login_pid = 0;
 fd_pair_t root_gip_chan;
diff --git a/src/sysbin/login/main.c b/src/sysbin/login/main.c
index dfc5dfa..c9d2455 100644
--- a/src/sysbin/login/main.c
+++ b/src/sysbin/login/main.c
@@ -1,8 +1,8 @@
 #include <string.h>
-#include <malloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
 
 int main(int argc, char **argv) {
 	dbg_print("[login] Starting up.\n");
diff --git a/src/sysbin/shell/main.c b/src/sysbin/shell/main.c
index 3f37ff8..81ecdfa 100644
--- a/src/sysbin/shell/main.c
+++ b/src/sysbin/shell/main.c
@@ -1,11 +1,11 @@
 #include <string.h>
-#include <malloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
 #include <stdio.h>
 #include <unistd.h>
 
-#include <syscall.h>
+#include <kogata/debug.h>
+#include <kogata/syscall.h>
 
 void ls(char* dir) {
 	fd_t f = open(dir, FM_READDIR);
diff --git a/src/sysbin/terminal/main.c b/src/sysbin/terminal/main.c
index a0d8855..fe2376f 100644
--- a/src/sysbin/terminal/main.c
+++ b/src/sysbin/terminal/main.c
@@ -1,11 +1,12 @@
 #include <string.h>
-#include <malloc.h>
-#include <region_alloc.h>
-#include <debug.h>
+#include <stdlib.h>
 
-#include <gip.h>
-#include <draw.h>
-#include <keyboard.h>
+#include <kogata/region_alloc.h>
+#include <kogata/debug.h>
+
+#include <kogata/gip.h>
+#include <kogata/draw.h>
+#include <kogata/keyboard.h>
 
 #define NCOLORS 16