diff --git a/buffer/buffer_init.c b/buffer/buffer_init.c
index 772a96b..2d2070c 100644
--- a/buffer/buffer_init.c
+++ b/buffer/buffer_init.c
@@ -1,4 +1,4 @@
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 void buffer_init(buffer* b,ssize_t (*op)(),int fd,
 		 char* y,size_t ylen) {
diff --git a/buffer/buffer_init_allocbuf.c b/buffer/buffer_init_allocbuf.c
index 55d0efc..3bfde5d 100644
--- a/buffer/buffer_init_allocbuf.c
+++ b/buffer/buffer_init_allocbuf.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 int buffer_init_allocbuf(buffer* b, ssize_t (*op)(), int fd, size_t ylen) {
   if (fd==-1) return -1;
diff --git a/buffer/buffer_init_free.c b/buffer/buffer_init_free.c
index 35044f6..a8571a8 100644
--- a/buffer/buffer_init_free.c
+++ b/buffer/buffer_init_free.c
@@ -1,4 +1,4 @@
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 void buffer_init_free(buffer* b,ssize_t (*op)(),int fd,
 		 char* y,size_t ylen) {
diff --git a/buffer/buffer_init_read.c b/buffer/buffer_init_read.c
index d9c378b..491d141 100644
--- a/buffer/buffer_init_read.c
+++ b/buffer/buffer_init_read.c
@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include <buffer.h>
+#include <libowfat/buffer.h>
 
 int buffer_init_read(buffer* b, int fd, char* y,size_t ylen) {
   if (fd==-1) return -1;
diff --git a/buffer/buffer_init_read_allocbuf.c b/buffer/buffer_init_read_allocbuf.c
index 78df5aa..f078478 100644
--- a/buffer/buffer_init_read_allocbuf.c
+++ b/buffer/buffer_init_read_allocbuf.c
@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 int buffer_init_read_allocbuf(buffer* b, int fd, size_t ylen) {
   return buffer_init_allocbuf(b, read, fd, ylen);
diff --git a/buffer/buffer_init_staticcontents.c b/buffer/buffer_init_staticcontents.c
index 063871e..814b6cc 100644
--- a/buffer/buffer_init_staticcontents.c
+++ b/buffer/buffer_init_staticcontents.c
@@ -1,5 +1,4 @@
-#include "buffer.h"
-#include <mmap.h>
+#include <libowfat/buffer.h>
 
 static ssize_t op() {
   return 0;
diff --git a/buffer/buffer_init_staticcontents_free.c b/buffer/buffer_init_staticcontents_free.c
index 31d9a5b..1a28bc4 100644
--- a/buffer/buffer_init_staticcontents_free.c
+++ b/buffer/buffer_init_staticcontents_free.c
@@ -1,5 +1,4 @@
-#include "buffer.h"
-#include <mmap.h>
+#include <libowfat/buffer.h>
 
 void buffer_init_staticcontents_free(buffer* b, char* y, size_t len) {
   buffer_init_staticcontents(b, y, len);
diff --git a/buffer/buffer_init_write.c b/buffer/buffer_init_write.c
index 48195ba..fff3c44 100644
--- a/buffer/buffer_init_write.c
+++ b/buffer/buffer_init_write.c
@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include <buffer.h>
+#include <libowfat/buffer.h>
 
 int buffer_init_write(buffer* b, int fd, char* y,size_t ylen) {
   if (fd==-1) return -1;
diff --git a/buffer/buffer_init_write_allocbuf.c b/buffer/buffer_init_write_allocbuf.c
index a005b6c..cb3987e 100644
--- a/buffer/buffer_init_write_allocbuf.c
+++ b/buffer/buffer_init_write_allocbuf.c
@@ -1,5 +1,5 @@
 #include <unistd.h>
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 int buffer_init_write_allocbuf(buffer* b, int fd, size_t ylen) {
   return buffer_init_allocbuf(b, write, fd, ylen);
diff --git a/buffer/buffer_mmapread.c b/buffer/buffer_mmapread.c
index 121039c..1f5977e 100644
--- a/buffer/buffer_mmapread.c
+++ b/buffer/buffer_mmapread.c
@@ -1,5 +1,5 @@
-#include "buffer.h"
-#include <mmap.h>
+#include <libowfat/buffer.h>
+#include <libowfat/mmap.h>
 
 static ssize_t op() {
   return 0;
diff --git a/mult/imult16.c b/mult/imult16.c
index 06cb797..f2ab6bb 100644
--- a/mult/imult16.c
+++ b/mult/imult16.c
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint16.h"
+#include <libowfat/uint16.h>
 
 int imult16( int16 a, int16 b, int16* c) { return !__builtin_mul_overflow(a,b,c); }
 
 #else
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 int imult16(int16 a,int16 b,int16* c) {
   int32 x=(int32)a*b;
diff --git a/mult/imult32.c b/mult/imult32.c
index 40e5b94..aa2ffe3 100644
--- a/mult/imult32.c
+++ b/mult/imult32.c
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint32.h"
+#include <libowfat/uint32.h>
 
 int imult32( int32 a, int32 b, int32* c) { return !__builtin_mul_overflow(a,b,c); }
 
 #else
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 int imult32(int32 a,int32 b,int32* c) {
   int64 x=(int64)a*b;
diff --git a/mult/imult64.c b/mult/imult64.c
index 0cb06e7..2c8f91d 100644
--- a/mult/imult64.c
+++ b/mult/imult64.c
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint64.h"
+#include <libowfat/uint64.h>
 
 int imult64( int64 a, int64 b, int64* c) { return !__builtin_mul_overflow(a,b,c); }
 
 #else
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 #if defined(__GNUC__) && (defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__alpha__) || defined(__mips64__) || defined(__sparc64__))
 
diff --git a/mult/range_arrayinbuf.c b/mult/range_arrayinbuf.c
index b31c2c5..196ad6b 100644
--- a/mult/range_arrayinbuf.c
+++ b/mult/range_arrayinbuf.c
@@ -1,5 +1,5 @@
-#include <rangecheck.h>
-#include <safemult.h>
+#include <libowfat/rangecheck.h>
+#include <libowfat/safemult.h>
 
 /* does an array of "elements" members of size "membersize" starting at
  * "arraystart" lie inside buf1[0..len-1]? */
diff --git a/mult/range_str2inbuf.c b/mult/range_str2inbuf.c
index f206700..6a2f5c9 100644
--- a/mult/range_str2inbuf.c
+++ b/mult/range_str2inbuf.c
@@ -1,4 +1,4 @@
-#include <rangecheck.h>
+#include <libowfat/rangecheck.h>
 #include <inttypes.h>
 
 /* does an UTF-16 string starting at "ptr" lie in buf[0..len-1]? */
diff --git a/mult/range_str4inbuf.c b/mult/range_str4inbuf.c
index cb11587..af2e0f3 100644
--- a/mult/range_str4inbuf.c
+++ b/mult/range_str4inbuf.c
@@ -1,4 +1,4 @@
-#include <rangecheck.h>
+#include <libowfat/rangecheck.h>
 #include <inttypes.h>
 
 /* does an UTF-32 string starting at "ptr" lie in buf[0..len-1]? */
diff --git a/mult/range_strinbuf.c b/mult/range_strinbuf.c
index f994f5d..4145340 100644
--- a/mult/range_strinbuf.c
+++ b/mult/range_strinbuf.c
@@ -1,4 +1,4 @@
-#include <rangecheck.h>
+#include <libowfat/rangecheck.h>
 
 /* does an ASCIIZ string starting at "ptr" lie in buf[0..len-1]? */
 int range_strinbuf(const void* buf,size_t len,const void* stringstart) {
diff --git a/mult/umult16.c b/mult/umult16.c
index 9bc0170..1bfa3f0 100644
--- a/mult/umult16.c
+++ b/mult/umult16.c
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint16.h"
+#include <libowfat/uint16.h>
 
 int umult16(uint16 a,uint16 b,uint16* c) { return !__builtin_mul_overflow(a,b,c); }
 
 #else
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 int umult16(uint16 a,uint16 b,uint16* c) {
   unsigned long x=(unsigned long)a*b;
diff --git a/mult/umult32.c b/mult/umult32.c
index 557369d..b40e3be 100644
--- a/mult/umult32.c
+++ b/mult/umult32.c
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint32.h"
+#include <libowfat/uint32.h>
 
 int umult32(uint32 a,uint32 b,uint32* c) { return !__builtin_mul_overflow(a,b,c); }
 
 #else
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 int umult32(uint32 a,uint32 b,uint32* c) {
   unsigned long long x=(unsigned long long)a*b;
diff --git a/mult/umult64.c b/mult/umult64.c
index 84b6e4d..3453748 100644
--- a/mult/umult64.c
+++ b/mult/umult64.c
@@ -1,6 +1,6 @@
 #if defined(__GNUC__) && (__GNUC__ >= 5)
 
-#include "uint64.h"
+#include <libowfat/uint64.h>
 
 int umult64(uint64 a,uint64 b,uint64* c) { return !__builtin_mul_overflow(a,b,c); }
 
@@ -8,7 +8,7 @@ int umult64(uint64 a,uint64 b,uint64* c) { return !__builtin_mul_overflow(a,b,c)
 
 #include "haveuint128.h"
 
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 #if defined(HAVE_UINT128)
 
diff --git a/socket/init.c b/socket/init.c
index e4d9569..9c8d757 100644
--- a/socket/init.c
+++ b/socket/init.c
@@ -1,5 +1,5 @@
 #ifdef __MINGW32__
-#include "socket.h"
+#include <libowfat/socket.h>
 #include "windoze.h"
 
 void __winsock_init(void) {
diff --git a/tai/tai_add.c b/tai/tai_add.c
index 4226ab4..39ebbd5 100644
--- a/tai/tai_add.c
+++ b/tai/tai_add.c
@@ -1,4 +1,4 @@
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_add(struct tai *t,const struct tai *u,const struct tai *v)
 {
diff --git a/tai/tai_now.c b/tai/tai_now.c
index 91e84da..8a4eb68 100644
--- a/tai/tai_now.c
+++ b/tai/tai_now.c
@@ -1,5 +1,5 @@
 #include <time.h>
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_now(struct tai *t)
 {
diff --git a/tai/tai_pack.c b/tai/tai_pack.c
index 2d27223..2830aef 100644
--- a/tai/tai_pack.c
+++ b/tai/tai_pack.c
@@ -1,4 +1,4 @@
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_pack(char *s,const struct tai *t)
 {
diff --git a/tai/tai_sub.c b/tai/tai_sub.c
index 6ebf7b2..d162243 100644
--- a/tai/tai_sub.c
+++ b/tai/tai_sub.c
@@ -1,4 +1,4 @@
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_sub(struct tai *t,const struct tai *u,const struct tai *v)
 {
diff --git a/tai/tai_uint.c b/tai/tai_uint.c
index b01184c..a1bffe5 100644
--- a/tai/tai_uint.c
+++ b/tai/tai_uint.c
@@ -1,4 +1,4 @@
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_uint(struct tai *t,unsigned int u)
 {
diff --git a/tai/tai_unpack.c b/tai/tai_unpack.c
index b725ae0..fed2930 100644
--- a/tai/tai_unpack.c
+++ b/tai/tai_unpack.c
@@ -1,4 +1,4 @@
-#include "tai.h"
+#include <libowfat/tai.h>
 
 void tai_unpack(const char *s,struct tai *t)
 {
diff --git a/taia/taia_add.c b/taia/taia_add.c
index 01bd5f4..6832d90 100644
--- a/taia/taia_add.c
+++ b/taia/taia_add.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_addsec.c b/taia/taia_addsec.c
index 32ac295..6134452 100644
--- a/taia/taia_addsec.c
+++ b/taia/taia_addsec.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_approx.c b/taia/taia_approx.c
index 2a3b429..89c2833 100644
--- a/taia/taia_approx.c
+++ b/taia/taia_approx.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 double taia_approx(const struct taia *t)
 {
diff --git a/taia/taia_frac.c b/taia/taia_frac.c
index b6b48bc..f115631 100644
--- a/taia/taia_frac.c
+++ b/taia/taia_frac.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 double taia_frac(const struct taia *t)
 {
diff --git a/taia/taia_half.c b/taia/taia_half.c
index 9d27719..902b3fb 100644
--- a/taia/taia_half.c
+++ b/taia/taia_half.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_less.c b/taia/taia_less.c
index 2d889c8..eab206f 100644
--- a/taia/taia_less.c
+++ b/taia/taia_less.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_now.c b/taia/taia_now.c
index 03c3bc2..2374f0e 100644
--- a/taia/taia_now.c
+++ b/taia/taia_now.c
@@ -1,6 +1,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
-#include "taia.h"
+#include <libowfat/taia.h>
 #ifdef __MINGW32__
 #include <windows.h>
 #endif
diff --git a/taia/taia_pack.c b/taia/taia_pack.c
index b2f9ebf..6c5c1ac 100644
--- a/taia/taia_pack.c
+++ b/taia/taia_pack.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 void taia_pack(char *s,const struct taia *t)
 {
diff --git a/taia/taia_sub.c b/taia/taia_sub.c
index 4e27a3c..aaaaa50 100644
--- a/taia/taia_sub.c
+++ b/taia/taia_sub.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_tai.c b/taia/taia_tai.c
index ef4d4fc..1804b3e 100644
--- a/taia/taia_tai.c
+++ b/taia/taia_tai.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 void taia_tai(const struct taia *ta,struct tai *t)
 {
diff --git a/taia/taia_uint.c b/taia/taia_uint.c
index 167936c..42f98c2 100644
--- a/taia/taia_uint.c
+++ b/taia/taia_uint.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 /* XXX: breaks tai encapsulation */
 
diff --git a/taia/taia_unpack.c b/taia/taia_unpack.c
index d6e5376..aac9962 100644
--- a/taia/taia_unpack.c
+++ b/taia/taia_unpack.c
@@ -1,4 +1,4 @@
-#include "taia.h"
+#include <libowfat/taia.h>
 
 void taia_unpack(const char* s,struct taia* t)
 {