diff --git a/byte/byte_chr.c b/byte/byte_chr.c
index 6185966..66ea835 100644
--- a/byte/byte_chr.c
+++ b/byte/byte_chr.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* byte_chr returns the smallest integer i between 0 and len-1
  * inclusive such that one[i] equals needle, or len if not found. */
diff --git a/byte/byte_copy.c b/byte/byte_copy.c
index a087127..fe17826 100644
--- a/byte/byte_copy.c
+++ b/byte/byte_copy.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1]
  * to out[len-1]. */
diff --git a/byte/byte_copyr.c b/byte/byte_copyr.c
index 4a24a3a..2b2d9de 100644
--- a/byte/byte_copyr.c
+++ b/byte/byte_copyr.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* byte_copyr copies in[len-1] to out[len-1], in[len-2] to out[len-2],
  * ... and in[0] to out[0] */
diff --git a/byte/byte_diff.c b/byte/byte_diff.c
index c96e971..607eeb4 100644
--- a/byte/byte_diff.c
+++ b/byte/byte_diff.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* byte_diff returns negative, 0, or positive, depending on whether the
  * string one[0], one[1], ..., one[len-1] is lexicographically smaller
diff --git a/byte/byte_equal_notimingattack.c b/byte/byte_equal_notimingattack.c
index e1e4144..c84907f 100644
--- a/byte/byte_equal_notimingattack.c
+++ b/byte/byte_equal_notimingattack.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* If you need to compare a password or a hash value, the timing of the
  * comparison function can give valuable clues to the attacker. Let's
diff --git a/byte/byte_rchr.c b/byte/byte_rchr.c
index fe7ed4c..63d5a7e 100644
--- a/byte/byte_rchr.c
+++ b/byte/byte_rchr.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 
 /* byte_rchr returns the largest integer i between 0 and len-1 inclusive
  * such that one[i] equals needle, or len if not found. */
diff --git a/byte/byte_start.c b/byte/byte_start.c
index ebae323..d20f7b8 100644
--- a/byte/byte_start.c
+++ b/byte/byte_start.c
@@ -1,4 +1,4 @@
-#include <byte.h>
+#include <libowfat/byte.h>
 #include <string.h>
 
 int byte_start(const void* a,size_t alen,const void* b,size_t blen) {
diff --git a/byte/byte_starts.c b/byte/byte_starts.c
index a88292e..0283f8b 100644
--- a/byte/byte_starts.c
+++ b/byte/byte_starts.c
@@ -1,4 +1,4 @@
-#include <byte.h>
+#include <libowfat/byte.h>
 #undef byte_starts
 #include <string.h>
 
diff --git a/byte/byte_zero.c b/byte/byte_zero.c
index 35ae780..4483719 100644
--- a/byte/byte_zero.c
+++ b/byte/byte_zero.c
@@ -1,4 +1,4 @@
-#include "byte.h"
+#include <libowfat/byte.h>
 #include <string.h>
 
 /* byte_zero sets the bytes out[0], out[1], ..., out[len-1] to 0 */
diff --git a/cdb/cdb.c b/cdb/cdb.c
index d52c31b..b2ea047 100644
--- a/cdb/cdb.c
+++ b/cdb/cdb.c
@@ -8,7 +8,7 @@
 #include "cdb.h"
 #include "havepread.h"
 #ifdef __MINGW32__
-#include "windows.h"
+#include <windows.h>
 #else
 #include <sys/mman.h>
 #endif
diff --git a/cdb/cdb_make.c b/cdb/cdb_make.c
index 3c2efc8..b4f8dbd 100644
--- a/cdb/cdb_make.c
+++ b/cdb/cdb_make.c
@@ -6,7 +6,7 @@
 #include "cdb.h"
 #include "cdb_make.h"
 #ifdef __MINGW32__
-#include "windows.h"
+#include <windows.h>
 #endif
 
 int cdb_make_start(struct cdb_make *c,int64 fd) {
diff --git a/dns/dns_dfd.c b/dns/dns_dfd.c
index 0b8c977..9927bf8 100644
--- a/dns/dns_dfd.c
+++ b/dns/dns_dfd.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <errno.h>
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 int dns_domain_fromdot(char **out,const char *buf,size_t n)
 {
diff --git a/dns/dns_domain.c b/dns/dns_domain.c
index 80ac5ea..6b112fa 100644
--- a/dns/dns_domain.c
+++ b/dns/dns_domain.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
-#include "case.h"
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/case.h>
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 unsigned int dns_domain_length(const char *dn)
 {
diff --git a/dns/dns_dtda.c b/dns/dns_dtda.c
index 7d4dfe0..2510d19 100644
--- a/dns/dns_dtda.c
+++ b/dns/dns_dtda.c
@@ -1,5 +1,5 @@
-#include "stralloc.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/dns.h>
 
 int dns_domain_todot_cat(stralloc *out,const char *d)
 {
diff --git a/dns/dns_ip.c b/dns/dns_ip.c
index e7c3a9a..b7e8409 100644
--- a/dns/dns_ip.c
+++ b/dns/dns_ip.c
@@ -1,7 +1,7 @@
-#include "stralloc.h"
-#include "uint16.h"
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/uint16.h>
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 int dns_ip4_packet(stralloc *out,const char *buf,unsigned int len)
 {
diff --git a/dns/dns_ip6.c b/dns/dns_ip6.c
index 1a2ce08..ed77494 100644
--- a/dns/dns_ip6.c
+++ b/dns/dns_ip6.c
@@ -1,9 +1,8 @@
-#include "stralloc.h"
-#include "uint16.h"
-#include "byte.h"
-#include "dns.h"
-#include "ip4.h"
-#include "ip6.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/uint16.h>
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
+#include <libowfat/ip6.h>
 
 static int dns_ip6_packet_add(stralloc *out,const char *buf,unsigned int len)
 {
diff --git a/dns/dns_ipq.c b/dns/dns_ipq.c
index 5b65e23..e59ad30 100644
--- a/dns/dns_ipq.c
+++ b/dns/dns_ipq.c
@@ -1,8 +1,8 @@
-#include "stralloc.h"
-#include "case.h"
-#include "byte.h"
-#include "str.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/case.h>
+#include <libowfat/byte.h>
+#include <libowfat/str.h>
+#include <libowfat/dns.h>
 
 static int doit(stralloc *work,const char *rule)
 {
diff --git a/dns/dns_ipq6.c b/dns/dns_ipq6.c
index d5cea12..339229b 100644
--- a/dns/dns_ipq6.c
+++ b/dns/dns_ipq6.c
@@ -1,8 +1,8 @@
-#include "stralloc.h"
-#include "case.h"
-#include "byte.h"
-#include "str.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/case.h>
+#include <libowfat/byte.h>
+#include <libowfat/str.h>
+#include <libowfat/dns.h>
 
 static int doit(stralloc *work,const char *rule)
 {
diff --git a/dns/dns_mx.c b/dns/dns_mx.c
index 8d38a7f..537d6e0 100644
--- a/dns/dns_mx.c
+++ b/dns/dns_mx.c
@@ -1,7 +1,7 @@
-#include "stralloc.h"
-#include "byte.h"
-#include "uint16.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/byte.h>
+#include <libowfat/uint16.h>
+#include <libowfat/dns.h>
 
 static char *q = 0;
 
diff --git a/dns/dns_name.c b/dns/dns_name.c
index 075f7a4..f40890c 100644
--- a/dns/dns_name.c
+++ b/dns/dns_name.c
@@ -1,8 +1,8 @@
-#include "stralloc.h"
-#include "uint16.h"
-#include "byte.h"
-#include "dns.h"
-#include "ip6.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/uint16.h>
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
+#include <libowfat/ip6.h>
 
 static char *q = 0;
 
diff --git a/dns/dns_nd.c b/dns/dns_nd.c
index aa54e5d..24985a0 100644
--- a/dns/dns_nd.c
+++ b/dns/dns_nd.c
@@ -1,6 +1,6 @@
-#include "byte.h"
-#include "fmt.h"
-#include "dns.h"
+#include <libowfat/byte.h>
+#include <libowfat/fmt.h>
+#include <libowfat/dns.h>
 
 void dns_name4_domain(char name[DNS_NAME4_DOMAIN],const char ip[4])
 {
diff --git a/dns/dns_nd6.c b/dns/dns_nd6.c
index 33a8864..0bc880f 100644
--- a/dns/dns_nd6.c
+++ b/dns/dns_nd6.c
@@ -1,6 +1,5 @@
-#include "byte.h"
-#include "fmt.h"
-#include "dns.h"
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 #include "haveinline.h"
 
 /* RFC1886:
diff --git a/dns/dns_packet.c b/dns/dns_packet.c
index ed5d85b..b9486dd 100644
--- a/dns/dns_packet.c
+++ b/dns/dns_packet.c
@@ -3,7 +3,7 @@ DNS should have used LZ77 instead of its own sophomoric compression algorithm.
 */
 
 #include <errno.h>
-#include "dns.h"
+#include <libowfat/dns.h>
 
 unsigned int dns_packet_copy(const char *buf,unsigned int len,unsigned int pos,char *out,unsigned int outlen)
 {
diff --git a/dns/dns_random.c b/dns/dns_random.c
index 92c064d..9894351 100644
--- a/dns/dns_random.c
+++ b/dns/dns_random.c
@@ -1,7 +1,7 @@
 #include <unistd.h>
-#include "dns.h"
-#include "taia.h"
-#include "uint32.h"
+#include <libowfat/dns.h>
+#include <libowfat/taia.h>
+#include <libowfat/uint32.h>
 
 static uint32 seed[32];
 static uint32 in[12];
diff --git a/dns/dns_rcip.c b/dns/dns_rcip.c
index 0d66605..44c37ed 100644
--- a/dns/dns_rcip.c
+++ b/dns/dns_rcip.c
@@ -1,10 +1,9 @@
 #include <stdlib.h>
-#include "taia.h"
-#include "openreadclose.h"
-#include "byte.h"
-#include "ip4.h"
-#include "ip6.h"
-#include "dns.h"
+#include <libowfat/taia.h>
+#include <libowfat/openreadclose.h>
+#include <libowfat/byte.h>
+#include <libowfat/ip6.h>
+#include <libowfat/dns.h>
 
 static stralloc data;
 
diff --git a/dns/dns_rcrw.c b/dns/dns_rcrw.c
index ee7318e..48f90b5 100644
--- a/dns/dns_rcrw.c
+++ b/dns/dns_rcrw.c
@@ -1,10 +1,10 @@
 #include <unistd.h>
 #include <stdlib.h>
-#include "taia.h"
-#include "byte.h"
-#include "str.h"
-#include "openreadclose.h"
-#include "dns.h"
+#include <libowfat/taia.h>
+#include <libowfat/byte.h>
+#include <libowfat/str.h>
+#include <libowfat/openreadclose.h>
+#include <libowfat/dns.h>
 #ifdef __MINGW32__
 #include <winsock2.h>
 #include <windows.h>
diff --git a/dns/dns_resolve.c b/dns/dns_resolve.c
index cfbbd5e..d4ad9af 100644
--- a/dns/dns_resolve.c
+++ b/dns/dns_resolve.c
@@ -1,8 +1,7 @@
-#include "iopause.h"
-#include "taia.h"
-#include "byte.h"
-#include "dns.h"
-#include "ip6.h"
+#include <libowfat/iopause.h>
+#include <libowfat/taia.h>
+#include <libowfat/dns.h>
+#include <libowfat/ip6.h>
 
 struct dns_transmit dns_resolve_tx;
 
diff --git a/dns/dns_sortip.c b/dns/dns_sortip.c
index af9b235..2bf12f4 100644
--- a/dns/dns_sortip.c
+++ b/dns/dns_sortip.c
@@ -1,5 +1,5 @@
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 /* XXX: sort servers by configurable notion of closeness? */
 /* XXX: pay attention to competence of each server? */
diff --git a/dns/dns_sortip6.c b/dns/dns_sortip6.c
index 7e752e9..b95c9ad 100644
--- a/dns/dns_sortip6.c
+++ b/dns/dns_sortip6.c
@@ -1,5 +1,5 @@
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 /* XXX: sort servers by configurable notion of closeness? */
 /* XXX: pay attention to competence of each server? */
diff --git a/dns/dns_transmit.c b/dns/dns_transmit.c
index fb3c335..b4b7230 100644
--- a/dns/dns_transmit.c
+++ b/dns/dns_transmit.c
@@ -7,12 +7,12 @@
 #endif
 #include <unistd.h>
 #include <stdlib.h>
-#include "socket.h"
 #include <errno.h>
-#include "byte.h"
-#include "uint16.h"
-#include "dns.h"
-#include "ip6.h"
+#include <libowfat/socket.h>
+#include <libowfat/byte.h>
+#include <libowfat/uint16.h>
+#include <libowfat/dns.h>
+#include <libowfat/ip6.h>
 
 static int serverwantstcp(const char *buf,unsigned int len)
 {
diff --git a/dns/dns_txt.c b/dns/dns_txt.c
index fa6c1b3..add9a57 100644
--- a/dns/dns_txt.c
+++ b/dns/dns_txt.c
@@ -1,8 +1,8 @@
 #include <errno.h>
-#include "stralloc.h"
-#include "uint16.h"
-#include "byte.h"
-#include "dns.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/uint16.h>
+#include <libowfat/byte.h>
+#include <libowfat/dns.h>
 
 int dns_txt_packet(stralloc *out,const char *buf,unsigned int len)
 {