diff --git a/userspace/esh.c b/userspace/esh.c
index 3a925473..2f7b5911 100644
--- a/userspace/esh.c
+++ b/userspace/esh.c
@@ -12,8 +12,6 @@
 #include <unistd.h>
 #include <time.h>
 
-DEFN_SYSCALL1(wait, 17, unsigned int);
-
 DEFN_SYSCALL2(getcwd, 29, char *, size_t);
 DEFN_SYSCALL1(chdir, 28, char *);
 
diff --git a/userspace/login.c b/userspace/login.c
index 121706f5..aea34393 100644
--- a/userspace/login.c
+++ b/userspace/login.c
@@ -14,7 +14,6 @@
 
 #include "lib/sha2.h"
 
-DEFN_SYSCALL1(wait, 17, unsigned int);
 DEFN_SYSCALL1(setuid, 24, unsigned int);
 DEFN_SYSCALL1(kernel_string_XXX, 25, char *);
 DEFN_SYSCALL0(gethostname, 32);
diff --git a/userspace/multitasking-test.c b/userspace/multitasking-test.c
index e5b02dfb..f4270c4d 100644
--- a/userspace/multitasking-test.c
+++ b/userspace/multitasking-test.c
@@ -11,8 +11,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-DEFN_SYSCALL1(wait, 17, unsigned int);
-
 int main(int argc, char ** argv) {
 	int nthreads = 2, base_pid = getpid(), npid = -1;
 
diff --git a/userspace/pipe_test.c b/userspace/pipe_test.c
index a9319983..328cf7e1 100644
--- a/userspace/pipe_test.c
+++ b/userspace/pipe_test.c
@@ -9,9 +9,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-DEFN_SYSCALL1(wait, 17, unsigned int);
-DEFN_SYSCALL0(mkpipe, 21);
-
 int main(int argc, char ** argv) {
 	int fd = syscall_mkpipe();
 	printf("%d <- pipe\n", fd);
diff --git a/userspace/terminal.c b/userspace/terminal.c
index 7f0c381a..138f7ea2 100644
--- a/userspace/terminal.c
+++ b/userspace/terminal.c
@@ -432,9 +432,6 @@ DEFN_SYSCALL0(getgraphicswidth,  18);
 DEFN_SYSCALL0(getgraphicsheight, 19);
 DEFN_SYSCALL0(getgraphicsdepth,  20);
 
-DEFN_SYSCALL0(mkpipe, 21);
-DEFN_SYSCALL2(dup2, 22, int, int);
-
 DEFN_SYSCALL0(mousedevice, 33);
 
 uint16_t graphics_width  = 0;
diff --git a/userspace/thrash-process.c b/userspace/thrash-process.c
index 4e4b02a9..690231ea 100644
--- a/userspace/thrash-process.c
+++ b/userspace/thrash-process.c
@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-DEFN_SYSCALL1(wait, 17, unsigned int);
-
 int main(int argc, char ** argv) {
 	int quiet = 0;
 	if (argc > 1) {