diff --git a/build.lua b/build.lua
index 09142dbd1..8175af520 100644
--- a/build.lua
+++ b/build.lua
@@ -15,7 +15,7 @@ vars.plats = {
 --	--"qemuppc",
 	"pc86",
 	"rpi",
---	"pdpv7",
+	"pdpv7",
 --	"em22",
 }
 vars.plats_with_tests = {
diff --git a/plat/pdpv7/boot.s b/plat/pdpv7/boot.s
index a51c8d80b..a684fdb6a 100644
--- a/plat/pdpv7/boot.s
+++ b/plat/pdpv7/boot.s
@@ -51,9 +51,9 @@ EXIT:
 	jsr	pc,__exit
 	sys     1
 
-WRITE:	jmp	__write
+WRITE:	jmp	_write
 
-BRK:	jmp	__brk
+BRK:	jmp	_brk
 
 	.sect .data
 hol0:   .data2 0,0     ! line no
diff --git a/plat/pdpv7/include/build.lua b/plat/pdpv7/include/build.lua
index 70d9666c6..f785644b4 100644
--- a/plat/pdpv7/include/build.lua
+++ b/plat/pdpv7/include/build.lua
@@ -10,8 +10,8 @@ end
 
 addheader("ack/plat.h")
 addheader("sys/select.h")
+addheader("sys/types.h")
 addheader("termios.h")
-addheader("unistd.h")
 
 acklibrary {
 	name = "headers",
diff --git a/plat/pdpv7/include/sys/select.h b/plat/pdpv7/include/sys/select.h
index 33525587f..f1841994f 100644
--- a/plat/pdpv7/include/sys/select.h
+++ b/plat/pdpv7/include/sys/select.h
@@ -8,6 +8,14 @@
 #ifndef _SYS_SELECT_H
 #define _SYS_SELECT_H
 
-#include <unistd.h>
+typedef uint32_t fd_set;
+
+extern int select(int nfds, fd_set *readfds, fd_set *writefds,
+                  fd_set *exceptfds, struct timeval *timeout);
+
+#define FD_ZERO(set) do { *set = 0; } while (0)
+#define FD_SET(fd, set) do { *set |= (1<<fd); } while (0);
+#define FD_CLR(fd, set) do { *set &= ~(1<<fd); } while (0);
+#define FD_ISSET(fd, set) (*set | (1<<fd))
 
 #endif
diff --git a/plat/pdpv7/include/sys/types.h b/plat/pdpv7/include/sys/types.h
new file mode 100644
index 000000000..6a0c3d3db
--- /dev/null
+++ b/plat/pdpv7/include/sys/types.h
@@ -0,0 +1,9 @@
+#ifndef _SYS_TYPES_H
+#define _SYS_TYPES_H
+
+typedef int pid_t;
+typedef int mode_t;
+typedef long time_t;
+typedef long suseconds_t;
+
+#endif
diff --git a/plat/pdpv7/include/unistd.h b/plat/pdpv7/include/unistd.h
deleted file mode 100644
index 31167015f..000000000
--- a/plat/pdpv7/include/unistd.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Raspberry Pi support library for the PDP/11
- * © 2013 David Given
- * This file is redistributable under the terms of the 3-clause BSD license.
- * See the file 'Copying' in the root of the distribution for the full text.
- */
-
-#ifndef _UNISTD_H
-#define _UNISTD_H
-
-#include <stddef.h>
-#include <time.h>
-
-/* Types */
-
-typedef int pid_t;
-typedef int mode_t;
-
-typedef long suseconds_t;
-
-/* Time handling. */
-
-struct timeval
-{
-	time_t tv_sec;
-	suseconds_t tv_usec;
-};
-
-struct timezone
-{
-	int tz_minuteswest;
-	int tz_dsttime;
-}; /* obsolete, unused */
-
-extern int gettimeofday(struct timeval* tv, struct timezone* tz);
-extern int settimeofday(const struct timeval* tv, const struct timezone* tz);
-
-/* Constants for file access (open and friends) */
-
-enum
-{
-	O_ACCMODE = 0x3,
-	
-	O_RDONLY = 0,
-	O_WRONLY = 1,
-	O_RDWR = 2,
-	
-	O_CREAT = 0100,
-	O_TRUNC = 01000,
-	O_APPEND = 02000,
-	O_NONBLOCK = 04000
-};
-
-/* Special variables */
-
-extern char** environ;
-
-/* Implemented system calls */
-
-extern void _exit(int);
-extern pid_t getpid(void);
-extern void* sbrk(int increment);
-extern int isatty(int d);
-extern off_t lseek(int fildes, off_t offset, int whence);
-extern int close(int d);
-extern int open(const char* path, int access, ...);
-extern int creat(const char* path, mode_t mode);
-extern int read(int fd, void* buffer, size_t count);
-extern int write(int fd, void* buffer, size_t count);
-extern int unlink(const char* path);
-
-/* Unimplemented system calls (these are just prototypes to let the library
- * compile). */
-
-extern int fcntl(int fd, int op, ...);
-
-/* Signal handling */
-
-typedef int sig_atomic_t;
-
-#define SIG_ERR ((sighandler_t) -1)           /* Error return.  */
-#define SIG_DFL ((sighandler_t) 0)            /* Default action.  */
-#define SIG_IGN ((sighandler_t) 1)            /* Ignore signal.  */
-
-#define SIGABRT         6       /* Abort (ANSI) */
-#define SIGILL          11      /* Illegal instruction */
-
-#define _NSIG           32      /* Biggest signal number + 1
-                                   (not including real-time signals).  */
-typedef void (*sighandler_t)(int);
-extern sighandler_t signal(int signum, sighandler_t handler);
-extern int raise(int signum);
-
-/* Select */
-
-typedef uint32_t fd_set;
-
-extern int select(int nfds, fd_set *readfds, fd_set *writefds,
-                  fd_set *exceptfds, struct timeval *timeout);
-
-#define FD_ZERO(set) do { *set = 0; } while (0)
-#define FD_SET(fd, set) do { *set |= (1<<fd); } while (0);
-#define FD_CLR(fd, set) do { *set &= ~(1<<fd); } while (0);
-#define FD_ISSET(fd, set) (*set | (1<<fd))
-
-#endif
diff --git a/plat/pdpv7/libsys/_alarm.s b/plat/pdpv7/libsys/_alarm.s
deleted file mode 100644
index 1668ef1cc..000000000
--- a/plat/pdpv7/libsys/_alarm.s
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "sys.h"
-.define	__alarm
-.extern	_errno
-
-__alarm:
-	mov	2(sp),r0
-	sys	alarm
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
diff --git a/plat/pdpv7/libsys/_close.s b/plat/pdpv7/libsys/_close.s
deleted file mode 100644
index cee142c46..000000000
--- a/plat/pdpv7/libsys/_close.s
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "sys.h"
-.define	__close
-.extern	_errno
-
-__close:
-	mov	2(sp),r0
-	sys	close
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
diff --git a/plat/pdpv7/libsys/_creat.s b/plat/pdpv7/libsys/_creat.s
deleted file mode 100644
index 3f8e47042..000000000
--- a/plat/pdpv7/libsys/_creat.s
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "sys.h"
-.define	__creat
-.extern	_errno
-
-__creat:
-	mov	2(sp),0f+2
-	mov	4(sp),0f+4
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
-.sect .data
-0:
-	sys	creat
-	.data2	0, 0
diff --git a/plat/pdpv7/libsys/_dup.s b/plat/pdpv7/libsys/_dup.s
deleted file mode 100644
index b4c4a1296..000000000
--- a/plat/pdpv7/libsys/_dup.s
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "sys.h"
-.define	__dup
-.define	__dup2
-.extern	_errno
-
-__dup2:
-	mov	2(sp),r0
-	bis	$100,r0
-	br	1f
-
-__dup:
-	mov	2(sp),r0
-1:
-	mov	4(sp),r1
-	sys	dup
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
diff --git a/plat/pdpv7/libsys/_execl.s b/plat/pdpv7/libsys/_execl.s
deleted file mode 100644
index 233cbe988..000000000
--- a/plat/pdpv7/libsys/_execl.s
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "sys.h"
-.define	__execl
-.extern	_environ
-.extern	_errno
-
-__execl:
-	mov	2(sp),0f+2
-	mov	sp,r0
-	add	$4,r0
-	mov	r0,0f+4
-	mov	_environ,0f+6
-	sys	indir; .data2 0f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-.sect .data
-0:
-	sys	exece
-	.data2	0, 0, 0
diff --git a/plat/pdpv7/libsys/_fork.s b/plat/pdpv7/libsys/_fork.s
deleted file mode 100644
index 99b5b35f9..000000000
--- a/plat/pdpv7/libsys/_fork.s
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "sys.h"
-.define	__fork
-.extern	_errno
-
-__fork:
-	sys	fork
-	br	1f
-	bcc	2f
-	mov	r0,_errno
-	mov	$-1,r0
-2:
-	rts	pc
-1:
-	clr	r0
-	rts	pc
diff --git a/plat/pdpv7/libsys/_fstat.s b/plat/pdpv7/libsys/_fstat.s
deleted file mode 100644
index 3f3abf7f5..000000000
--- a/plat/pdpv7/libsys/_fstat.s
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "sys.h"
-.define	__fstat
-.extern	_errno
-
-__fstat:
-	mov	2(sp),r0
-	mov	4(sp),0f+2
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
-.sect .data
-0:
-	sys	fstat
-	.data2	0
diff --git a/plat/pdpv7/libsys/_ftime.s b/plat/pdpv7/libsys/_ftime.s
deleted file mode 100644
index 6aa32b492..000000000
--- a/plat/pdpv7/libsys/_ftime.s
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "sys.h"
-.define	__ftime
-
-__ftime:
-	mov	2(sp),0f+2
-	sys	indir; .data2 0f
-	rts	pc
-
-.sect .data
-0:
-	sys	ftime
-	.data2	0
diff --git a/plat/pdpv7/libsys/_getpid.s b/plat/pdpv7/libsys/_getpid.s
deleted file mode 100644
index ed5879f14..000000000
--- a/plat/pdpv7/libsys/_getpid.s
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "sys.h"
-.define	__getpid
-
-__getpid:
-	sys	getpid
-	rts	pc
diff --git a/plat/pdpv7/libsys/_gtty.c b/plat/pdpv7/libsys/_gtty.c
deleted file mode 100644
index 55ca7544c..000000000
--- a/plat/pdpv7/libsys/_gtty.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int
-_gtty(fildes,argp)
-	int fildes ;
-	char *argp ;
-{
-	return _ioctl(fildes,/*TIOCGETP*/(('t'<<8)|8),argp) ;
-}
diff --git a/plat/pdpv7/libsys/_ioctl.s b/plat/pdpv7/libsys/_ioctl.s
deleted file mode 100644
index de2e10c1d..000000000
--- a/plat/pdpv7/libsys/_ioctl.s
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "sys.h"
-.define	__ioctl
-.extern	_errno
-
-__ioctl:
-	mov	2(sp),0f+2
-	mov	4(sp),0f+4
-	mov	6(sp),0f+6
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
-.sect .data
-0:
-	sys	ioctl
-	.data2	0, 0, 0
diff --git a/plat/pdpv7/libsys/_kill.s b/plat/pdpv7/libsys/_kill.s
deleted file mode 100644
index 7e5061428..000000000
--- a/plat/pdpv7/libsys/_kill.s
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "sys.h"
-.define	__kill
-.extern	_errno
-
-__kill:
-	mov	2(sp),r0
-	mov	4(sp),0f+2
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
-
-.sect .data
-0:
-	sys	kill
-	.data2	0
diff --git a/plat/pdpv7/libsys/_link.s b/plat/pdpv7/libsys/_link.s
deleted file mode 100644
index c8d4d55c6..000000000
--- a/plat/pdpv7/libsys/_link.s
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "sys.h"
-.define	__link
-.extern	_errno
-
-__link:
-	mov	2(sp),0f+2
-	mov	4(sp),0f+4
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
-.sect .data
-0:
-	sys	link
-	.data2	0, 0
diff --git a/plat/pdpv7/libsys/_lseek.s b/plat/pdpv7/libsys/_lseek.s
deleted file mode 100644
index 5ea8591d5..000000000
--- a/plat/pdpv7/libsys/_lseek.s
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "sys.h"
-.define	__lseek
-.extern	_errno
-
-__lseek:
-	mov	2(sp),r0
-	mov	4(sp),0f+2
-	mov	6(sp),0f+4
-	mov	010(sp),0f+6
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	$-1,r1
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
-.sect .data
-0:
-	sys	lseek
-	.data2	0, 0, 0
diff --git a/plat/pdpv7/libsys/_open.s b/plat/pdpv7/libsys/_open.s
deleted file mode 100644
index 4aa8fcde9..000000000
--- a/plat/pdpv7/libsys/_open.s
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "sys.h"
-.define	__open
-.extern	_errno
-
-__open:
-	mov	2(sp),0f+2
-	mov	4(sp),0f+4
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
-.sect .data
-0:
-	sys	open
-	.data2	0, 0
diff --git a/plat/pdpv7/libsys/_pause.s b/plat/pdpv7/libsys/_pause.s
deleted file mode 100644
index 8f8f7dfe8..000000000
--- a/plat/pdpv7/libsys/_pause.s
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "sys.h"
-.define	__pause
-
-__pause:
-	sys	pause
-	rts	pc
diff --git a/plat/pdpv7/libsys/_pipe.s b/plat/pdpv7/libsys/_pipe.s
deleted file mode 100644
index 72e0de220..000000000
--- a/plat/pdpv7/libsys/_pipe.s
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "sys.h"
-.define	__pipe
-.extern	_errno
-
-__pipe:
-	sys	pipe
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	mov	r5,-(sp)
-	mov	4(sp),r5
-	mov	r0,(r5)+
-	mov	r1,(r5)
-	mov	(sp)+,r5
-	clr	r0
-	rts	pc
diff --git a/plat/pdpv7/libsys/_read.s b/plat/pdpv7/libsys/_read.s
deleted file mode 100644
index c4c48338a..000000000
--- a/plat/pdpv7/libsys/_read.s
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "sys.h"
-.define	__read
-.extern	_errno
-
-__read:
-	mov	2(sp),r0
-	mov	4(sp),0f+2
-	mov	6(sp),0f+4
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
-.sect .data
-0:
-	sys	read
-	.data2	0, 0
diff --git a/plat/pdpv7/libsys/_sbrk.s b/plat/pdpv7/libsys/_sbrk.s
deleted file mode 100644
index aa8c450e7..000000000
--- a/plat/pdpv7/libsys/_sbrk.s
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "sys.h"
-.define	__sbrk
-.define	__brk
-.extern	_end
-.extern	_errno
-
-__sbrk:
-	mov	2(sp),0f+2
-	beq	1f
-	add	.limhp,0f+2
-	bcs	2f
-	sys	indir; .data2 0f
-	bcc	1f
-2:
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	mov	.limhp,r0
-	add	2(sp),.limhp
-	rts	pc
-
-__brk:
-	mov	2(sp),0f+2
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	mov	2(sp),.limhp
-	clr	r0
-	rts	pc
-
-.sect .data
-0:
-	sys	break
-	.data2	0
diff --git a/plat/pdpv7/libsys/_unlink.s b/plat/pdpv7/libsys/_unlink.s
deleted file mode 100644
index 9e18edea2..000000000
--- a/plat/pdpv7/libsys/_unlink.s
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "sys.h"
-.define	__unlink
-.extern	_errno
-
-__unlink:
-	mov	2(sp),0f+2
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	clr	r0
-	rts	pc
-.sect .data
-0:
-	sys	unlink
-	.data2	0
diff --git a/plat/pdpv7/libsys/_wait.s b/plat/pdpv7/libsys/_wait.s
deleted file mode 100644
index 86a85089a..000000000
--- a/plat/pdpv7/libsys/_wait.s
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "sys.h"
-.define	__wait
-.extern	_errno
-
-__wait:
-	sys	wait
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-	rts	pc
-1:
-	tst	2(sp)
-	beq	1f
-	mov	r1,*2(sp)
-1:
-	rts	pc
diff --git a/plat/pdpv7/libsys/_write.s b/plat/pdpv7/libsys/_write.s
deleted file mode 100644
index c97b95bc6..000000000
--- a/plat/pdpv7/libsys/_write.s
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "sys.h"
-.define	__write
-.extern	_errno
-
-__write:
-	mov	2(sp),r0
-	mov	4(sp),0f+2
-	mov	6(sp),0f+4
-	sys	indir; .data2 0f
-	bcc	1f
-	mov	r0,_errno
-	mov	$-1,r0
-1:
-	rts	pc
-.sect .data
-0:
-	sys	write
-	.data2	0, 0