diff --git a/buffer/buffer_close.c b/buffer/buffer_close.c
index 7a2276a..1c5a50f 100644
--- a/buffer/buffer_close.c
+++ b/buffer/buffer_close.c
@@ -1,4 +1,4 @@
-#include <buffer.h>
+#include "buffer.h"
 #include <unistd.h>
 
 void buffer_close(buffer* b) {
diff --git a/buffer/buffer_getline.c b/buffer/buffer_getline.c
index e412293..2a64b9d 100644
--- a/buffer/buffer_getline.c
+++ b/buffer/buffer_getline.c
@@ -1,4 +1,4 @@
-#include <buffer.h>
+#include "buffer.h"
 
 ssize_t buffer_getline(buffer* b,char* x,size_t len) {
   return buffer_get_token(b,x,len,"\n",1);
diff --git a/buffer/buffer_mmapread.c b/buffer/buffer_mmapread.c
index 9a73f6f..121039c 100644
--- a/buffer/buffer_mmapread.c
+++ b/buffer/buffer_mmapread.c
@@ -1,4 +1,4 @@
-#include <buffer.h>
+#include "buffer.h"
 #include <mmap.h>
 
 static ssize_t op() {
diff --git a/buffer/errmsg_puts.c b/buffer/errmsg_puts.c
index 7b24a6d..9be5a4b 100644
--- a/buffer/errmsg_puts.c
+++ b/buffer/errmsg_puts.c
@@ -1,6 +1,6 @@
 #include "errmsg.h"
 #include "errmsg_int.h"
-#include <str.h>
+#include "str.h"
 
 #ifdef __MINGW32__
 
diff --git a/examples/buffer_getline.c b/examples/buffer_getline.c
index 211f2c4..19b821c 100644
--- a/examples/buffer_getline.c
+++ b/examples/buffer_getline.c
@@ -1,7 +1,7 @@
-#include <stralloc.h>
-#include <buffer.h>
-#include <io.h>
-#include <errmsg.h>
+#include "stralloc.h"
+#include "buffer.h"
+#include "io.h"
+#include "errmsg.h"
 #include <unistd.h>
 
 int main() {
diff --git a/examples/str.c b/examples/str.c
index 1178537..f9667ee 100644
--- a/examples/str.c
+++ b/examples/str.c
@@ -1,5 +1,5 @@
-#include <str.h>
-#include <buffer.h>
+#include "str.h"
+#include "buffer.h"
 
 /*
  * The str_* functions have a pretty similar functionality to the byte_* ones
diff --git a/io/io_debugstring.c b/io/io_debugstring.c
index a47bc22..0c5813a 100644
--- a/io/io_debugstring.c
+++ b/io/io_debugstring.c
@@ -1,6 +1,6 @@
 #include "io_internal.h"
 #include <iarray.h>
-#include <fmt.h>
+#include "fmt.h"
 #include <sys/time.h>
 
 unsigned int io_debugstring(int64 s,char* buf,unsigned int bufsize) {
diff --git a/io/io_waituntil2.c b/io/io_waituntil2.c
index 4de711c..da38237 100644
--- a/io/io_waituntil2.c
+++ b/io/io_waituntil2.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef __dietlibc__
-#include <fmt.h>
+#include "fmt.h"
 #include <write12.h>
 #endif
 
diff --git a/stralloc/stralloc_chomp.c b/stralloc/stralloc_chomp.c
index 2f0aa8d..d362915 100644
--- a/stralloc/stralloc_chomp.c
+++ b/stralloc/stralloc_chomp.c
@@ -1,4 +1,4 @@
-#include <stralloc.h>
+#include "stralloc.h"
 
 int stralloc_chomp(stralloc* sa) {
   size_t max=sa->len;
diff --git a/stralloc/stralloc_chop.c b/stralloc/stralloc_chop.c
index daf8001..6811df6 100644
--- a/stralloc/stralloc_chop.c
+++ b/stralloc/stralloc_chop.c
@@ -1,4 +1,4 @@
-#include <stralloc.h>
+#include "stralloc.h"
 
 int stralloc_chop(stralloc* sa) {
   if (sa->len==0) return -1;
diff --git a/stralloc/stralloc_zero.c b/stralloc/stralloc_zero.c
index a62352c..7c0b5d2 100644
--- a/stralloc/stralloc_zero.c
+++ b/stralloc/stralloc_zero.c
@@ -1,4 +1,4 @@
-#include <stralloc.h>
+#include "stralloc.h"
 
 void stralloc_zero(stralloc* sa) {
   sa->len=0;
diff --git a/test/buffer_mmap.c b/test/buffer_mmap.c
index 60ddbe2..13507d3 100644
--- a/test/buffer_mmap.c
+++ b/test/buffer_mmap.c
@@ -1,4 +1,4 @@
-#include <buffer.h>
+#include "buffer.h"
 
 int main() {
   buffer input;
diff --git a/test/cdbget2.c b/test/cdbget2.c
index 0931797..b4416cf 100644
--- a/test/cdbget2.c
+++ b/test/cdbget2.c
@@ -1,9 +1,9 @@
 #include <cdb.h>
-#include <buffer.h>
+#include "buffer.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <errmsg.h>
+#include "errmsg.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/test/dnsip.c b/test/dnsip.c
index 1d57c5d..8669b7b 100644
--- a/test/dnsip.c
+++ b/test/dnsip.c
@@ -1,9 +1,9 @@
 #include <dns.h>
 #include <ip4.h>
-#include <buffer.h>
+#include "buffer.h"
 #include <errno.h>
 #include <string.h>
-#include <errmsg.h>
+#include "errmsg.h"
 
 int main(int argc,char* argv[]) {
   static char seed[128];
diff --git a/test/fmt.c b/test/fmt.c
index cd11c4c..9a7fdfd 100644
--- a/test/fmt.c
+++ b/test/fmt.c
@@ -1,4 +1,4 @@
-#include <fmt.h>
+#include "fmt.h"
 #include <string.h>
 #include <assert.h>
 
diff --git a/test/fmt_httpdate.c b/test/fmt_httpdate.c
index ce31dea..2c5ae79 100644
--- a/test/fmt_httpdate.c
+++ b/test/fmt_httpdate.c
@@ -1,7 +1,7 @@
 #include <time.h>
-#include <scan.h>
-#include <buffer.h>
-#include <fmt.h>
+#include "scan.h"
+#include "buffer.h"
+#include "fmt.h"
 
 int main() {
   char buf[100];
diff --git a/test/fmt_human.c b/test/fmt_human.c
index abfa406..b881e57 100644
--- a/test/fmt_human.c
+++ b/test/fmt_human.c
@@ -1,5 +1,5 @@
-#include <fmt.h>
-#include <buffer.h>
+#include "fmt.h"
+#include "buffer.h"
 
 int main() {
   char buf[1024];
diff --git a/test/fmt_iso8691.c b/test/fmt_iso8691.c
index 7fa0643..5104bdc 100644
--- a/test/fmt_iso8691.c
+++ b/test/fmt_iso8691.c
@@ -1,5 +1,5 @@
-#include <fmt.h>
-#include <scan.h>
+#include "fmt.h"
+#include "scan.h"
 #include <assert.h>
 #include <unistd.h>
 
diff --git a/test/fmt_long.c b/test/fmt_long.c
index 46f40fb..cb7d8c8 100644
--- a/test/fmt_long.c
+++ b/test/fmt_long.c
@@ -1,5 +1,5 @@
-#include <fmt.h>
-#include <str.h>
+#include "fmt.h"
+#include "str.h"
 #include <assert.h>
 
 int main() {
diff --git a/test/fmt_longlong.c b/test/fmt_longlong.c
index 76643fa..60eb9bb 100644
--- a/test/fmt_longlong.c
+++ b/test/fmt_longlong.c
@@ -1,7 +1,7 @@
-#include <fmt.h>
-#include <str.h>
+#include "fmt.h"
+#include "str.h"
 #include <assert.h>
-#include <scan.h>
+#include "scan.h"
 #include <byte.h>
 
 int main() {
diff --git a/test/marshal.c b/test/marshal.c
index d8e8d70..1a5b757 100644
--- a/test/marshal.c
+++ b/test/marshal.c
@@ -3,10 +3,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fmt.h>
-#include <stralloc.h>
-#include <buffer.h>
-#include <scan.h>
+#include "fmt.h"
+#include "stralloc.h"
+#include "buffer.h"
+#include "scan.h"
 #include <textcode.h>
 #include <byte.h>
 #include <uint16.h>
@@ -14,7 +14,7 @@
 #include <uint64.h>
 #include <openreadclose.h>
 #include <mmap.h>
-#include <str.h>
+#include "str.h"
 
 char buf[100];
 stralloc sa;
diff --git a/test/scan_long.c b/test/scan_long.c
index 5cde77a..a364a5d 100644
--- a/test/scan_long.c
+++ b/test/scan_long.c
@@ -1,6 +1,6 @@
-#include <scan.h>
-#include <fmt.h>
-#include <buffer.h>
+#include "scan.h"
+#include "fmt.h"
+#include "buffer.h"
 #include <assert.h>
 
 int main() {