diff --git a/Makefile b/Makefile
index 77bb80b..a8ff4ad 100644
--- a/Makefile
+++ b/Makefile
@@ -65,16 +65,10 @@ usr_CFLAGS=-ggdb \
 usr_LDFLAGS=-lgcc \
 			-static
 
-all: mkdirs lua $(O)/initrd.img
+all: mkdirs $(O)/initrd.img
 
 clean:
 	rm -rf $(O)
-	make -j5 -C ../lua clean
-
-lua:
-	make -C ../lua yggdrasil
-	mkdir -p $(STAGE)/bin
-	cp ../lua/lua $(STAGE)/bin/lua
 
 #chmod 04711 $(STAGE)/bin/su
 $(O)/initrd.img: mkstage-etc $(STAGE_BIN)
diff --git a/core/bin/login.c b/core/bin/login.c
index 7e6706a..b279c1e 100644
--- a/core/bin/login.c
+++ b/core/bin/login.c
@@ -1,5 +1,6 @@
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
+// TODO
+//#include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
@@ -11,6 +12,8 @@
 #include <errno.h>
 #include <pwd.h>
 
+int ioctl(int fd, unsigned long req, ...);
+
 #include <sys/gets2.h>
 
 struct spwd {
diff --git a/core/bin/mount.c b/core/bin/mount.c
index 8be2375..504689b 100644
--- a/core/bin/mount.c
+++ b/core/bin/mount.c
@@ -1,9 +1,15 @@
-#include <sys/mount.h>
+// TODO
+//#include <sys/mount.h>
+#include <ygg/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 
+int mount(const char *source, const char *target,
+          const char *fs, unsigned long flags,
+          void *data);
+
 static void usage(void) {
     printf("Usage: mount [-t type] device target\n");
 }
diff --git a/core/bin/umount.c b/core/bin/umount.c
index 76bba1e..e5f7085 100644
--- a/core/bin/umount.c
+++ b/core/bin/umount.c
@@ -1,6 +1,9 @@
-#include <sys/mount.h>
+// TODO
+//#include <sys/mount.h>
 #include <stdio.h>
 
+int umount(const char *target);
+
 int main(int argc, char **argv) {
     int res;
 
diff --git a/init.c b/init.c
index f19a3ba..7bea315 100644
--- a/init.c
+++ b/init.c
@@ -1,11 +1,17 @@
-#include <sys/netctl.h>
-#include <sys/mount.h>
+//#include <sys/netctl.h>
+// TODO:
+//#include <sys/mount.h>
 #include <sys/wait.h>
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <time.h>
 
+// TODO
+int mount(const char *source, const char *target,
+          const char *fs, unsigned long flags,
+          void *data);
+
 // The only thing init does now
 static int start_login(void) {
     const char *login = "/bin/login";
diff --git a/sh/cmd.c b/sh/cmd.c
index 7bc5a83..d3400b4 100644
--- a/sh/cmd.c
+++ b/sh/cmd.c
@@ -1,5 +1,6 @@
 #include <sys/termios.h>
-#include <sys/ioctl.h>
+// TODO
+//#include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <unistd.h>
@@ -12,6 +13,8 @@
 #include "config.h"
 #include "cmd.h"
 
+int ioctl(int fd, unsigned long req, ...);
+
 static int make_cmd(char *input, struct cmd_exec *ex) {
     char *p = strchr(input, ' ');
     char *e;