More superflous headers cleanup and tiny fixes

282 files changed, 108 insertions, 454 deletions

diff --git a/Makefile b/Makefile
index dd745c5..a7f9ba0 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ src/include/$(package)/error.h: src/include/$(package)/gccattributes.h $(sysdeps
 	  exec cat src/headers/error-footer ; \
 	} > $@
 
-src/include/$(package)/ip46.h: src/include/$(package)/uint16.h src/include/$(package)/bytestr.h src/include/$(package)/fmtscan.h src/include/$(package)/tai.h src/include/$(package)/socket.h $(sysdeps)/sysdeps src/headers/ip46-header src/headers/ip46-footer src/headers/ip46-with src/headers/ip46-without
+src/include/$(package)/ip46.h: src/include/$(package)/fmtscan.h src/include/$(package)/socket.h $(sysdeps)/sysdeps src/headers/ip46-header src/headers/ip46-footer src/headers/ip46-with src/headers/ip46-without
 	@{ \
 	  cat src/headers/ip46-header ; \
 	  if $(ipv6) && grep -qF 'ipv6: yes' $(sysdeps)/sysdeps ; then cat src/headers/ip46-with ; \
diff --git a/package/deps.mak b/package/deps.mak
index efc4ff9..5a2aab2 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -89,36 +89,36 @@ src/libbiguint/bu_submod.o src/libbiguint/bu_submod.lo: src/libbiguint/bu_submod
 src/libbiguint/bu_unpack.o src/libbiguint/bu_unpack.lo: src/libbiguint/bu_unpack.c src/include/skalibs/biguint.h src/include/skalibs/uint32.h
 src/libbiguint/bu_unpack_big.o src/libbiguint/bu_unpack_big.lo: src/libbiguint/bu_unpack_big.c src/include/skalibs/biguint.h src/include/skalibs/uint32.h
 src/libbiguint/bu_zero.o src/libbiguint/bu_zero.lo: src/libbiguint/bu_zero.c src/include/skalibs/biguint.h
-src/libdatastruct/avlnode_delete.o src/libdatastruct/avlnode_delete.lo: src/libdatastruct/avlnode_delete.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h src/include/skalibs/functypes.h
+src/libdatastruct/avlnode_delete.o src/libdatastruct/avlnode_delete.lo: src/libdatastruct/avlnode_delete.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_doublerotate.o src/libdatastruct/avlnode_doublerotate.lo: src/libdatastruct/avlnode_doublerotate.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_extreme.o src/libdatastruct/avlnode_extreme.lo: src/libdatastruct/avlnode_extreme.c src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_extremenode.o src/libdatastruct/avlnode_extremenode.lo: src/libdatastruct/avlnode_extremenode.c src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_height.o src/libdatastruct/avlnode_height.lo: src/libdatastruct/avlnode_height.c src/include/skalibs/avlnode.h
-src/libdatastruct/avlnode_insertnode.o src/libdatastruct/avlnode_insertnode.lo: src/libdatastruct/avlnode_insertnode.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h src/include/skalibs/functypes.h
+src/libdatastruct/avlnode_insertnode.o src/libdatastruct/avlnode_insertnode.lo: src/libdatastruct/avlnode_insertnode.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_iter.o src/libdatastruct/avlnode_iter.lo: src/libdatastruct/avlnode_iter.c src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_iter_withcancel.o src/libdatastruct/avlnode_iter_withcancel.lo: src/libdatastruct/avlnode_iter_withcancel.c src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_rotate.o src/libdatastruct/avlnode_rotate.lo: src/libdatastruct/avlnode_rotate.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h
-src/libdatastruct/avlnode_search.o src/libdatastruct/avlnode_search.lo: src/libdatastruct/avlnode_search.c src/include/skalibs/avlnode.h src/include/skalibs/functypes.h
-src/libdatastruct/avlnode_searchnode.o src/libdatastruct/avlnode_searchnode.lo: src/libdatastruct/avlnode_searchnode.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h src/include/skalibs/functypes.h
+src/libdatastruct/avlnode_search.o src/libdatastruct/avlnode_search.lo: src/libdatastruct/avlnode_search.c src/include/skalibs/avlnode.h
+src/libdatastruct/avlnode_searchnode.o src/libdatastruct/avlnode_searchnode.lo: src/libdatastruct/avlnode_searchnode.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h
 src/libdatastruct/avlnode_zero.o src/libdatastruct/avlnode_zero.lo: src/libdatastruct/avlnode_zero.c src/include/skalibs/avlnode.h
 src/libdatastruct/avltree_delete.o src/libdatastruct/avltree_delete.lo: src/libdatastruct/avltree_delete.c src/include/skalibs/avlnode.h src/include/skalibs/avltree.h src/include/skalibs/gensetdyn.h
 src/libdatastruct/avltree_free.o src/libdatastruct/avltree_free.lo: src/libdatastruct/avltree_free.c src/include/skalibs/avltree.h src/include/skalibs/gensetdyn.h
-src/libdatastruct/avltree_init.o src/libdatastruct/avltree_init.lo: src/libdatastruct/avltree_init.c src/include/skalibs/avlnode.h src/include/skalibs/avltree.h src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h
+src/libdatastruct/avltree_init.o src/libdatastruct/avltree_init.lo: src/libdatastruct/avltree_init.c src/include/skalibs/avlnode.h src/include/skalibs/avltree.h src/include/skalibs/gensetdyn.h
 src/libdatastruct/avltree_insert.o src/libdatastruct/avltree_insert.lo: src/libdatastruct/avltree_insert.c src/include/skalibs/avltree.h
 src/libdatastruct/avltree_newnode.o src/libdatastruct/avltree_newnode.lo: src/libdatastruct/avltree_newnode.c src/include/skalibs/avlnode.h src/include/skalibs/avltree.h src/include/skalibs/gensetdyn.h
 src/libdatastruct/avltree_zero.o src/libdatastruct/avltree_zero.lo: src/libdatastruct/avltree_zero.c src/include/skalibs/avltree.h
 src/libdatastruct/avltreen_delete.o src/libdatastruct/avltreen_delete.lo: src/libdatastruct/avltreen_delete.c src/include/skalibs/avlnode.h src/include/skalibs/avltreen.h src/include/skalibs/genset.h
-src/libdatastruct/avltreen_init.o src/libdatastruct/avltreen_init.lo: src/libdatastruct/avltreen_init.c src/include/skalibs/avlnode.h src/include/skalibs/avltreen.h src/include/skalibs/functypes.h src/include/skalibs/genset.h
+src/libdatastruct/avltreen_init.o src/libdatastruct/avltreen_init.lo: src/libdatastruct/avltreen_init.c src/include/skalibs/avlnode.h src/include/skalibs/avltreen.h src/include/skalibs/genset.h
 src/libdatastruct/avltreen_insert.o src/libdatastruct/avltreen_insert.lo: src/libdatastruct/avltreen_insert.c src/include/skalibs/avltreen.h
 src/libdatastruct/avltreen_newnode.o src/libdatastruct/avltreen_newnode.lo: src/libdatastruct/avltreen_newnode.c src/include/skalibs/avlnode.h src/include/skalibs/avltreen.h src/include/skalibs/genset.h
 src/libdatastruct/genset.o src/libdatastruct/genset.lo: src/libdatastruct/genset.c src/include/skalibs/genset.h
-src/libdatastruct/genset_iter_nocancel.o src/libdatastruct/genset_iter_nocancel.lo: src/libdatastruct/genset_iter_nocancel.c src/include/skalibs/bitarray.h src/include/skalibs/functypes.h src/include/skalibs/genset.h
-src/libdatastruct/genset_iter_withcancel.o src/libdatastruct/genset_iter_withcancel.lo: src/libdatastruct/genset_iter_withcancel.c src/include/skalibs/functypes.h src/include/skalibs/genset.h
+src/libdatastruct/genset_iter_nocancel.o src/libdatastruct/genset_iter_nocancel.lo: src/libdatastruct/genset_iter_nocancel.c src/include/skalibs/bitarray.h src/include/skalibs/genset.h
+src/libdatastruct/genset_iter_withcancel.o src/libdatastruct/genset_iter_withcancel.lo: src/libdatastruct/genset_iter_withcancel.c src/include/skalibs/genset.h
 src/libdatastruct/gensetdyn_delete.o src/libdatastruct/gensetdyn_delete.lo: src/libdatastruct/gensetdyn_delete.c src/include/skalibs/genalloc.h src/include/skalibs/gensetdyn.h
 src/libdatastruct/gensetdyn_free.o src/libdatastruct/gensetdyn_free.lo: src/libdatastruct/gensetdyn_free.c src/include/skalibs/genalloc.h src/include/skalibs/gensetdyn.h src/include/skalibs/stralloc.h
 src/libdatastruct/gensetdyn_init.o src/libdatastruct/gensetdyn_init.lo: src/libdatastruct/gensetdyn_init.c src/include/skalibs/genalloc.h src/include/skalibs/gensetdyn.h src/include/skalibs/stralloc.h
-src/libdatastruct/gensetdyn_iter.o src/libdatastruct/gensetdyn_iter.lo: src/libdatastruct/gensetdyn_iter.c src/include/skalibs/bitarray.h src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h
-src/libdatastruct/gensetdyn_iter_withcancel.o src/libdatastruct/gensetdyn_iter_withcancel.lo: src/libdatastruct/gensetdyn_iter_withcancel.c src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h
+src/libdatastruct/gensetdyn_iter.o src/libdatastruct/gensetdyn_iter.lo: src/libdatastruct/gensetdyn_iter.c src/include/skalibs/bitarray.h src/include/skalibs/gensetdyn.h
+src/libdatastruct/gensetdyn_iter_withcancel.o src/libdatastruct/gensetdyn_iter_withcancel.lo: src/libdatastruct/gensetdyn_iter_withcancel.c src/include/skalibs/gensetdyn.h
 src/libdatastruct/gensetdyn_new.o src/libdatastruct/gensetdyn_new.lo: src/libdatastruct/gensetdyn_new.c src/include/skalibs/genalloc.h src/include/skalibs/gensetdyn.h
 src/libdatastruct/gensetdyn_ready.o src/libdatastruct/gensetdyn_ready.lo: src/libdatastruct/gensetdyn_ready.c src/include/skalibs/genalloc.h src/include/skalibs/gensetdyn.h src/include/skalibs/stralloc.h
 src/libdatastruct/gensetdyn_zero.o src/libdatastruct/gensetdyn_zero.lo: src/libdatastruct/gensetdyn_zero.c src/include/skalibs/gensetdyn.h
@@ -133,10 +133,10 @@ src/librandom/random_uint32.o src/librandom/random_uint32.lo: src/librandom/rand
 src/librandom/random_unsort.o src/librandom/random_unsort.lo: src/librandom/random_unsort.c src/include/skalibs/random.h
 src/librandom/surf.o src/librandom/surf.lo: src/librandom/surf.c src/include/skalibs/surf.h src/include/skalibs/uint32.h
 src/librandom/surf_init.o src/librandom/surf_init.lo: src/librandom/surf_init.c src/include/skalibs/surf.h src/include/skalibs/uint32.h
-src/libstdcrypto/md5_final.o src/libstdcrypto/md5_final.lo: src/libstdcrypto/md5_final.c src/include/skalibs/bytestr.h src/libstdcrypto/md5-internal.h src/include/skalibs/md5.h src/include/skalibs/uint32.h
+src/libstdcrypto/md5_final.o src/libstdcrypto/md5_final.lo: src/libstdcrypto/md5_final.c src/libstdcrypto/md5-internal.h src/include/skalibs/md5.h src/include/skalibs/uint32.h
 src/libstdcrypto/md5_init.o src/libstdcrypto/md5_init.lo: src/libstdcrypto/md5_init.c src/include/skalibs/md5.h
 src/libstdcrypto/md5_transform.o src/libstdcrypto/md5_transform.lo: src/libstdcrypto/md5_transform.c src/libstdcrypto/md5-internal.h
-src/libstdcrypto/md5_update.o src/libstdcrypto/md5_update.lo: src/libstdcrypto/md5_update.c src/include/skalibs/bytestr.h src/libstdcrypto/md5-internal.h src/include/skalibs/md5.h src/include/skalibs/uint32.h
+src/libstdcrypto/md5_update.o src/libstdcrypto/md5_update.lo: src/libstdcrypto/md5_update.c src/libstdcrypto/md5-internal.h src/include/skalibs/md5.h src/include/skalibs/uint32.h
 src/libstdcrypto/rc4.o src/libstdcrypto/rc4.lo: src/libstdcrypto/rc4.c src/include/skalibs/bytestr.h src/include/skalibs/rc4.h
 src/libstdcrypto/rc4_init.o src/libstdcrypto/rc4_init.lo: src/libstdcrypto/rc4_init.c src/include/skalibs/bytestr.h src/include/skalibs/rc4.h
 src/libstdcrypto/sha1_feed.o src/libstdcrypto/sha1_feed.lo: src/libstdcrypto/sha1_feed.c src/include/skalibs/bytestr.h src/libstdcrypto/sha1-internal.h src/include/skalibs/sha1.h
@@ -154,7 +154,7 @@ src/libstdcrypto/sha512_init.o src/libstdcrypto/sha512_init.lo: src/libstdcrypto
 src/libstdcrypto/sha512_transform.o src/libstdcrypto/sha512_transform.lo: src/libstdcrypto/sha512_transform.c src/libstdcrypto/sha512-internal.h src/include/skalibs/sha512.h src/include/skalibs/uint64.h
 src/libstdcrypto/sha512_update.o src/libstdcrypto/sha512_update.lo: src/libstdcrypto/sha512_update.c src/libstdcrypto/sha512-internal.h src/include/skalibs/sha512.h
 src/libstddjb/absolutepath.o src/libstddjb/absolutepath.lo: src/libstddjb/absolutepath.c src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h
-src/libstddjb/absolutepath_tmp.o src/libstddjb/absolutepath_tmp.lo: src/libstddjb/absolutepath_tmp.c src/include/skalibs/bytestr.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h
+src/libstddjb/absolutepath_tmp.o src/libstddjb/absolutepath_tmp.lo: src/libstddjb/absolutepath_tmp.c src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h
 src/libstddjb/alarm_deadline.o src/libstddjb/alarm_deadline.lo: src/libstddjb/alarm_deadline.c src/libstddjb/alarm-internal.h src/include/skalibs/alarm.h src/include/skalibs/sysdeps.h src/include/skalibs/tai.h
 src/libstddjb/alarm_disable.o src/libstddjb/alarm_disable.lo: src/libstddjb/alarm_disable.c src/libstddjb/alarm-internal.h src/include/skalibs/alarm.h src/include/skalibs/sysdeps.h
 src/libstddjb/alarm_milliseconds.o src/libstddjb/alarm_milliseconds.lo: src/libstddjb/alarm_milliseconds.c src/libstddjb/alarm-internal.h src/include/skalibs/alarm.h src/include/skalibs/sysdeps.h
@@ -163,8 +163,8 @@ src/libstddjb/alloc.o src/libstddjb/alloc.lo: src/libstddjb/alloc.c src/libstddj
 src/libstddjb/alloc_0.o src/libstddjb/alloc_0.lo: src/libstddjb/alloc_0.c src/libstddjb/alloc-internal.h src/include/skalibs/alloc.h src/include/skalibs/sysdeps.h
 src/libstddjb/allread.o src/libstddjb/allread.lo: src/libstddjb/allread.c src/include/skalibs/allreadwrite.h
 src/libstddjb/allreadv.o src/libstddjb/allreadv.lo: src/libstddjb/allreadv.c src/include/skalibs/allreadwrite.h
-src/libstddjb/allreadwrite.o src/libstddjb/allreadwrite.lo: src/libstddjb/allreadwrite.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h
-src/libstddjb/allreadwritev.o src/libstddjb/allreadwritev.lo: src/libstddjb/allreadwritev.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/siovec.h
+src/libstddjb/allreadwrite.o src/libstddjb/allreadwrite.lo: src/libstddjb/allreadwrite.c src/include/skalibs/allreadwrite.h
+src/libstddjb/allreadwritev.o src/libstddjb/allreadwritev.lo: src/libstddjb/allreadwritev.c src/include/skalibs/allreadwrite.h src/include/skalibs/siovec.h
 src/libstddjb/allwrite.o src/libstddjb/allwrite.lo: src/libstddjb/allwrite.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h
 src/libstddjb/allwritev.o src/libstddjb/allwritev.lo: src/libstddjb/allwritev.c src/include/skalibs/allreadwrite.h
 src/libstddjb/baprintf.o src/libstddjb/baprintf.lo: src/libstddjb/baprintf.c src/include/skalibs/bufalloc.h src/include/skalibs/lolstdio.h
@@ -204,7 +204,7 @@ src/libstddjb/buffer_getlen.o src/libstddjb/buffer_getlen.lo: src/libstddjb/buff
 src/libstddjb/buffer_getv.o src/libstddjb/buffer_getv.lo: src/libstddjb/buffer_getv.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h
 src/libstddjb/buffer_getvall.o src/libstddjb/buffer_getvall.lo: src/libstddjb/buffer_getvall.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/siovec.h
 src/libstddjb/buffer_getvallnf.o src/libstddjb/buffer_getvallnf.lo: src/libstddjb/buffer_getvallnf.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h
-src/libstddjb/buffer_init.o src/libstddjb/buffer_init.lo: src/libstddjb/buffer_init.c src/include/skalibs/buffer.h src/include/skalibs/cbuffer.h src/include/skalibs/functypes.h
+src/libstddjb/buffer_init.o src/libstddjb/buffer_init.lo: src/libstddjb/buffer_init.c src/include/skalibs/buffer.h src/include/skalibs/cbuffer.h
 src/libstddjb/buffer_put.o src/libstddjb/buffer_put.lo: src/libstddjb/buffer_put.c src/include/skalibs/buffer.h
 src/libstddjb/buffer_putall.o src/libstddjb/buffer_putall.lo: src/libstddjb/buffer_putall.c src/include/skalibs/buffer.h
 src/libstddjb/buffer_putallnf.o src/libstddjb/buffer_putallnf.lo: src/libstddjb/buffer_putallnf.c src/include/skalibs/buffer.h
@@ -244,13 +244,13 @@ src/libstddjb/cdb_findnext.o src/libstddjb/cdb_findnext.lo: src/libstddjb/cdb_fi
 src/libstddjb/cdb_free.o src/libstddjb/cdb_free.lo: src/libstddjb/cdb_free.c src/include/skalibs/cdb.h
 src/libstddjb/cdb_hash.o src/libstddjb/cdb_hash.lo: src/libstddjb/cdb_hash.c src/include/skalibs/cdb.h
 src/libstddjb/cdb_init_map.o src/libstddjb/cdb_init_map.lo: src/libstddjb/cdb_init_map.c src/include/skalibs/cdb.h
-src/libstddjb/cdb_make.o src/libstddjb/cdb_make.lo: src/libstddjb/cdb_make.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/cdb.h src/include/skalibs/cdb_make.h src/include/skalibs/diuint32.h src/include/skalibs/djbunix.h src/include/skalibs/genalloc.h src/include/skalibs/uint32.h
+src/libstddjb/cdb_make.o src/libstddjb/cdb_make.lo: src/libstddjb/cdb_make.c src/include/skalibs/buffer.h src/include/skalibs/cdb.h src/include/skalibs/cdb_make.h src/include/skalibs/diuint32.h src/include/skalibs/genalloc.h src/include/skalibs/uint32.h
 src/libstddjb/cdb_mapfile.o src/libstddjb/cdb_mapfile.lo: src/libstddjb/cdb_mapfile.c src/include/skalibs/cdb.h src/include/skalibs/djbunix.h
 src/libstddjb/cdb_nextkey.o src/libstddjb/cdb_nextkey.lo: src/libstddjb/cdb_nextkey.c src/include/skalibs/cdb.h src/include/skalibs/uint32.h
-src/libstddjb/cdb_read.o src/libstddjb/cdb_read.lo: src/libstddjb/cdb_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/cdb.h src/include/skalibs/error.h src/include/skalibs/uint32.h
-src/libstddjb/cdb_successor.o src/libstddjb/cdb_successor.lo: src/libstddjb/cdb_successor.c src/include/skalibs/cdb.h src/include/skalibs/uint32.h
+src/libstddjb/cdb_read.o src/libstddjb/cdb_read.lo: src/libstddjb/cdb_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/cdb.h src/include/skalibs/error.h
+src/libstddjb/cdb_successor.o src/libstddjb/cdb_successor.lo: src/libstddjb/cdb_successor.c src/include/skalibs/cdb.h
 src/libstddjb/cdb_zero.o src/libstddjb/cdb_zero.lo: src/libstddjb/cdb_zero.c src/include/skalibs/cdb.h
-src/libstddjb/child_spawn.o src/libstddjb/child_spawn.lo: src/libstddjb/child_spawn.c src/include/skalibs/allreadwrite.h src/include/skalibs/bytestr.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h
+src/libstddjb/child_spawn.o src/libstddjb/child_spawn.lo: src/libstddjb/child_spawn.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h src/include/skalibs/types.h
 src/libstddjb/child_spawn0.o src/libstddjb/child_spawn0.lo: src/libstddjb/child_spawn0.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h
 src/libstddjb/child_spawn1_internal.o src/libstddjb/child_spawn1_internal.lo: src/libstddjb/child_spawn1_internal.c src/include/skalibs/allreadwrite.h src/include/skalibs/config.h src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/sig.h src/include/skalibs/strerr2.h src/include/skalibs/sysdeps.h
 src/libstddjb/child_spawn1_pipe.o src/libstddjb/child_spawn1_pipe.lo: src/libstddjb/child_spawn1_pipe.c src/libstddjb/djbunix-internal.h src/include/skalibs/djbunix.h
@@ -368,19 +368,19 @@ src/libstddjb/ipc_pair.o src/libstddjb/ipc_pair.lo: src/libstddjb/ipc_pair.c src
 src/libstddjb/ipc_recv.o src/libstddjb/ipc_recv.lo: src/libstddjb/ipc_recv.c src/include/skalibs/error.h src/include/skalibs/nonposix.h src/include/skalibs/webipc.h
 src/libstddjb/ipc_send.o src/libstddjb/ipc_send.lo: src/libstddjb/ipc_send.c src/include/skalibs/error.h src/include/skalibs/nonposix.h src/include/skalibs/webipc.h
 src/libstddjb/ipc_stream.o src/libstddjb/ipc_stream.lo: src/libstddjb/ipc_stream.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/webipc.h
-src/libstddjb/ipc_timed_connect.o src/libstddjb/ipc_timed_connect.lo: src/libstddjb/ipc_timed_connect.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/tai.h src/include/skalibs/webipc.h
+src/libstddjb/ipc_timed_connect.o src/libstddjb/ipc_timed_connect.lo: src/libstddjb/ipc_timed_connect.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/webipc.h
 src/libstddjb/leapsecs_add.o src/libstddjb/leapsecs_add.lo: src/libstddjb/leapsecs_add.c src/libstddjb/djbtime-internal.h src/include/skalibs/uint64.h
 src/libstddjb/leapsecs_sub.o src/libstddjb/leapsecs_sub.lo: src/libstddjb/leapsecs_sub.c src/libstddjb/djbtime-internal.h src/include/skalibs/uint64.h
 src/libstddjb/leapsecs_table.o src/libstddjb/leapsecs_table.lo: src/libstddjb/leapsecs_table.c src/libstddjb/djbtime-internal.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/localtm_fmt.o src/libstddjb/localtm_fmt.lo: src/libstddjb/localtm_fmt.c src/include/skalibs/djbtime.h src/include/skalibs/types.h
 src/libstddjb/localtm_from_ltm64.o src/libstddjb/localtm_from_ltm64.lo: src/libstddjb/localtm_from_ltm64.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/localtm_from_sysclock.o src/libstddjb/localtm_from_sysclock.lo: src/libstddjb/localtm_from_sysclock.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
-src/libstddjb/localtm_from_tai.o src/libstddjb/localtm_from_tai.lo: src/libstddjb/localtm_from_tai.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/localtm_from_tai.o src/libstddjb/localtm_from_tai.lo: src/libstddjb/localtm_from_tai.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/localtm_from_utc.o src/libstddjb/localtm_from_utc.lo: src/libstddjb/localtm_from_utc.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/localtm_scan.o src/libstddjb/localtm_scan.lo: src/libstddjb/localtm_scan.c src/include/skalibs/djbtime.h src/include/skalibs/types.h
 src/libstddjb/localtmn_fmt.o src/libstddjb/localtmn_fmt.lo: src/libstddjb/localtmn_fmt.c src/include/skalibs/djbtime.h src/include/skalibs/uint32.h
-src/libstddjb/localtmn_from_sysclock.o src/libstddjb/localtmn_from_sysclock.lo: src/libstddjb/localtmn_from_sysclock.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h
-src/libstddjb/localtmn_from_tain.o src/libstddjb/localtmn_from_tain.lo: src/libstddjb/localtmn_from_tain.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h
+src/libstddjb/localtmn_from_sysclock.o src/libstddjb/localtmn_from_sysclock.lo: src/libstddjb/localtmn_from_sysclock.c src/include/skalibs/djbtime.h
+src/libstddjb/localtmn_from_tain.o src/libstddjb/localtmn_from_tain.lo: src/libstddjb/localtmn_from_tain.c src/include/skalibs/djbtime.h
 src/libstddjb/localtmn_scan.o src/libstddjb/localtmn_scan.lo: src/libstddjb/localtmn_scan.c src/include/skalibs/djbtime.h src/include/skalibs/uint32.h
 src/libstddjb/lock_ex.o src/libstddjb/lock_ex.lo: src/libstddjb/lock_ex.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
 src/libstddjb/lock_exnb.o src/libstddjb/lock_exnb.lo: src/libstddjb/lock_exnb.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
@@ -388,9 +388,9 @@ src/libstddjb/lock_sh.o src/libstddjb/lock_sh.lo: src/libstddjb/lock_sh.c src/in
 src/libstddjb/lock_shnb.o src/libstddjb/lock_shnb.lo: src/libstddjb/lock_shnb.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
 src/libstddjb/lock_un.o src/libstddjb/lock_un.lo: src/libstddjb/lock_un.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
 src/libstddjb/lolprintf.o src/libstddjb/lolprintf.lo: src/libstddjb/lolprintf.c src/include/skalibs/buffer.h src/include/skalibs/lolstdio.h
-src/libstddjb/ltm64_from_localtm.o src/libstddjb/ltm64_from_localtm.lo: src/libstddjb/ltm64_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/ltm64_from_sysclock.o src/libstddjb/ltm64_from_sysclock.lo: src/libstddjb/ltm64_from_sysclock.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/ltm64_from_tai.o src/libstddjb/ltm64_from_tai.lo: src/libstddjb/ltm64_from_tai.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/ltm64_from_localtm.o src/libstddjb/ltm64_from_localtm.lo: src/libstddjb/ltm64_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h
+src/libstddjb/ltm64_from_sysclock.o src/libstddjb/ltm64_from_sysclock.lo: src/libstddjb/ltm64_from_sysclock.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h
+src/libstddjb/ltm64_from_tai.o src/libstddjb/ltm64_from_tai.lo: src/libstddjb/ltm64_from_tai.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h
 src/libstddjb/ltm64_from_utc.o src/libstddjb/ltm64_from_utc.lo: src/libstddjb/ltm64_from_utc.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/mininetstring_read.o src/libstddjb/mininetstring_read.lo: src/libstddjb/mininetstring_read.c src/include/skalibs/allreadwrite.h src/include/skalibs/mininetstring.h src/include/skalibs/stralloc.h
 src/libstddjb/mininetstring_write.o src/libstddjb/mininetstring_write.lo: src/libstddjb/mininetstring_write.c src/include/skalibs/allreadwrite.h src/include/skalibs/mininetstring.h src/include/skalibs/uint16.h
@@ -400,7 +400,7 @@ src/libstddjb/netstring_append.o src/libstddjb/netstring_append.lo: src/libstddj
 src/libstddjb/netstring_appendv.o src/libstddjb/netstring_appendv.lo: src/libstddjb/netstring_appendv.c src/include/skalibs/bytestr.h src/include/skalibs/netstring.h src/include/skalibs/siovec.h src/include/skalibs/stralloc.h src/include/skalibs/uint64.h
 src/libstddjb/netstring_decode.o src/libstddjb/netstring_decode.lo: src/libstddjb/netstring_decode.c src/include/skalibs/netstring.h src/include/skalibs/stralloc.h src/include/skalibs/uint64.h
 src/libstddjb/netstring_encode.o src/libstddjb/netstring_encode.lo: src/libstddjb/netstring_encode.c src/include/skalibs/netstring.h src/include/skalibs/stralloc.h src/include/skalibs/uint64.h
-src/libstddjb/netstring_get.o src/libstddjb/netstring_get.lo: src/libstddjb/netstring_get.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/error.h src/include/skalibs/netstring.h src/include/skalibs/stralloc.h src/include/skalibs/types.h
+src/libstddjb/netstring_get.o src/libstddjb/netstring_get.lo: src/libstddjb/netstring_get.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/error.h src/include/skalibs/netstring.h src/include/skalibs/stralloc.h src/include/skalibs/types.h
 src/libstddjb/netstring_put.o src/libstddjb/netstring_put.lo: src/libstddjb/netstring_put.c src/include/skalibs/buffer.h src/include/skalibs/netstring.h src/include/skalibs/uint64.h
 src/libstddjb/ntp_from_tain.o src/libstddjb/ntp_from_tain.lo: src/libstddjb/ntp_from_tain.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/open2.o src/libstddjb/open2.lo: src/libstddjb/open2.c src/include/skalibs/nonposix.h
@@ -493,13 +493,13 @@ src/libstddjb/socket_conn4.o src/libstddjb/socket_conn4.lo: src/libstddjb/socket
 src/libstddjb/socket_conn4_u32.o src/libstddjb/socket_conn4_u32.lo: src/libstddjb/socket_conn4_u32.c src/include/skalibs/socket.h src/include/skalibs/uint32.h
 src/libstddjb/socket_conn6.o src/libstddjb/socket_conn6.lo: src/libstddjb/socket_conn6.c src/include/skalibs/ip46.h src/include/skalibs/nonposix.h src/include/skalibs/socket.h src/include/skalibs/uint16.h
 src/libstddjb/socket_connected.o src/libstddjb/socket_connected.lo: src/libstddjb/socket_connected.c src/include/skalibs/allreadwrite.h src/include/skalibs/nonposix.h src/include/skalibs/socket.h
-src/libstddjb/socket_deadlineconnstamp4.o src/libstddjb/socket_deadlineconnstamp4.lo: src/libstddjb/socket_deadlineconnstamp4.c src/include/skalibs/error.h src/include/skalibs/socket.h src/include/skalibs/tai.h
-src/libstddjb/socket_deadlineconnstamp46.o src/libstddjb/socket_deadlineconnstamp46.lo: src/libstddjb/socket_deadlineconnstamp46.c src/include/skalibs/error.h src/include/skalibs/ip46.h src/include/skalibs/socket.h src/include/skalibs/tai.h
-src/libstddjb/socket_deadlineconnstamp4_u32.o src/libstddjb/socket_deadlineconnstamp4_u32.lo: src/libstddjb/socket_deadlineconnstamp4_u32.c src/include/skalibs/socket.h src/include/skalibs/tai.h src/include/skalibs/uint32.h
-src/libstddjb/socket_deadlineconnstamp6.o src/libstddjb/socket_deadlineconnstamp6.lo: src/libstddjb/socket_deadlineconnstamp6.c src/include/skalibs/error.h src/include/skalibs/socket.h src/include/skalibs/tai.h
+src/libstddjb/socket_deadlineconnstamp4.o src/libstddjb/socket_deadlineconnstamp4.lo: src/libstddjb/socket_deadlineconnstamp4.c src/include/skalibs/error.h src/include/skalibs/socket.h
+src/libstddjb/socket_deadlineconnstamp46.o src/libstddjb/socket_deadlineconnstamp46.lo: src/libstddjb/socket_deadlineconnstamp46.c src/include/skalibs/error.h src/include/skalibs/ip46.h src/include/skalibs/socket.h
+src/libstddjb/socket_deadlineconnstamp4_u32.o src/libstddjb/socket_deadlineconnstamp4_u32.lo: src/libstddjb/socket_deadlineconnstamp4_u32.c src/include/skalibs/socket.h src/include/skalibs/uint32.h
+src/libstddjb/socket_deadlineconnstamp6.o src/libstddjb/socket_deadlineconnstamp6.lo: src/libstddjb/socket_deadlineconnstamp6.c src/include/skalibs/error.h src/include/skalibs/socket.h
 src/libstddjb/socket_delay.o src/libstddjb/socket_delay.lo: src/libstddjb/socket_delay.c src/include/skalibs/nonposix.h src/include/skalibs/socket.h
 src/libstddjb/socket_internal.o src/libstddjb/socket_internal.lo: src/libstddjb/socket_internal.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
-src/libstddjb/socket_ioloop.o src/libstddjb/socket_ioloop.lo: src/libstddjb/socket_ioloop.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/socket.h src/include/skalibs/tai.h
+src/libstddjb/socket_ioloop.o src/libstddjb/socket_ioloop.lo: src/libstddjb/socket_ioloop.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/socket.h
 src/libstddjb/socket_ioloop_send4.o src/libstddjb/socket_ioloop_send4.lo: src/libstddjb/socket_ioloop_send4.c src/include/skalibs/socket.h
 src/libstddjb/socket_ioloop_send6.o src/libstddjb/socket_ioloop_send6.lo: src/libstddjb/socket_ioloop_send6.c src/include/skalibs/socket.h
 src/libstddjb/socket_local4.o src/libstddjb/socket_local4.lo: src/libstddjb/socket_local4.c src/include/skalibs/nonposix.h src/include/skalibs/socket.h src/include/skalibs/uint16.h
@@ -518,7 +518,7 @@ src/libstddjb/socket_timeoutconn.o src/libstddjb/socket_timeoutconn.lo: src/libs
 src/libstddjb/socket_tryr.o src/libstddjb/socket_tryr.lo: src/libstddjb/socket_tryr.c src/include/skalibs/nonposix.h src/include/skalibs/socket.h
 src/libstddjb/socket_udp4.o src/libstddjb/socket_udp4.lo: src/libstddjb/socket_udp4.c src/include/skalibs/nonposix.h src/include/skalibs/socket.h
 src/libstddjb/socket_udp6.o src/libstddjb/socket_udp6.lo: src/libstddjb/socket_udp6.c src/include/skalibs/djbunix.h src/include/skalibs/ip46.h src/include/skalibs/nonposix.h src/include/skalibs/socket.h
-src/libstddjb/socket_waitconn.o src/libstddjb/socket_waitconn.lo: src/libstddjb/socket_waitconn.c src/include/skalibs/allreadwrite.h src/include/skalibs/iopause.h src/include/skalibs/socket.h src/include/skalibs/tai.h
+src/libstddjb/socket_waitconn.o src/libstddjb/socket_waitconn.lo: src/libstddjb/socket_waitconn.c src/include/skalibs/allreadwrite.h src/include/skalibs/iopause.h src/include/skalibs/socket.h
 src/libstddjb/socketpair_internal.o src/libstddjb/socketpair_internal.lo: src/libstddjb/socketpair_internal.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
 src/libstddjb/stamp.o src/libstddjb/stamp.lo: src/libstddjb/stamp.c src/include/skalibs/tai.h
 src/libstddjb/str_chr.o src/libstddjb/str_chr.lo: src/libstddjb/str_chr.c src/include/skalibs/bytestr.h
@@ -550,18 +550,18 @@ src/libstddjb/strn_fmt.o src/libstddjb/strn_fmt.lo: src/libstddjb/strn_fmt.c src
 src/libstddjb/subgetopt.o src/libstddjb/subgetopt.lo: src/libstddjb/subgetopt.c src/include/skalibs/sgetopt.h
 src/libstddjb/subgetopt_here.o src/libstddjb/subgetopt_here.lo: src/libstddjb/subgetopt_here.c src/include/skalibs/sgetopt.h
 src/libstddjb/sysclock_from_localtm.o src/libstddjb/sysclock_from_localtm.lo: src/libstddjb/sysclock_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
-src/libstddjb/sysclock_from_localtmn.o src/libstddjb/sysclock_from_localtmn.lo: src/libstddjb/sysclock_from_localtmn.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h
-src/libstddjb/sysclock_from_ltm64.o src/libstddjb/sysclock_from_ltm64.lo: src/libstddjb/sysclock_from_ltm64.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/sysclock_from_tai.o src/libstddjb/sysclock_from_tai.lo: src/libstddjb/sysclock_from_tai.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/sysclock_from_localtmn.o src/libstddjb/sysclock_from_localtmn.lo: src/libstddjb/sysclock_from_localtmn.c src/include/skalibs/djbtime.h
+src/libstddjb/sysclock_from_ltm64.o src/libstddjb/sysclock_from_ltm64.lo: src/libstddjb/sysclock_from_ltm64.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
+src/libstddjb/sysclock_from_tai.o src/libstddjb/sysclock_from_tai.lo: src/libstddjb/sysclock_from_tai.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h
 src/libstddjb/sysclock_from_tain.o src/libstddjb/sysclock_from_tain.lo: src/libstddjb/sysclock_from_tain.c src/include/skalibs/tai.h
-src/libstddjb/sysclock_from_utc.o src/libstddjb/sysclock_from_utc.lo: src/libstddjb/sysclock_from_utc.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/sysclock_from_utc.o src/libstddjb/sysclock_from_utc.lo: src/libstddjb/sysclock_from_utc.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/sysclock_get.o src/libstddjb/sysclock_get.lo: src/libstddjb/sysclock_get.c src/include/skalibs/config.h src/include/skalibs/sysdeps.h src/include/skalibs/tai.h
 src/libstddjb/sysclock_set.o src/libstddjb/sysclock_set.lo: src/libstddjb/sysclock_set.c src/include/skalibs/config.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/tai.h
 src/libstddjb/tai_add.o src/libstddjb/tai_add.lo: src/libstddjb/tai_add.c src/include/skalibs/tai.h
-src/libstddjb/tai_from_localtm.o src/libstddjb/tai_from_localtm.lo: src/libstddjb/tai_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/tai_from_ltm64.o src/libstddjb/tai_from_ltm64.lo: src/libstddjb/tai_from_ltm64.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/tai_from_localtm.o src/libstddjb/tai_from_localtm.lo: src/libstddjb/tai_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
+src/libstddjb/tai_from_ltm64.o src/libstddjb/tai_from_ltm64.lo: src/libstddjb/tai_from_ltm64.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h
 src/libstddjb/tai_from_sysclock.o src/libstddjb/tai_from_sysclock.lo: src/libstddjb/tai_from_sysclock.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/tai_from_utc.o src/libstddjb/tai_from_utc.lo: src/libstddjb/tai_from_utc.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/tai_from_utc.o src/libstddjb/tai_from_utc.lo: src/libstddjb/tai_from_utc.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h
 src/libstddjb/tai_now.o src/libstddjb/tai_now.lo: src/libstddjb/tai_now.c src/include/skalibs/tai.h
 src/libstddjb/tai_pack.o src/libstddjb/tai_pack.lo: src/libstddjb/tai_pack.c src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/tai_pack_little.o src/libstddjb/tai_pack_little.lo: src/libstddjb/tai_pack_little.c src/include/skalibs/tai.h src/include/skalibs/uint64.h
@@ -575,7 +575,7 @@ src/libstddjb/tain_approx.o src/libstddjb/tain_approx.lo: src/libstddjb/tain_app
 src/libstddjb/tain_clockmon.o src/libstddjb/tain_clockmon.lo: src/libstddjb/tain_clockmon.c src/include/skalibs/sysdeps.h src/include/skalibs/tai.h
 src/libstddjb/tain_fmt.o src/libstddjb/tain_fmt.lo: src/libstddjb/tain_fmt.c src/include/skalibs/fmtscan.h src/include/skalibs/tai.h
 src/libstddjb/tain_frac.o src/libstddjb/tain_frac.lo: src/libstddjb/tain_frac.c src/include/skalibs/tai.h
-src/libstddjb/tain_from_localtmn.o src/libstddjb/tain_from_localtmn.lo: src/libstddjb/tain_from_localtmn.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h
+src/libstddjb/tain_from_localtmn.o src/libstddjb/tain_from_localtmn.lo: src/libstddjb/tain_from_localtmn.c src/include/skalibs/djbtime.h
 src/libstddjb/tain_from_millisecs.o src/libstddjb/tain_from_millisecs.lo: src/libstddjb/tain_from_millisecs.c src/include/skalibs/tai.h
 src/libstddjb/tain_from_ntp.o src/libstddjb/tain_from_ntp.lo: src/libstddjb/tain_from_ntp.c src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
 src/libstddjb/tain_from_sysclock.o src/libstddjb/tain_from_sysclock.lo: src/libstddjb/tain_from_sysclock.c src/include/skalibs/tai.h
@@ -659,7 +659,7 @@ src/libstddjb/unsanitize_read.o src/libstddjb/unsanitize_read.lo: src/libstddjb/
 src/libstddjb/utc_from_localtm.o src/libstddjb/utc_from_localtm.lo: src/libstddjb/utc_from_localtm.c src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/utc_from_ltm64.o src/libstddjb/utc_from_ltm64.lo: src/libstddjb/utc_from_ltm64.c src/include/skalibs/config.h src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/uint64.h
 src/libstddjb/utc_from_sysclock.o src/libstddjb/utc_from_sysclock.lo: src/libstddjb/utc_from_sysclock.c src/include/skalibs/config.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
-src/libstddjb/utc_from_tai.o src/libstddjb/utc_from_tai.lo: src/libstddjb/utc_from_tai.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h src/include/skalibs/tai.h src/include/skalibs/uint64.h
+src/libstddjb/utc_from_tai.o src/libstddjb/utc_from_tai.lo: src/libstddjb/utc_from_tai.c src/libstddjb/djbtime-internal.h src/include/skalibs/djbtime.h
 src/libstddjb/vbaprintf.o src/libstddjb/vbaprintf.lo: src/libstddjb/vbaprintf.c src/include/skalibs/bufalloc.h src/include/skalibs/lolstdio.h src/include/skalibs/stralloc.h
 src/libstddjb/vbprintf.o src/libstddjb/vbprintf.lo: src/libstddjb/vbprintf.c src/include/skalibs/buffer.h src/include/skalibs/lolstdio.h
 src/libstddjb/wait_nointr.o src/libstddjb/wait_nointr.lo: src/libstddjb/wait_nointr.c src/include/skalibs/djbunix.h
@@ -671,24 +671,24 @@ src/libstddjb/waitn_reap.o src/libstddjb/waitn_reap.lo: src/libstddjb/waitn_reap
 src/libstddjb/waitpid_nointr.o src/libstddjb/waitpid_nointr.lo: src/libstddjb/waitpid_nointr.c src/include/skalibs/djbunix.h
 src/libunixonacid/atomic_rm_rf.o src/libunixonacid/atomic_rm_rf.lo: src/libunixonacid/atomic_rm_rf.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/atomic_rm_rf_tmp.o src/libunixonacid/atomic_rm_rf_tmp.lo: src/libunixonacid/atomic_rm_rf_tmp.c src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/bufalloc_timed_flush.o src/libunixonacid/bufalloc_timed_flush.lo: src/libunixonacid/bufalloc_timed_flush.c src/include/skalibs/bufalloc.h src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/buffer_timed_fill.o src/libunixonacid/buffer_timed_fill.lo: src/libunixonacid/buffer_timed_fill.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/buffer_timed_flush.o src/libunixonacid/buffer_timed_flush.lo: src/libunixonacid/buffer_timed_flush.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/buffer_timed_get.o src/libunixonacid/buffer_timed_get.lo: src/libunixonacid/buffer_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
+src/libunixonacid/bufalloc_timed_flush.o src/libunixonacid/bufalloc_timed_flush.lo: src/libunixonacid/bufalloc_timed_flush.c src/include/skalibs/bufalloc.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h
+src/libunixonacid/buffer_timed_fill.o src/libunixonacid/buffer_timed_fill.lo: src/libunixonacid/buffer_timed_fill.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h
+src/libunixonacid/buffer_timed_flush.o src/libunixonacid/buffer_timed_flush.lo: src/libunixonacid/buffer_timed_flush.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h
+src/libunixonacid/buffer_timed_get.o src/libunixonacid/buffer_timed_get.lo: src/libunixonacid/buffer_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h
 src/libunixonacid/dd_cancel.o src/libunixonacid/dd_cancel.lo: src/libunixonacid/dd_cancel.c src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/dd_close.o src/libunixonacid/dd_close.lo: src/libunixonacid/dd_close.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/dd_commit.o src/libunixonacid/dd_commit.lo: src/libunixonacid/dd_commit.c src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/dd_commit_devino.o src/libunixonacid/dd_commit_devino.lo: src/libunixonacid/dd_commit_devino.c src/include/skalibs/types.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/dd_commit_devino.o src/libunixonacid/dd_commit_devino.lo: src/libunixonacid/dd_commit_devino.c src/include/skalibs/unix-transactional.h
 src/libunixonacid/dd_open_read.o src/libunixonacid/dd_open_read.lo: src/libunixonacid/dd_open_read.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/dd_open_write.o src/libunixonacid/dd_open_write.lo: src/libunixonacid/dd_open_write.c src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/ipc_timed_recv.o src/libunixonacid/ipc_timed_recv.lo: src/libunixonacid/ipc_timed_recv.c src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h src/include/skalibs/webipc.h
-src/libunixonacid/ipc_timed_send.o src/libunixonacid/ipc_timed_send.lo: src/libunixonacid/ipc_timed_send.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
+src/libunixonacid/ipc_timed_recv.o src/libunixonacid/ipc_timed_recv.lo: src/libunixonacid/ipc_timed_recv.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/include/skalibs/webipc.h
+src/libunixonacid/ipc_timed_send.o src/libunixonacid/ipc_timed_send.lo: src/libunixonacid/ipc_timed_send.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/unix-timed.h
 src/libunixonacid/kolbak_call.o src/libunixonacid/kolbak_call.lo: src/libunixonacid/kolbak_call.c src/include/skalibs/kolbak.h src/include/skalibs/unixmessage.h
 src/libunixonacid/kolbak_enqueue.o src/libunixonacid/kolbak_enqueue.lo: src/libunixonacid/kolbak_enqueue.c src/include/skalibs/kolbak.h src/include/skalibs/unixmessage.h
 src/libunixonacid/kolbak_queue_init.o src/libunixonacid/kolbak_queue_init.lo: src/libunixonacid/kolbak_queue_init.c src/include/skalibs/kolbak.h
 src/libunixonacid/kolbak_unenqueue.o src/libunixonacid/kolbak_unenqueue.lo: src/libunixonacid/kolbak_unenqueue.c src/include/skalibs/kolbak.h
 src/libunixonacid/mkdir_unique.o src/libunixonacid/mkdir_unique.lo: src/libunixonacid/mkdir_unique.c src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/netstring_timed_get.o src/libunixonacid/netstring_timed_get.lo: src/libunixonacid/netstring_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/iopause.h src/include/skalibs/netstring.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
+src/libunixonacid/netstring_timed_get.o src/libunixonacid/netstring_timed_get.lo: src/libunixonacid/netstring_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/iopause.h src/include/skalibs/netstring.h src/include/skalibs/unix-timed.h
 src/libunixonacid/open2_at.o src/libunixonacid/open2_at.lo: src/libunixonacid/open2_at.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/open3_at.o src/libunixonacid/open3_at.lo: src/libunixonacid/open3_at.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/open_appendat.o src/libunixonacid/open_appendat.lo: src/libunixonacid/open_appendat.c src/include/skalibs/unix-transactional.h
@@ -699,42 +699,42 @@ src/libunixonacid/open_truncat.o src/libunixonacid/open_truncat.lo: src/libunixo
 src/libunixonacid/open_truncatb.o src/libunixonacid/open_truncatb.lo: src/libunixonacid/open_truncatb.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/open_writeat.o src/libunixonacid/open_writeat.lo: src/libunixonacid/open_writeat.c src/include/skalibs/unix-transactional.h
 src/libunixonacid/open_writeatb.o src/libunixonacid/open_writeatb.lo: src/libunixonacid/open_writeatb.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/opengetlnclose.o src/libunixonacid/opengetlnclose.lo: src/libunixonacid/opengetlnclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/opengetlnclose_at.o src/libunixonacid/opengetlnclose_at.lo: src/libunixonacid/opengetlnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/opengetlnclose.o src/libunixonacid/opengetlnclose.lo: src/libunixonacid/opengetlnclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/opengetlnclose_at.o src/libunixonacid/opengetlnclose_at.lo: src/libunixonacid/opengetlnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/openreadnclose_at.o src/libunixonacid/openreadnclose_at.lo: src/libunixonacid/openreadnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/openslurpclose_at.o src/libunixonacid/openslurpclose_at.lo: src/libunixonacid/openslurpclose_at.c src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/openslurpclose_at.o src/libunixonacid/openslurpclose_at.lo: src/libunixonacid/openslurpclose_at.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/openwritenclose.o src/libunixonacid/openwritenclose.lo: src/libunixonacid/openwritenclose.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/openwritenclose_at.o src/libunixonacid/openwritenclose_at.lo: src/libunixonacid/openwritenclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/openwritenclose_devino.o src/libunixonacid/openwritenclose_devino.lo: src/libunixonacid/openwritenclose_devino.c src/include/skalibs/skamisc.h src/include/skalibs/types.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/openwritenclose_devino.o src/libunixonacid/openwritenclose_devino.lo: src/libunixonacid/openwritenclose_devino.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/openwritenclose_devino_tmp.o src/libunixonacid/openwritenclose_devino_tmp.lo: src/libunixonacid/openwritenclose_devino_tmp.c src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/types.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/openwritenclose_tmp.o src/libunixonacid/openwritenclose_tmp.lo: src/libunixonacid/openwritenclose_tmp.c src/include/skalibs/stralloc.h src/include/skalibs/types.h src/include/skalibs/unix-transactional.h
+src/libunixonacid/openwritenclose_tmp.o src/libunixonacid/openwritenclose_tmp.lo: src/libunixonacid/openwritenclose_tmp.c src/include/skalibs/unix-transactional.h
 src/libunixonacid/openwritevnclose_at.o src/libunixonacid/openwritevnclose_at.lo: src/libunixonacid/openwritevnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/skaclient_default_cb.o src/libunixonacid/skaclient_default_cb.lo: src/libunixonacid/skaclient_default_cb.c src/include/skalibs/error.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_end.o src/libunixonacid/skaclient_end.lo: src/libunixonacid/skaclient_end.c src/include/skalibs/djbunix.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_init.o src/libunixonacid/skaclient_init.lo: src/libunixonacid/skaclient_init.c src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
+src/libunixonacid/skaclient_init.o src/libunixonacid/skaclient_init.lo: src/libunixonacid/skaclient_init.c src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_put.o src/libunixonacid/skaclient_put.lo: src/libunixonacid/skaclient_put.c src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_putmsg.o src/libunixonacid/skaclient_putmsg.lo: src/libunixonacid/skaclient_putmsg.c src/include/skalibs/kolbak.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_putmsgv.o src/libunixonacid/skaclient_putmsgv.lo: src/libunixonacid/skaclient_putmsgv.c src/include/skalibs/kolbak.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_putv.o src/libunixonacid/skaclient_putv.lo: src/libunixonacid/skaclient_putv.c src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_send.o src/libunixonacid/skaclient_send.lo: src/libunixonacid/skaclient_send.c src/include/skalibs/skaclient.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_sendmsg.o src/libunixonacid/skaclient_sendmsg.lo: src/libunixonacid/skaclient_sendmsg.c src/include/skalibs/skaclient.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_sendmsgv.o src/libunixonacid/skaclient_sendmsgv.lo: src/libunixonacid/skaclient_sendmsgv.c src/include/skalibs/skaclient.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_sendv.o src/libunixonacid/skaclient_sendv.lo: src/libunixonacid/skaclient_sendv.c src/include/skalibs/skaclient.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
+src/libunixonacid/skaclient_send.o src/libunixonacid/skaclient_send.lo: src/libunixonacid/skaclient_send.c src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
+src/libunixonacid/skaclient_sendmsg.o src/libunixonacid/skaclient_sendmsg.lo: src/libunixonacid/skaclient_sendmsg.c src/include/skalibs/skaclient.h
+src/libunixonacid/skaclient_sendmsgv.o src/libunixonacid/skaclient_sendmsgv.lo: src/libunixonacid/skaclient_sendmsgv.c src/include/skalibs/skaclient.h
+src/libunixonacid/skaclient_sendv.o src/libunixonacid/skaclient_sendv.lo: src/libunixonacid/skaclient_sendv.c src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
 src/libunixonacid/skaclient_server_ack.o src/libunixonacid/skaclient_server_ack.lo: src/libunixonacid/skaclient_server_ack.c src/include/skalibs/djbunix.h src/include/skalibs/error.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h src/include/skalibs/webipc.h
 src/libunixonacid/skaclient_server_bidi_ack.o src/libunixonacid/skaclient_server_bidi_ack.lo: src/libunixonacid/skaclient_server_bidi_ack.c src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_server_init.o src/libunixonacid/skaclient_server_init.lo: src/libunixonacid/skaclient_server_init.c src/include/skalibs/allreadwrite.h src/include/skalibs/skaclient.h src/include/skalibs/tai.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_start.o src/libunixonacid/skaclient_start.lo: src/libunixonacid/skaclient_start.c src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/tai.h
+src/libunixonacid/skaclient_server_init.o src/libunixonacid/skaclient_server_init.lo: src/libunixonacid/skaclient_server_init.c src/include/skalibs/allreadwrite.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
+src/libunixonacid/skaclient_start.o src/libunixonacid/skaclient_start.lo: src/libunixonacid/skaclient_start.c src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h
 src/libunixonacid/skaclient_start_async.o src/libunixonacid/skaclient_start_async.lo: src/libunixonacid/skaclient_start_async.c src/include/skalibs/error.h src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h src/include/skalibs/webipc.h
 src/libunixonacid/skaclient_start_cb.o src/libunixonacid/skaclient_start_cb.lo: src/libunixonacid/skaclient_start_cb.c src/include/skalibs/error.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h
-src/libunixonacid/skaclient_startf.o src/libunixonacid/skaclient_startf.lo: src/libunixonacid/skaclient_startf.c src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/include/skalibs/tai.h
+src/libunixonacid/skaclient_startf.o src/libunixonacid/skaclient_startf.lo: src/libunixonacid/skaclient_startf.c src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h
 src/libunixonacid/skaclient_startf_async.o src/libunixonacid/skaclient_startf_async.lo: src/libunixonacid/skaclient_startf_async.c src/include/skalibs/djbunix.h src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h
-src/libunixonacid/skaclient_syncify.o src/libunixonacid/skaclient_syncify.lo: src/libunixonacid/skaclient_syncify.c src/include/skalibs/skaclient.h src/include/skalibs/tai.h
+src/libunixonacid/skaclient_syncify.o src/libunixonacid/skaclient_syncify.lo: src/libunixonacid/skaclient_syncify.c src/include/skalibs/skaclient.h
 src/libunixonacid/skaclient_zero.o src/libunixonacid/skaclient_zero.lo: src/libunixonacid/skaclient_zero.c src/include/skalibs/skaclient.h
 src/libunixonacid/stat_at.o src/libunixonacid/stat_at.lo: src/libunixonacid/stat_at.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h
-src/libunixonacid/timed_flush.o src/libunixonacid/timed_flush.lo: src/libunixonacid/timed_flush.c src/include/skalibs/bufalloc.h src/include/skalibs/error.h src/include/skalibs/functypes.h src/include/skalibs/iopause.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/timed_get.o src/libunixonacid/timed_get.lo: src/libunixonacid/timed_get.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/iopause.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/timed_getln.o src/libunixonacid/timed_getln.lo: src/libunixonacid/timed_getln.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
-src/libunixonacid/timed_getlnmax.o src/libunixonacid/timed_getlnmax.lo: src/libunixonacid/timed_getlnmax.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h
+src/libunixonacid/timed_flush.o src/libunixonacid/timed_flush.lo: src/libunixonacid/timed_flush.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/unix-timed.h
+src/libunixonacid/timed_get.o src/libunixonacid/timed_get.lo: src/libunixonacid/timed_get.c src/include/skalibs/allreadwrite.h src/include/skalibs/iopause.h src/include/skalibs/unix-timed.h
+src/libunixonacid/timed_getln.o src/libunixonacid/timed_getln.lo: src/libunixonacid/timed_getln.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/stralloc.h src/include/skalibs/unix-timed.h
+src/libunixonacid/timed_getlnmax.o src/libunixonacid/timed_getlnmax.lo: src/libunixonacid/timed_getlnmax.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/skamisc.h src/include/skalibs/unix-timed.h
 src/libunixonacid/unixconnection_free.o src/libunixonacid/unixconnection_free.lo: src/libunixonacid/unixconnection_free.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixconnection_init.o src/libunixonacid/unixconnection_init.lo: src/libunixonacid/unixconnection_init.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixconnection_init_withclosecb.o src/libunixonacid/unixconnection_init_withclosecb.lo: src/libunixonacid/unixconnection_init_withclosecb.c src/include/skalibs/unixconnection.h src/include/skalibs/unixmessage.h
@@ -750,16 +750,16 @@ src/libunixonacid/unixmessage_receiver_free.o src/libunixonacid/unixmessage_rece
 src/libunixonacid/unixmessage_receiver_init.o src/libunixonacid/unixmessage_receiver_init.lo: src/libunixonacid/unixmessage_receiver_init.c src/include/skalibs/cbuffer.h src/include/skalibs/stralloc.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_1.o src/libunixonacid/unixmessage_sender_1.lo: src/libunixonacid/unixmessage_sender_1.c src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_closecb.o src/libunixonacid/unixmessage_sender_closecb.lo: src/libunixonacid/unixmessage_sender_closecb.c src/include/skalibs/djbunix.h src/include/skalibs/unixmessage.h
-src/libunixonacid/unixmessage_sender_flush.o src/libunixonacid/unixmessage_sender_flush.lo: src/libunixonacid/unixmessage_sender_flush.c src/include/skalibs/allreadwrite.h src/include/skalibs/bytestr.h src/include/skalibs/disize.h src/include/skalibs/djbunix.h src/include/skalibs/genalloc.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/unixmessage.h
+src/libunixonacid/unixmessage_sender_flush.o src/libunixonacid/unixmessage_sender_flush.lo: src/libunixonacid/unixmessage_sender_flush.c src/include/skalibs/allreadwrite.h src/include/skalibs/disize.h src/include/skalibs/djbunix.h src/include/skalibs/genalloc.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_free.o src/libunixonacid/unixmessage_sender_free.lo: src/libunixonacid/unixmessage_sender_free.c src/include/skalibs/disize.h src/include/skalibs/djbunix.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h src/include/skalibs/sysdeps.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_getfd.o src/libunixonacid/unixmessage_sender_getfd.lo: src/libunixonacid/unixmessage_sender_getfd.c src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_init.o src/libunixonacid/unixmessage_sender_init.lo: src/libunixonacid/unixmessage_sender_init.c src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_init_withclosecb.o src/libunixonacid/unixmessage_sender_init_withclosecb.lo: src/libunixonacid/unixmessage_sender_init_withclosecb.c src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h src/include/skalibs/unixmessage.h
-src/libunixonacid/unixmessage_sender_timed_flush.o src/libunixonacid/unixmessage_sender_timed_flush.lo: src/libunixonacid/unixmessage_sender_timed_flush.c src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
+src/libunixonacid/unixmessage_sender_timed_flush.o src/libunixonacid/unixmessage_sender_timed_flush.lo: src/libunixonacid/unixmessage_sender_timed_flush.c src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_x.o src/libunixonacid/unixmessage_sender_x.lo: src/libunixonacid/unixmessage_sender_x.c src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_sender_zero.o src/libunixonacid/unixmessage_sender_zero.lo: src/libunixonacid/unixmessage_sender_zero.c src/include/skalibs/unixmessage.h
-src/libunixonacid/unixmessage_timed_handle.o src/libunixonacid/unixmessage_timed_handle.lo: src/libunixonacid/unixmessage_timed_handle.c src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
-src/libunixonacid/unixmessage_timed_receive.o src/libunixonacid/unixmessage_timed_receive.lo: src/libunixonacid/unixmessage_timed_receive.c src/include/skalibs/functypes.h src/include/skalibs/tai.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
+src/libunixonacid/unixmessage_timed_handle.o src/libunixonacid/unixmessage_timed_handle.lo: src/libunixonacid/unixmessage_timed_handle.c src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
+src/libunixonacid/unixmessage_timed_receive.o src/libunixonacid/unixmessage_timed_receive.lo: src/libunixonacid/unixmessage_timed_receive.c src/include/skalibs/functypes.h src/include/skalibs/unix-timed.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_unput.o src/libunixonacid/unixmessage_unput.lo: src/libunixonacid/unixmessage_unput.c src/include/skalibs/disize.h src/include/skalibs/djbunix.h src/include/skalibs/genalloc.h src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_v_zero.o src/libunixonacid/unixmessage_v_zero.lo: src/libunixonacid/unixmessage_v_zero.c src/include/skalibs/unixmessage.h
 src/libunixonacid/unixmessage_zero.o src/libunixonacid/unixmessage_zero.lo: src/libunixonacid/unixmessage_zero.c src/include/skalibs/unixmessage.h
diff --git a/src/headers/error-header b/src/headers/error-header
index 435a64b..f9913e5 100644
--- a/src/headers/error-header
+++ b/src/headers/error-header
@@ -3,7 +3,6 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include <errno.h>
 #include <skalibs/gccattributes.h>
 
 extern int error_temp (int) gccattr_const ;
diff --git a/src/headers/ip46-header b/src/headers/ip46-header
index 91d0c86..3f872be 100644
--- a/src/headers/ip46-header
+++ b/src/headers/ip46-header
@@ -3,12 +3,10 @@
 #ifndef IP46_H
 #define IP46_H
 
-#include <sys/types.h>
+#include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/fmtscan.h>
-#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
 #define IP46_FMT IP6_FMT
@@ -30,6 +28,6 @@ struct ip46full_s
 #define ip46full_fmt(s, i) ((i)->is6 ? ip6_fmt(s, (i)->ip) : ip4_fmt(s, (i)->ip))
 extern size_t ip46full_scan (char const *, ip46full_t *) ;
 extern size_t ip46full_scanlist (ip46full_t *, size_t, char const *, size_t *) ;
-#define ip46full_from_ip4(i, ip4) (byte_copy((i)->ip, 4, ip4), byte_zero((i)->ip + 4, 12), (i)->is6 = 0)
-#define ip46full_from_ip6(i, ip6) (byte_copy((i)->ip, 16, ip6), (i)->is6 = 1)
+#define ip46full_from_ip4(i, ip4) (memcpy((i)->ip, ip4, 4), memset((i)->ip + 4, 0, 12), (i)->is6 = 0)
+#define ip46full_from_ip6(i, ip6) (memcpy((i)->ip, ip6, 16), (i)->is6 = 1)
 
diff --git a/src/libbiguint/bu_addc.c b/src/libbiguint/bu_addc.c
index 1a7f164..a9c6dce 100644
--- a/src/libbiguint/bu_addc.c
+++ b/src/libbiguint/bu_addc.c
@@ -5,7 +5,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_addmod.c b/src/libbiguint/bu_addmod.c
index de3badc..4ebe2f7 100644
--- a/src/libbiguint/bu_addmod.c
+++ b/src/libbiguint/bu_addmod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_addmod (uint32_t *c, unsigned int cn, uint32_t const *a, unsigned int an, uint32_t const *b, unsigned int bn, uint32_t const *m, unsigned int mn)
diff --git a/src/libbiguint/bu_cmp.c b/src/libbiguint/bu_cmp.c
index f0363b7..0c87e92 100644
--- a/src/libbiguint/bu_cmp.c
+++ b/src/libbiguint/bu_cmp.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_cmp (uint32_t const *a, unsigned int an, uint32_t const *b, unsigned int bn)
diff --git a/src/libbiguint/bu_copy.c b/src/libbiguint/bu_copy.c
index 2822569..10f59b9 100644
--- a/src/libbiguint/bu_copy.c
+++ b/src/libbiguint/bu_copy.c
@@ -5,7 +5,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_copy_internal.c b/src/libbiguint/bu_copy_internal.c
index 41fe205..8de4d5e 100644
--- a/src/libbiguint/bu_copy_internal.c
+++ b/src/libbiguint/bu_copy_internal.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 void bu_copy_internal (uint32_t *b, uint32_t const *a, unsigned int n)
diff --git a/src/libbiguint/bu_div.c b/src/libbiguint/bu_div.c
index 7f2a6c0..a5b6986 100644
--- a/src/libbiguint/bu_div.c
+++ b/src/libbiguint/bu_div.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_div_internal.c b/src/libbiguint/bu_div_internal.c
index 9a0942c..20fb5ef 100644
--- a/src/libbiguint/bu_div_internal.c
+++ b/src/libbiguint/bu_div_internal.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_divmod.c b/src/libbiguint/bu_divmod.c
index 80bcb6a..17b6b7b 100644
--- a/src/libbiguint/bu_divmod.c
+++ b/src/libbiguint/bu_divmod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_divmod_internal.c b/src/libbiguint/bu_divmod_internal.c
index 13e60b0..13d3583 100644
--- a/src/libbiguint/bu_divmod_internal.c
+++ b/src/libbiguint/bu_divmod_internal.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 /*
diff --git a/src/libbiguint/bu_fmt.c b/src/libbiguint/bu_fmt.c
index 4c3e7e7..9402621 100644
--- a/src/libbiguint/bu_fmt.c
+++ b/src/libbiguint/bu_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
diff --git a/src/libbiguint/bu_gcd.c b/src/libbiguint/bu_gcd.c
index 11c14e0..738091e 100644
--- a/src/libbiguint/bu_gcd.c
+++ b/src/libbiguint/bu_gcd.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_gcd (uint32_t *r, unsigned int rn, uint32_t const *a, unsigned int an, uint32_t const *b, unsigned int bn)
diff --git a/src/libbiguint/bu_invmod.c b/src/libbiguint/bu_invmod.c
index 7bd8fee..f9ae9e2 100644
--- a/src/libbiguint/bu_invmod.c
+++ b/src/libbiguint/bu_invmod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 /* x^-1 mod m. */
diff --git a/src/libbiguint/bu_len.c b/src/libbiguint/bu_len.c
index fb63cef..6e66b17 100644
--- a/src/libbiguint/bu_len.c
+++ b/src/libbiguint/bu_len.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 unsigned int bu_len (uint32_t const *a, unsigned int n)
diff --git a/src/libbiguint/bu_mod.c b/src/libbiguint/bu_mod.c
index ba021fb..ca16af0 100644
--- a/src/libbiguint/bu_mod.c
+++ b/src/libbiguint/bu_mod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_mod (uint32_t *a, unsigned int an, uint32_t const *b, unsigned int bn)
diff --git a/src/libbiguint/bu_mulmod.c b/src/libbiguint/bu_mulmod.c
index f44d209..59ed3fc 100644
--- a/src/libbiguint/bu_mulmod.c
+++ b/src/libbiguint/bu_mulmod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
  /* Nope, no Montgomery either. */
diff --git a/src/libbiguint/bu_pack.c b/src/libbiguint/bu_pack.c
index a2d37dc..b43ab04 100644
--- a/src/libbiguint/bu_pack.c
+++ b/src/libbiguint/bu_pack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_pack_big.c b/src/libbiguint/bu_pack_big.c
index d5c5d48..caca082 100644
--- a/src/libbiguint/bu_pack_big.c
+++ b/src/libbiguint/bu_pack_big.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_scan.c b/src/libbiguint/bu_scan.c
index c5deb82..44aa315 100644
--- a/src/libbiguint/bu_scan.c
+++ b/src/libbiguint/bu_scan.c
@@ -5,8 +5,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/bitarray.h>
 #include <skalibs/biguint.h>
diff --git a/src/libbiguint/bu_scan_internal.c b/src/libbiguint/bu_scan_internal.c
index 15c2f0f..d7a75b6 100644
--- a/src/libbiguint/bu_scan_internal.c
+++ b/src/libbiguint/bu_scan_internal.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
diff --git a/src/libbiguint/bu_slbc.c b/src/libbiguint/bu_slbc.c
index a39ef15..13d9b6d 100644
--- a/src/libbiguint/bu_slbc.c
+++ b/src/libbiguint/bu_slbc.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_slbc (uint32_t *a, unsigned int n, int carry)
diff --git a/src/libbiguint/bu_srbc.c b/src/libbiguint/bu_srbc.c
index 5e1fbc4..b23186b 100644
--- a/src/libbiguint/bu_srbc.c
+++ b/src/libbiguint/bu_srbc.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_srbc (uint32_t *a, unsigned int n, int carry)
diff --git a/src/libbiguint/bu_subc.c b/src/libbiguint/bu_subc.c
index b5b6da5..69aa6ab 100644
--- a/src/libbiguint/bu_subc.c
+++ b/src/libbiguint/bu_subc.c
@@ -6,7 +6,6 @@
 #endif
 
 #include <errno.h>
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 int bu_subc (uint32_t *c, unsigned int cn, uint32_t const *a, unsigned int an, uint32_t const *b, unsigned int bn, int carry)
diff --git a/src/libbiguint/bu_submod.c b/src/libbiguint/bu_submod.c
index 7eb065f..98048e1 100644
--- a/src/libbiguint/bu_submod.c
+++ b/src/libbiguint/bu_submod.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_unpack.c b/src/libbiguint/bu_unpack.c
index 6542d30..0c93277 100644
--- a/src/libbiguint/bu_unpack.c
+++ b/src/libbiguint/bu_unpack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_unpack_big.c b/src/libbiguint/bu_unpack_big.c
index 52037ea..97f37cf 100644
--- a/src/libbiguint/bu_unpack_big.c
+++ b/src/libbiguint/bu_unpack_big.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/biguint.h>
 
diff --git a/src/libbiguint/bu_zero.c b/src/libbiguint/bu_zero.c
index 8033740..ab87752 100644
--- a/src/libbiguint/bu_zero.c
+++ b/src/libbiguint/bu_zero.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/biguint.h>
 
 void bu_zero (uint32_t *z, unsigned int n)
diff --git a/src/libdatastruct/avlnode_delete.c b/src/libdatastruct/avlnode_delete.c
index fa9e0b6..8e57bf8 100644
--- a/src/libdatastruct/avlnode_delete.c
+++ b/src/libdatastruct/avlnode_delete.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
-#include <skalibs/functypes.h>
 #include <skalibs/avlnode.h>
 #include "avlnode-internal.h"
 
diff --git a/src/libdatastruct/avlnode_doublerotate.c b/src/libdatastruct/avlnode_doublerotate.c
index cadbf12..df1d5c1 100644
--- a/src/libdatastruct/avlnode_doublerotate.c
+++ b/src/libdatastruct/avlnode_doublerotate.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avlnode.h>
 #include "avlnode-internal.h"
 
diff --git a/src/libdatastruct/avlnode_extreme.c b/src/libdatastruct/avlnode_extreme.c
index cfdf98c..ab08d36 100644
--- a/src/libdatastruct/avlnode_extreme.c
+++ b/src/libdatastruct/avlnode_extreme.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/avlnode.h>
 
diff --git a/src/libdatastruct/avlnode_extremenode.c b/src/libdatastruct/avlnode_extremenode.c
index 2efb491..2830df5 100644
--- a/src/libdatastruct/avlnode_extremenode.c
+++ b/src/libdatastruct/avlnode_extremenode.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avlnode.h>
 
 uint32_t avlnode_extremenode (avlnode const *s, uint32_t max, uint32_t r, int h)
diff --git a/src/libdatastruct/avlnode_height.c b/src/libdatastruct/avlnode_height.c
index 50c5670..bb7249f 100644
--- a/src/libdatastruct/avlnode_height.c
+++ b/src/libdatastruct/avlnode_height.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avlnode.h>
 
 unsigned int avlnode_height (avlnode const *s, uint32_t max, uint32_t r)
diff --git a/src/libdatastruct/avlnode_insertnode.c b/src/libdatastruct/avlnode_insertnode.c
index e7e68b8..fa94811 100644
--- a/src/libdatastruct/avlnode_insertnode.c
+++ b/src/libdatastruct/avlnode_insertnode.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
-#include <skalibs/functypes.h>
 #include <skalibs/avlnode.h>
 #include "avlnode-internal.h"
 
diff --git a/src/libdatastruct/avlnode_iter_withcancel.c b/src/libdatastruct/avlnode_iter_withcancel.c
index d92e767..c029799 100644
--- a/src/libdatastruct/avlnode_iter_withcancel.c
+++ b/src/libdatastruct/avlnode_iter_withcancel.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/avlnode.h>
 
diff --git a/src/libdatastruct/avlnode_rotate.c b/src/libdatastruct/avlnode_rotate.c
index 6f45477..78dc2f9 100644
--- a/src/libdatastruct/avlnode_rotate.c
+++ b/src/libdatastruct/avlnode_rotate.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avlnode.h>
 #include "avlnode-internal.h"
 
diff --git a/src/libdatastruct/avlnode_search.c b/src/libdatastruct/avlnode_search.c
index 85073ca..dca53ee 100644
--- a/src/libdatastruct/avlnode_search.c
+++ b/src/libdatastruct/avlnode_search.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
-#include <skalibs/functypes.h>
 #include <skalibs/avlnode.h>
 
 int avlnode_search (avlnode const *s, uint32_t max, uint32_t r, void const *k, uint32_t *data, dtokfunc_t_ref dtok, cmpfunc_t_ref f, void *p)
diff --git a/src/libdatastruct/avlnode_searchnode.c b/src/libdatastruct/avlnode_searchnode.c
index 40463c7..f655561 100644
--- a/src/libdatastruct/avlnode_searchnode.c
+++ b/src/libdatastruct/avlnode_searchnode.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
-#include <skalibs/functypes.h>
 #include <skalibs/avlnode.h>
 #include "avlnode-internal.h"
 
diff --git a/src/libdatastruct/avltree_init.c b/src/libdatastruct/avltree_init.c
index 9a92d08..fd14a3a 100644
--- a/src/libdatastruct/avltree_init.c
+++ b/src/libdatastruct/avltree_init.c
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <errno.h>
-#include <skalibs/functypes.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/avlnode.h>
 #include <skalibs/avltree.h>
diff --git a/src/libdatastruct/avltree_insert.c b/src/libdatastruct/avltree_insert.c
index d06da2b..b3160b5 100644
--- a/src/libdatastruct/avltree_insert.c
+++ b/src/libdatastruct/avltree_insert.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avltree.h>
 
 int avltree_insert (avltree *t, uint32_t d)
diff --git a/src/libdatastruct/avltree_newnode.c b/src/libdatastruct/avltree_newnode.c
index 07cb813..3d658c6 100644
--- a/src/libdatastruct/avltree_newnode.c
+++ b/src/libdatastruct/avltree_newnode.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/avlnode.h>
diff --git a/src/libdatastruct/avltreen_init.c b/src/libdatastruct/avltreen_init.c
index d831610..3ac4482 100644
--- a/src/libdatastruct/avltreen_init.c
+++ b/src/libdatastruct/avltreen_init.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
-#include <skalibs/functypes.h>
 #include <skalibs/genset.h>
 #include <skalibs/avlnode.h>
 #include <skalibs/avltreen.h>
diff --git a/src/libdatastruct/avltreen_insert.c b/src/libdatastruct/avltreen_insert.c
index 5329340..f2b8584 100644
--- a/src/libdatastruct/avltreen_insert.c
+++ b/src/libdatastruct/avltreen_insert.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/avltreen.h>
 
 int avltreen_insert (avltreen *t, uint32_t d)
diff --git a/src/libdatastruct/avltreen_newnode.c b/src/libdatastruct/avltreen_newnode.c
index 36b1ab6..bbfb639 100644
--- a/src/libdatastruct/avltreen_newnode.c
+++ b/src/libdatastruct/avltreen_newnode.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/genset.h>
 #include <skalibs/avlnode.h>
 #include <skalibs/avltreen.h>
diff --git a/src/libdatastruct/genset.c b/src/libdatastruct/genset.c
index a4e48e0..84390fc 100644
--- a/src/libdatastruct/genset.c
+++ b/src/libdatastruct/genset.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/genset.h>
 
diff --git a/src/libdatastruct/genset_iter_nocancel.c b/src/libdatastruct/genset_iter_nocancel.c
index 9f8ab28..a7248a9 100644
--- a/src/libdatastruct/genset_iter_nocancel.c
+++ b/src/libdatastruct/genset_iter_nocancel.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/bitarray.h>
-#include <skalibs/functypes.h>
 #include <skalibs/genset.h>
 
 uint32_t genset_iter_nocancel (genset *g, uint32_t n, iterfunc_t_ref f, void *stuff)
diff --git a/src/libdatastruct/genset_iter_withcancel.c b/src/libdatastruct/genset_iter_withcancel.c
index a8f9c86..1583cb4 100644
--- a/src/libdatastruct/genset_iter_withcancel.c
+++ b/src/libdatastruct/genset_iter_withcancel.c
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <errno.h>
-#include <skalibs/functypes.h>
 #include <skalibs/genset.h>
 
 int genset_iter_withcancel (genset *g, iterfunc_t_ref f, iterfunc_t_ref cancelf, void *stuff)
diff --git a/src/libdatastruct/gensetdyn_delete.c b/src/libdatastruct/gensetdyn_delete.c
index 019760c..5dcd0d9 100644
--- a/src/libdatastruct/gensetdyn_delete.c
+++ b/src/libdatastruct/gensetdyn_delete.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/gensetdyn.h>
diff --git a/src/libdatastruct/gensetdyn_init.c b/src/libdatastruct/gensetdyn_init.c
index a9eaa70..744c63f 100644
--- a/src/libdatastruct/gensetdyn_init.c
+++ b/src/libdatastruct/gensetdyn_init.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/gensetdyn.h>
diff --git a/src/libdatastruct/gensetdyn_iter.c b/src/libdatastruct/gensetdyn_iter.c
index c5bbcef..7943ab0 100644
--- a/src/libdatastruct/gensetdyn_iter.c
+++ b/src/libdatastruct/gensetdyn_iter.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/bitarray.h>
-#include <skalibs/functypes.h>
 #include <skalibs/gensetdyn.h>
 
 uint32_t gensetdyn_iter_nocancel (gensetdyn *g, uint32_t n, iterfunc_t_ref f, void *stuff)
diff --git a/src/libdatastruct/gensetdyn_iter_withcancel.c b/src/libdatastruct/gensetdyn_iter_withcancel.c
index 07f0c52..0c5c35d 100644
--- a/src/libdatastruct/gensetdyn_iter_withcancel.c
+++ b/src/libdatastruct/gensetdyn_iter_withcancel.c
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <errno.h>
-#include <skalibs/functypes.h>
 #include <skalibs/gensetdyn.h>
 
 int gensetdyn_iter_withcancel (gensetdyn *g, iterfunc_t_ref f, iterfunc_t_ref cancelf, void *stuff)
diff --git a/src/libdatastruct/gensetdyn_new.c b/src/libdatastruct/gensetdyn_new.c
index bf744d5..66d3550 100644
--- a/src/libdatastruct/gensetdyn_new.c
+++ b/src/libdatastruct/gensetdyn_new.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/gensetdyn.h>
 
diff --git a/src/libdatastruct/gensetdyn_ready.c b/src/libdatastruct/gensetdyn_ready.c
index 0bdcd0b..d8e7257 100644
--- a/src/libdatastruct/gensetdyn_ready.c
+++ b/src/libdatastruct/gensetdyn_ready.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/gensetdyn.h>
diff --git a/src/librandom/random_name.c b/src/librandom/random_name.c
index 1c8eb04..bba1331 100644
--- a/src/librandom/random_name.c
+++ b/src/librandom/random_name.c
@@ -1,8 +1,5 @@
 /* ISC license. */
 
-/* MT-unsafe */
-
-#include <sys/types.h>
 #include <skalibs/random.h>
 
 void random_name (char *s, size_t n)
diff --git a/src/librandom/random_sauniquename.c b/src/librandom/random_sauniquename.c
index e63e46c..e44e7ba 100644
--- a/src/librandom/random_sauniquename.c
+++ b/src/librandom/random_sauniquename.c
@@ -1,8 +1,5 @@
 /* ISC license. */
 
-/* MT-unsafe */
-
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/random.h>
diff --git a/src/librandom/random_string.c b/src/librandom/random_string.c
index cd2a0aa..f8cabc3 100644
--- a/src/librandom/random_string.c
+++ b/src/librandom/random_string.c
@@ -17,7 +17,6 @@ void random_string (char *s, size_t n)
 #ifdef SKALIBS_HASGETRANDOM
 
 #include <skalibs/nonposix.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <skalibs/random.h>
diff --git a/src/librandom/random_uint32.c b/src/librandom/random_uint32.c
index 26c0968..6700879 100644
--- a/src/librandom/random_uint32.c
+++ b/src/librandom/random_uint32.c
@@ -16,7 +16,6 @@ uint32_t random_uint32 (uint32_t n)
 
 #else
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/random.h>
 
diff --git a/src/librandom/surf.c b/src/librandom/surf.c
index 1b68fc2..d226249 100644
--- a/src/librandom/surf.c
+++ b/src/librandom/surf.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <string.h>
+#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/surf.h>
 
diff --git a/src/libstdcrypto/md5_final.c b/src/libstdcrypto/md5_final.c
index 706162b..72d6529 100644
--- a/src/libstdcrypto/md5_final.c
+++ b/src/libstdcrypto/md5_final.c
@@ -1,8 +1,7 @@
 /* ISC license. */
 
-#include <stdint.h>
+#include <string.h>
 #include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/md5.h>
 #include "md5-internal.h"
 
@@ -14,18 +13,18 @@ void md5_final (MD5Schedule *ctx, char *digest /* 16 chars */)
   count = 63 - count ;
   if (count < 8)
   {
-    byte_zero(p, count) ;
+    memset(p, 0, count) ;
     uint32_little_endian((char *)ctx->in, 16) ;
     md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
-    byte_zero(ctx->in, 56) ;
+    memset(ctx->in, 0, 56) ;
   }
-  else byte_zero(p, count - 8) ;
+  else memset(p, 0, count - 8) ;
   uint32_little_endian((char *)ctx->in, 14) ;
 
-  byte_copy((char *)ctx->in + 56, 4, (char *)&ctx->bits[0]) ;
-  byte_copy((char *)ctx->in + 60, 4, (char *)&ctx->bits[1]) ;
+  memcpy(ctx->in + 56, &ctx->bits[0], 4) ;
+  memcpy(ctx->in + 60, &ctx->bits[1], 4) ;
 
   md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
   uint32_little_endian((char *)ctx->buf, 4) ;
-  byte_copy(digest, 16, (char *)ctx->buf) ;
+  memcpy(digest, ctx->buf, 16) ;
 }
diff --git a/src/libstdcrypto/md5_transform.c b/src/libstdcrypto/md5_transform.c
index e210e73..90be9ab 100644
--- a/src/libstdcrypto/md5_transform.c
+++ b/src/libstdcrypto/md5_transform.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include "md5-internal.h"
 
 /* #define F1(x, y, z) (x & y | ~x & z) */
diff --git a/src/libstdcrypto/md5_update.c b/src/libstdcrypto/md5_update.c
index 1a88540..d61cd3f 100644
--- a/src/libstdcrypto/md5_update.c
+++ b/src/libstdcrypto/md5_update.c
@@ -1,15 +1,13 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
+#include <string.h>
 #include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/md5.h>
 #include "md5-internal.h"
 
 void md5_update (MD5Schedule *ctx, char const *s, size_t len)
 {
-  uint32 t = ctx->bits[0] ;
+  uint32_t t = ctx->bits[0] ;
   if ((ctx->bits[0] = t + (len << 3)) < t)
     ctx->bits[1]++ ;
   ctx->bits[1] += len >> 29 ;
@@ -20,20 +18,20 @@ void md5_update (MD5Schedule *ctx, char const *s, size_t len)
     t = 64 - t ;
     if (len < t)
     {
-      byte_copy((char *)p, len, s) ;
+      memcpy(p, s, len) ;
       return ;
     }
-    byte_copy((char *)p, t, s) ;
+    memcpy(p, s, t) ;
     uint32_little_endian((char *)ctx->in, 16) ;
     md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
     s += t ; len -= t ;
   }
   while (len >= 64)
   {
-    byte_copy((char *)ctx->in, 64, s) ;
+    memcpy(ctx->in, s, 64) ;
     uint32_little_endian((char *)ctx->in, 16) ;
     md5_transform(ctx->buf, (uint32_t *)ctx->in) ;
     s += 64 ; len -= 64 ;
   }
-  byte_copy((char *)ctx->in, len, s) ;
+  memcpy(ctx->in, s, len) ;
 }
diff --git a/src/libstdcrypto/rc4.c b/src/libstdcrypto/rc4.c
index 2f39b95..482c31a 100644
--- a/src/libstdcrypto/rc4.c
+++ b/src/libstdcrypto/rc4.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 /* Thanks to Thomas Pornin <pornin@bolet.org> */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/rc4.h>
 
diff --git a/src/libstdcrypto/sha1_transform.c b/src/libstdcrypto/sha1_transform.c
index 66a1c52..c323c66 100644
--- a/src/libstdcrypto/sha1_transform.c
+++ b/src/libstdcrypto/sha1_transform.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include "sha1-internal.h"
 
 #define F1(x, y, z) ((x & y) | ((~x) & z))
diff --git a/src/libstdcrypto/sha1_update.c b/src/libstdcrypto/sha1_update.c
index 4fa393c..a35ca8f 100644
--- a/src/libstdcrypto/sha1_update.c
+++ b/src/libstdcrypto/sha1_update.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/sha1.h>
 #include "sha1-internal.h"
 
diff --git a/src/libstdcrypto/sha256_transform.c b/src/libstdcrypto/sha256_transform.c
index 65a51c4..3e6a319 100644
--- a/src/libstdcrypto/sha256_transform.c
+++ b/src/libstdcrypto/sha256_transform.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include "sha256-internal.h"
 
 #define F1(x, y, z) ((x & y) | ((~x) & z))
diff --git a/src/libstdcrypto/sha256_update.c b/src/libstdcrypto/sha256_update.c
index d8bb3b1..70322ee 100644
--- a/src/libstdcrypto/sha256_update.c
+++ b/src/libstdcrypto/sha256_update.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/sha256.h>
 #include "sha256-internal.h"
 
diff --git a/src/libstddjb/absolutepath_tmp.c b/src/libstddjb/absolutepath_tmp.c
index b0e1e07..100a7e9 100644
--- a/src/libstddjb/absolutepath_tmp.c
+++ b/src/libstddjb/absolutepath_tmp.c
@@ -2,10 +2,8 @@
 
 /* MT-unsafe (because of chdir) */
 
-#include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/libstddjb/alloc.c b/src/libstddjb/alloc.c
index 9c29cea..95a5df9 100644
--- a/src/libstddjb/alloc.c
+++ b/src/libstddjb/alloc.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
+#include <skalibs/sysdeps.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <skalibs/sysdeps.h>
 #include <skalibs/alloc.h>
 #include "alloc-internal.h"
 
diff --git a/src/libstddjb/allread.c b/src/libstddjb/allread.c
index 3fdd4ea..3e74d97 100644
--- a/src/libstddjb/allread.c
+++ b/src/libstddjb/allread.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/allreadwrite.h>
 
 size_t allread (int fd, char *buf, size_t len)
diff --git a/src/libstddjb/allreadwrite.c b/src/libstddjb/allreadwrite.c
index 2eaae12..f377cf0 100644
--- a/src/libstddjb/allreadwrite.c
+++ b/src/libstddjb/allreadwrite.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
-#include <skalibs/functypes.h>
 #include <skalibs/allreadwrite.h>
 
 size_t allreadwrite (iofunc_t_ref op, int fd, char *buf, size_t len)
diff --git a/src/libstddjb/allreadwritev.c b/src/libstddjb/allreadwritev.c
index 689bbf6..9d10361 100644
--- a/src/libstddjb/allreadwritev.c
+++ b/src/libstddjb/allreadwritev.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
 #include <sys/uio.h>
-#include <skalibs/functypes.h>
-#include <skalibs/allreadwrite.h>
 #include <skalibs/siovec.h>
+#include <skalibs/allreadwrite.h>
 
 size_t allreadwritev (iovfunc_t_ref op, int fd, struct iovec const *v, unsigned int vlen)
 {
diff --git a/src/libstddjb/allwrite.c b/src/libstddjb/allwrite.c
index 200227d..66bc5d2 100644
--- a/src/libstddjb/allwrite.c
+++ b/src/libstddjb/allwrite.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/functypes.h>
 #include <skalibs/allreadwrite.h>
 
diff --git a/src/libstddjb/bitarray_and.c b/src/libstddjb/bitarray_and.c
index 1677988..98993a2 100644
--- a/src/libstddjb/bitarray_and.c
+++ b/src/libstddjb/bitarray_and.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 void bitarray_and (unsigned char *c, unsigned char const *a, unsigned char const *b, size_t n)
diff --git a/src/libstddjb/bitarray_clearsetn.c b/src/libstddjb/bitarray_clearsetn.c
index 42900ad..fe97045 100644
--- a/src/libstddjb/bitarray_clearsetn.c
+++ b/src/libstddjb/bitarray_clearsetn.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 void bitarray_clearsetn (unsigned char *s, size_t a, size_t b, int h)
diff --git a/src/libstddjb/bitarray_count.c b/src/libstddjb/bitarray_count.c
index 19ed09e..53c094f 100644
--- a/src/libstddjb/bitarray_count.c
+++ b/src/libstddjb/bitarray_count.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 #define B0(n) n, n+1, n+1, n+2
diff --git a/src/libstddjb/bitarray_firstclear.c b/src/libstddjb/bitarray_firstclear.c
index 07dc964..60905b7 100644
--- a/src/libstddjb/bitarray_firstclear.c
+++ b/src/libstddjb/bitarray_firstclear.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 size_t bitarray_firstclear (unsigned char const *s, size_t max)
diff --git a/src/libstddjb/bitarray_firstclear_skip.c b/src/libstddjb/bitarray_firstclear_skip.c
index 0fa2944..5d8eb7b 100644
--- a/src/libstddjb/bitarray_firstclear_skip.c
+++ b/src/libstddjb/bitarray_firstclear_skip.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 size_t bitarray_firstclear_skip (unsigned char const *s, size_t max, size_t skip)
diff --git a/src/libstddjb/bitarray_firstset.c b/src/libstddjb/bitarray_firstset.c
index b3acd73..16ebe88 100644
--- a/src/libstddjb/bitarray_firstset.c
+++ b/src/libstddjb/bitarray_firstset.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 size_t bitarray_firstset (unsigned char const *s, size_t max)
diff --git a/src/libstddjb/bitarray_firstset_skip.c b/src/libstddjb/bitarray_firstset_skip.c
index 0b11c3e..1c39582 100644
--- a/src/libstddjb/bitarray_firstset_skip.c
+++ b/src/libstddjb/bitarray_firstset_skip.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 size_t bitarray_firstset_skip (unsigned char const *s, size_t max, size_t skip)
diff --git a/src/libstddjb/bitarray_not.c b/src/libstddjb/bitarray_not.c
index b3f614d..6c4149e 100644
--- a/src/libstddjb/bitarray_not.c
+++ b/src/libstddjb/bitarray_not.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 void bitarray_not (unsigned char *s, size_t a, size_t b)
diff --git a/src/libstddjb/bitarray_or.c b/src/libstddjb/bitarray_or.c
index 8cc8d58..d05b619 100644
--- a/src/libstddjb/bitarray_or.c
+++ b/src/libstddjb/bitarray_or.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 void bitarray_or (unsigned char *c, unsigned char const *a, unsigned char const *b, size_t n)
diff --git a/src/libstddjb/bitarray_testandpoke.c b/src/libstddjb/bitarray_testandpoke.c
index f12653a..9c6ef8b 100644
--- a/src/libstddjb/bitarray_testandpoke.c
+++ b/src/libstddjb/bitarray_testandpoke.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 int bitarray_testandpoke (unsigned char *s, size_t n, int h)
diff --git a/src/libstddjb/bitarray_xor.c b/src/libstddjb/bitarray_xor.c
index ea59f0c..3140db9 100644
--- a/src/libstddjb/bitarray_xor.c
+++ b/src/libstddjb/bitarray_xor.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bitarray.h>
 
 void bitarray_xor (unsigned char *c, unsigned char const *a, unsigned char const *b, size_t n)
diff --git a/src/libstddjb/bufalloc_getlen.c b/src/libstddjb/bufalloc_getlen.c
index 600e2ab..51dc022 100644
--- a/src/libstddjb/bufalloc_getlen.c
+++ b/src/libstddjb/bufalloc_getlen.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bufalloc.h>
 
 size_t bufalloc_getlen (bufalloc const *ba)
diff --git a/src/libstddjb/bufalloc_init.c b/src/libstddjb/bufalloc_init.c
index c538bc1..6826193 100644
--- a/src/libstddjb/bufalloc_init.c
+++ b/src/libstddjb/bufalloc_init.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/bufalloc.h>
 
diff --git a/src/libstddjb/buffer_get.c b/src/libstddjb/buffer_get.c
index bf01012..fbc0de3 100644
--- a/src/libstddjb/buffer_get.c
+++ b/src/libstddjb/buffer_get.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_getall.c b/src/libstddjb/buffer_getall.c
index dca9e3b..249da6b 100644
--- a/src/libstddjb/buffer_getall.c
+++ b/src/libstddjb/buffer_getall.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
diff --git a/src/libstddjb/buffer_getallnf.c b/src/libstddjb/buffer_getallnf.c
index 9ad0036..cc66ff2 100644
--- a/src/libstddjb/buffer_getallnf.c
+++ b/src/libstddjb/buffer_getallnf.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_getlen.c b/src/libstddjb/buffer_getlen.c
index 47ff472..7d66549 100644
--- a/src/libstddjb/buffer_getlen.c
+++ b/src/libstddjb/buffer_getlen.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/buffer.h>
 
 size_t buffer_getlen (buffer const *b)
diff --git a/src/libstddjb/buffer_init.c b/src/libstddjb/buffer_init.c
index 27fd4e5..e143d70 100644
--- a/src/libstddjb/buffer_init.c
+++ b/src/libstddjb/buffer_init.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/cbuffer.h>
-#include <skalibs/functypes.h>
 #include <skalibs/buffer.h>
 
 int buffer_init (buffer *b, iovfunc_t_ref op, int fd, char *s, size_t len)
diff --git a/src/libstddjb/buffer_put.c b/src/libstddjb/buffer_put.c
index 5e1fb89..24385d3 100644
--- a/src/libstddjb/buffer_put.c
+++ b/src/libstddjb/buffer_put.c
@@ -1,11 +1,10 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/buffer.h>
 
 ssize_t buffer_put (buffer *b, char const *s, size_t len)
 {
   size_t w = 0 ;
   if (!buffer_putall(b, s, len, &w)) return -1 ;
-  return (ssize_t)w ;
+  return w ;
 }
diff --git a/src/libstddjb/buffer_putall.c b/src/libstddjb/buffer_putall.c
index f65b73e..08d82a6 100644
--- a/src/libstddjb/buffer_putall.c
+++ b/src/libstddjb/buffer_putall.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_putallnf.c b/src/libstddjb/buffer_putallnf.c
index 8ee5c54..d7a2909 100644
--- a/src/libstddjb/buffer_putallnf.c
+++ b/src/libstddjb/buffer_putallnf.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_putflush.c b/src/libstddjb/buffer_putflush.c
index 0443180..c41c776 100644
--- a/src/libstddjb/buffer_putflush.c
+++ b/src/libstddjb/buffer_putflush.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/buffer.h>
 
 ssize_t buffer_putflush (buffer *b, char const *s, size_t len)
diff --git a/src/libstddjb/buffer_puts.c b/src/libstddjb/buffer_puts.c
index 84acca8..f0ef94c 100644
--- a/src/libstddjb/buffer_puts.c
+++ b/src/libstddjb/buffer_puts.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_putsall.c b/src/libstddjb/buffer_putsall.c
index 382f74b..bcbb8b3 100644
--- a/src/libstddjb/buffer_putsall.c
+++ b/src/libstddjb/buffer_putsall.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_putsallflush.c b/src/libstddjb/buffer_putsallflush.c
index a63cca7..46cd38d 100644
--- a/src/libstddjb/buffer_putsallflush.c
+++ b/src/libstddjb/buffer_putsallflush.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/buffer_putsflush.c b/src/libstddjb/buffer_putsflush.c
index fc54a3e..fdac9ca 100644
--- a/src/libstddjb/buffer_putsflush.c
+++ b/src/libstddjb/buffer_putsflush.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/buffer.h>
 
diff --git a/src/libstddjb/byte_chr.c b/src/libstddjb/byte_chr.c
index bf0cf52..ba774aa 100644
--- a/src/libstddjb/byte_chr.c
+++ b/src/libstddjb/byte_chr.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/byte_count.c b/src/libstddjb/byte_count.c
index a09e044..c61f09b 100644
--- a/src/libstddjb/byte_count.c
+++ b/src/libstddjb/byte_count.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 
 size_t byte_count (char const *s, size_t len, char b)
diff --git a/src/libstddjb/byte_in.c b/src/libstddjb/byte_in.c
index f777991..b6fcdf4 100644
--- a/src/libstddjb/byte_in.c
+++ b/src/libstddjb/byte_in.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/byte_rchr.c b/src/libstddjb/byte_rchr.c
index 66fbf27..b45b5cd 100644
--- a/src/libstddjb/byte_rchr.c
+++ b/src/libstddjb/byte_rchr.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 
 size_t byte_rchr (char const *s, size_t n, int c)
diff --git a/src/libstddjb/case_lowerb.c b/src/libstddjb/case_lowerb.c
index d2099fc..66284df 100644
--- a/src/libstddjb/case_lowerb.c
+++ b/src/libstddjb/case_lowerb.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 
 void case_lowerb (char *s, size_t len)
diff --git a/src/libstddjb/case_upperb.c b/src/libstddjb/case_upperb.c
index e3fa47b..78ece8f 100644
--- a/src/libstddjb/case_upperb.c
+++ b/src/libstddjb/case_upperb.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 
 void case_upperb (char *s, size_t len)
diff --git a/src/libstddjb/cbuffer_init.c b/src/libstddjb/cbuffer_init.c
index 24ee8b3..b4cb1bc 100644
--- a/src/libstddjb/cbuffer_init.c
+++ b/src/libstddjb/cbuffer_init.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/cbuffer.h>
 
diff --git a/src/libstddjb/cbuffer_rseek.c b/src/libstddjb/cbuffer_rseek.c
index 98532af..9454c71 100644
--- a/src/libstddjb/cbuffer_rseek.c
+++ b/src/libstddjb/cbuffer_rseek.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/cbuffer.h>
 
 size_t cbuffer_rseek (cbuffer_t *b, size_t len)
diff --git a/src/libstddjb/cbuffer_unget.c b/src/libstddjb/cbuffer_unget.c
index 8ada7fe..97a066c 100644
--- a/src/libstddjb/cbuffer_unget.c
+++ b/src/libstddjb/cbuffer_unget.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/cbuffer.h>
 
 size_t cbuffer_unget (cbuffer_t *b, size_t len)
diff --git a/src/libstddjb/cbuffer_unput.c b/src/libstddjb/cbuffer_unput.c
index 40f8f92..0d9faa0 100644
--- a/src/libstddjb/cbuffer_unput.c
+++ b/src/libstddjb/cbuffer_unput.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/cbuffer.h>
 
 size_t cbuffer_unput (cbuffer_t *b, size_t len)
diff --git a/src/libstddjb/cbuffer_wseek.c b/src/libstddjb/cbuffer_wseek.c
index 3d44d44..a36ae62 100644
--- a/src/libstddjb/cbuffer_wseek.c
+++ b/src/libstddjb/cbuffer_wseek.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/cbuffer.h>
 
 size_t cbuffer_wseek (cbuffer_t *b, size_t len)
diff --git a/src/libstddjb/cdb_free.c b/src/libstddjb/cdb_free.c
index dcf9675..04ebf3e 100644
--- a/src/libstddjb/cdb_free.c
+++ b/src/libstddjb/cdb_free.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/mman.h>
 #include <skalibs/cdb.h>
 
diff --git a/src/libstddjb/cdb_hash.c b/src/libstddjb/cdb_hash.c
index 85a11c1..82dcfbc 100644
--- a/src/libstddjb/cdb_hash.c
+++ b/src/libstddjb/cdb_hash.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/cdb.h>
 
 uint32_t cdb_hashadd (uint32_t h, unsigned char c)
diff --git a/src/libstddjb/cdb_init_map.c b/src/libstddjb/cdb_init_map.c
index de9aad0..9851faa 100644
--- a/src/libstddjb/cdb_init_map.c
+++ b/src/libstddjb/cdb_init_map.c
@@ -4,7 +4,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <stdint.h>
diff --git a/src/libstddjb/cdb_make.c b/src/libstddjb/cdb_make.c
index ce5e81e..930d69e 100644
--- a/src/libstddjb/cdb_make.c
+++ b/src/libstddjb/cdb_make.c
@@ -5,9 +5,7 @@
 #include <errno.h>
 #include <skalibs/uint32.h>
 #include <skalibs/diuint32.h>
-#include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
-#include <skalibs/djbunix.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/cdb.h>
 #include <skalibs/cdb_make.h>
@@ -16,7 +14,7 @@ int cdb_make_start (struct cdb_make *c, int fd)
 {
   c->hplist = genalloc_zero ;
   c->pos = 2048 ;
-  buffer_init(&c->b, &fd_writev, fd, c->buf, BUFFER_OUTSIZE) ;
+  buffer_init(&c->b, &buffer_write, fd, c->buf, BUFFER_OUTSIZE) ;
   if (lseek(fd, c->pos, SEEK_SET) < 0) return -1 ;
   return 0 ;
 }
diff --git a/src/libstddjb/cdb_nextkey.c b/src/libstddjb/cdb_nextkey.c
index 51e927f..6de3b24 100644
--- a/src/libstddjb/cdb_nextkey.c
+++ b/src/libstddjb/cdb_nextkey.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/cdb.h>
 
diff --git a/src/libstddjb/cdb_read.c b/src/libstddjb/cdb_read.c
index e857511..fa7b1d3 100644
--- a/src/libstddjb/cdb_read.c
+++ b/src/libstddjb/cdb_read.c
@@ -1,12 +1,10 @@
 /* ISC license. */
 
 #include <unistd.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/error.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/uint32.h>
 #include <skalibs/cdb.h>
 
 int cdb_read (struct cdb *c, char *buf, unsigned int len, uint32_t pos)
diff --git a/src/libstddjb/cdb_successor.c b/src/libstddjb/cdb_successor.c
index 0d7e17f..51956bf 100644
--- a/src/libstddjb/cdb_successor.c
+++ b/src/libstddjb/cdb_successor.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <stdint.h>
-#include <skalibs/uint32.h>
 #include <skalibs/cdb.h>
 
 int cdb_successor (struct cdb *c, char const *key, unsigned int klen)
diff --git a/src/libstddjb/child_spawn.c b/src/libstddjb/child_spawn.c
index db00bd3..62d13cb 100644
--- a/src/libstddjb/child_spawn.c
+++ b/src/libstddjb/child_spawn.c
@@ -3,7 +3,7 @@
 /* MT-unsafe */
 
 #include <skalibs/sysdeps.h>
-#include <sys/types.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
@@ -12,7 +12,6 @@
 #include <signal.h>
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/libstddjb/child_spawn0.c b/src/libstddjb/child_spawn0.c
index 8c114b8..f946515 100644
--- a/src/libstddjb/child_spawn0.c
+++ b/src/libstddjb/child_spawn0.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/sysdeps.h>
-#include <sys/types.h>
 #include <errno.h>
 
 #ifdef SKALIBS_HASPOSIXSPAWN
diff --git a/src/libstddjb/child_spawn1_internal.c b/src/libstddjb/child_spawn1_internal.c
index 8bd1678..feddbc8 100644
--- a/src/libstddjb/child_spawn1_internal.c
+++ b/src/libstddjb/child_spawn1_internal.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/sysdeps.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libstddjb/child_spawn2.c b/src/libstddjb/child_spawn2.c
index d17ff7b..0f08b3d 100644
--- a/src/libstddjb/child_spawn2.c
+++ b/src/libstddjb/child_spawn2.c
@@ -3,7 +3,6 @@
 /* MT-unsafe */
 
 #include <skalibs/sysdeps.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
diff --git a/src/libstddjb/doublefork.c b/src/libstddjb/doublefork.c
index 5d4e0e9..d75a017 100644
--- a/src/libstddjb/doublefork.c
+++ b/src/libstddjb/doublefork.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/libstddjb/env_len.c b/src/libstddjb/env_len.c
index f551ce1..eef30c4 100644
--- a/src/libstddjb/env_len.c
+++ b/src/libstddjb/env_len.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/env.h>
 
 size_t env_len (char const *const *e)
diff --git a/src/libstddjb/env_string.c b/src/libstddjb/env_string.c
index d76e783..e30f095 100644
--- a/src/libstddjb/env_string.c
+++ b/src/libstddjb/env_string.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/env.h>
 
diff --git a/src/libstddjb/envalloc_make.c b/src/libstddjb/envalloc_make.c
index 2c2e553..f8c459a 100644
--- a/src/libstddjb/envalloc_make.c
+++ b/src/libstddjb/envalloc_make.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/env.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/envalloc.h>
diff --git a/src/libstddjb/envalloc_merge.c b/src/libstddjb/envalloc_merge.c
index 84179f0..2747f50 100644
--- a/src/libstddjb/envalloc_merge.c
+++ b/src/libstddjb/envalloc_merge.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/env.h>
 #include <skalibs/genalloc.h>
diff --git a/src/libstddjb/fd_chmod.c b/src/libstddjb/fd_chmod.c
index 109826e..be0e0b8 100644
--- a/src/libstddjb/fd_chmod.c
+++ b/src/libstddjb/fd_chmod.c
@@ -2,7 +2,6 @@
 
  /* OpenBSD manages to bork the fchmod declaration */
 #include <skalibs/nonposix.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libstddjb/fd_chown.c b/src/libstddjb/fd_chown.c
index 8b0028f..80e98c7 100644
--- a/src/libstddjb/fd_chown.c
+++ b/src/libstddjb/fd_chown.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libstddjb/fd_recv.c b/src/libstddjb/fd_recv.c
index 781daa5..7cca4de 100644
--- a/src/libstddjb/fd_recv.c
+++ b/src/libstddjb/fd_recv.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libstddjb/fd_send.c b/src/libstddjb/fd_send.c
index b7ed939..6b6cd02 100644
--- a/src/libstddjb/fd_send.c
+++ b/src/libstddjb/fd_send.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libstddjb/fmtscan-internal.h b/src/libstddjb/fmtscan-internal.h
index 24e5774..34994a0 100644
--- a/src/libstddjb/fmtscan-internal.h
+++ b/src/libstddjb/fmtscan-internal.h
@@ -3,7 +3,6 @@
 #ifndef FMTSCAN_INTERNAL_H
 #define FMTSCAN_INTERNAL_H
 
-#include <sys/types.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/libstddjb/genalloc_deepfree.c b/src/libstddjb/genalloc_deepfree.c
index 1684374..2688047 100644
--- a/src/libstddjb/genalloc_deepfree.c
+++ b/src/libstddjb/genalloc_deepfree.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 
diff --git a/src/libstddjb/genwrite_put_buffer.c b/src/libstddjb/genwrite_put_buffer.c
index 8a710b9..5c5dd3c 100644
--- a/src/libstddjb/genwrite_put_buffer.c
+++ b/src/libstddjb/genwrite_put_buffer.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/buffer.h>
 #include <skalibs/genwrite.h>
 
diff --git a/src/libstddjb/genwrite_put_stralloc.c b/src/libstddjb/genwrite_put_stralloc.c
index 14583fb..a5d402f 100644
--- a/src/libstddjb/genwrite_put_stralloc.c
+++ b/src/libstddjb/genwrite_put_stralloc.c
@@ -1,10 +1,9 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genwrite.h>
 
 ssize_t genwrite_put_stralloc (void *target, char const *s, size_t len)
 {
-  return stralloc_catb((stralloc *)target, s, len) ? (ssize_t)len : -1 ;
+  return stralloc_catb((stralloc *)target, s, len) ? len : -1 ;
 }
diff --git a/src/libstddjb/getpeereid.c b/src/libstddjb/getpeereid.c
index 581aac1..0d36abb 100644
--- a/src/libstddjb/getpeereid.c
+++ b/src/libstddjb/getpeereid.c
@@ -11,7 +11,6 @@
 /* implementation with SO_PEERCRED */
 
 #include <skalibs/nonposix.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <skalibs/getpeereid.h>
@@ -34,8 +33,8 @@ int getpeereid (int s, uid_t *u, gid_t *g)
 /* implementation with getpeerucred() */
 
 #include <skalibs/nonposix.h>
-#include <sys/types.h>
 #include <ucred.h>
+#include <skalibs/getpeereid.h>
 
 int getpeereid (int s, uid_t *u, gid_t *g)
 {
@@ -51,7 +50,6 @@ int getpeereid (int s, uid_t *u, gid_t *g)
 
 /* can't find a real implementation, make a stub */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/getpeereid.h>
 
diff --git a/src/libstddjb/iobuffer_fill.c b/src/libstddjb/iobuffer_fill.c
index a122090..b99e22d 100644
--- a/src/libstddjb/iobuffer_fill.c
+++ b/src/libstddjb/iobuffer_fill.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/iobuffer.h>
 
diff --git a/src/libstddjb/iopause_select.c b/src/libstddjb/iopause_select.c
index 3e56705..b6bdd2d 100644
--- a/src/libstddjb/iopause_select.c
+++ b/src/libstddjb/iopause_select.c
@@ -5,7 +5,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <sys/types.h>
 #include <string.h>  /* Solaris... */
 #include <errno.h>
 #include <sys/select.h>
diff --git a/src/libstddjb/ip46_scan.c b/src/libstddjb/ip46_scan.c
index 73045e6..3e2f645 100644
--- a/src/libstddjb/ip46_scan.c
+++ b/src/libstddjb/ip46_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/ip46.h>
 
diff --git a/src/libstddjb/ip4_fmt.c b/src/libstddjb/ip4_fmt.c
index 9804b38..441df5a 100644
--- a/src/libstddjb/ip4_fmt.c
+++ b/src/libstddjb/ip4_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint32.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/ip4_fmtu32.c b/src/libstddjb/ip4_fmtu32.c
index 9347cef..720df0b 100644
--- a/src/libstddjb/ip4_fmtu32.c
+++ b/src/libstddjb/ip4_fmtu32.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/ip4_scanlist_u32.c b/src/libstddjb/ip4_scanlist_u32.c
index 5515bca..a8f7e75 100644
--- a/src/libstddjb/ip4_scanlist_u32.c
+++ b/src/libstddjb/ip4_scanlist_u32.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/ip4_scanu32.c b/src/libstddjb/ip4_scanu32.c
index ab51ad6..1c0305b 100644
--- a/src/libstddjb/ip4_scanu32.c
+++ b/src/libstddjb/ip4_scanu32.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/ip6_fmt.c b/src/libstddjb/ip6_fmt.c
index 8d56a90..3762365 100644
--- a/src/libstddjb/ip6_fmt.c
+++ b/src/libstddjb/ip6_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/diuint.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/ip6_scan.c b/src/libstddjb/ip6_scan.c
index 1837d3d..db86ceb 100644
--- a/src/libstddjb/ip6_scan.c
+++ b/src/libstddjb/ip6_scan.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
 #include <skalibs/fmtscan.h>
diff --git a/src/libstddjb/ipc_timed_connect.c b/src/libstddjb/ipc_timed_connect.c
index 32e496e..e08b32b 100644
--- a/src/libstddjb/ipc_timed_connect.c
+++ b/src/libstddjb/ipc_timed_connect.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/webipc.h>
 
diff --git a/src/libstddjb/localtm_fmt.c b/src/libstddjb/localtm_fmt.c
index dc8095a..5923fcf 100644
--- a/src/libstddjb/localtm_fmt.c
+++ b/src/libstddjb/localtm_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <time.h>
 #include <skalibs/types.h>
 #include <skalibs/djbtime.h>
diff --git a/src/libstddjb/localtm_from_tai.c b/src/libstddjb/localtm_from_tai.c
index b6ddf47..23705ba 100644
--- a/src/libstddjb/localtm_from_tai.c
+++ b/src/libstddjb/localtm_from_tai.c
@@ -2,7 +2,6 @@
 
 #include <time.h>
 #include <skalibs/uint64.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int localtm_from_tai (struct tm *l, tai_t const *t, int tz)
diff --git a/src/libstddjb/localtm_scan.c b/src/libstddjb/localtm_scan.c
index 60bf61b..02bf3f4 100644
--- a/src/libstddjb/localtm_scan.c
+++ b/src/libstddjb/localtm_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <time.h>
 #include <skalibs/types.h>
diff --git a/src/libstddjb/localtmn_fmt.c b/src/libstddjb/localtmn_fmt.c
index b47911d..25d5786 100644
--- a/src/libstddjb/localtmn_fmt.c
+++ b/src/libstddjb/localtmn_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint32.h>
 #include <skalibs/djbtime.h>
 
diff --git a/src/libstddjb/localtmn_from_sysclock.c b/src/libstddjb/localtmn_from_sysclock.c
index c52bca0..f02927e 100644
--- a/src/libstddjb/localtmn_from_sysclock.c
+++ b/src/libstddjb/localtmn_from_sysclock.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <time.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int localtmn_from_sysclock (localtmn_t *l, tain_t const *a, int tz)
diff --git a/src/libstddjb/localtmn_from_tain.c b/src/libstddjb/localtmn_from_tain.c
index f4858b7..f94f294 100644
--- a/src/libstddjb/localtmn_from_tain.c
+++ b/src/libstddjb/localtmn_from_tain.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <time.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int localtmn_from_tain (localtmn_t *l, tain_t const *a, int tz)
diff --git a/src/libstddjb/localtmn_scan.c b/src/libstddjb/localtmn_scan.c
index d7fffe2..4ecfdd7 100644
--- a/src/libstddjb/localtmn_scan.c
+++ b/src/libstddjb/localtmn_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint32.h>
 #include <skalibs/djbtime.h>
 
diff --git a/src/libstddjb/ltm64_from_localtm.c b/src/libstddjb/ltm64_from_localtm.c
index 78e59a4..81f1156 100644
--- a/src/libstddjb/ltm64_from_localtm.c
+++ b/src/libstddjb/ltm64_from_localtm.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <time.h>
-#include <skalibs/uint64.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
diff --git a/src/libstddjb/ltm64_from_sysclock.c b/src/libstddjb/ltm64_from_sysclock.c
index f169c59..4804b39 100644
--- a/src/libstddjb/ltm64_from_sysclock.c
+++ b/src/libstddjb/ltm64_from_sysclock.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/config.h>
-#include <skalibs/uint64.h>
 #include <skalibs/djbtime.h>
 
 #ifdef SKALIBS_FLAG_CLOCKISTAI
diff --git a/src/libstddjb/ltm64_from_tai.c b/src/libstddjb/ltm64_from_tai.c
index 115c2cf..39e6205 100644
--- a/src/libstddjb/ltm64_from_tai.c
+++ b/src/libstddjb/ltm64_from_tai.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/uint64.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 #include "djbtime-internal.h"
 
diff --git a/src/libstddjb/mininetstring_read.c b/src/libstddjb/mininetstring_read.c
index eaaaf99..34f7a75 100644
--- a/src/libstddjb/mininetstring_read.c
+++ b/src/libstddjb/mininetstring_read.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/stralloc.h>
diff --git a/src/libstddjb/mininetstring_write.c b/src/libstddjb/mininetstring_write.c
index 09833e2..c5b3aba 100644
--- a/src/libstddjb/mininetstring_write.c
+++ b/src/libstddjb/mininetstring_write.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libstddjb/netstring_appendv.c b/src/libstddjb/netstring_appendv.c
index 652bd05..a3398da 100644
--- a/src/libstddjb/netstring_appendv.c
+++ b/src/libstddjb/netstring_appendv.c
@@ -20,7 +20,7 @@ int netstring_appendv (stralloc *sa, struct iovec const *v, unsigned int n)
   sa->len += pos+1 ;
   for (i = 0 ; i < n ; i++)
   {
-    memmove(sa->s + sa->len, v[i].iov_base, v[i].iov_len) ;
+    memcpy(sa->s + sa->len, v[i].iov_base, v[i].iov_len) ;
     sa->len += v[i].iov_len ;
   }
   sa->s[sa->len++] = ',' ;
diff --git a/src/libstddjb/netstring_decode.c b/src/libstddjb/netstring_decode.c
index 68c68e1..b1f4905 100644
--- a/src/libstddjb/netstring_decode.c
+++ b/src/libstddjb/netstring_decode.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
 #include <skalibs/stralloc.h>
diff --git a/src/libstddjb/netstring_get.c b/src/libstddjb/netstring_get.c
index dee6821..9756b2e 100644
--- a/src/libstddjb/netstring_get.c
+++ b/src/libstddjb/netstring_get.c
@@ -1,12 +1,10 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/buffer.h>
-#include <skalibs/cbuffer.h>
 #include <skalibs/error.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/netstring.h>
diff --git a/src/libstddjb/netstring_put.c b/src/libstddjb/netstring_put.c
index 13aa7e0..9d619ff 100644
--- a/src/libstddjb/netstring_put.c
+++ b/src/libstddjb/netstring_put.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/uint64.h>
 #include <skalibs/buffer.h>
diff --git a/src/libstddjb/openreadfileclose.c b/src/libstddjb/openreadfileclose.c
index b78232c..b636c89 100644
--- a/src/libstddjb/openreadfileclose.c
+++ b/src/libstddjb/openreadfileclose.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libstddjb/openwritenclose_suffix.c b/src/libstddjb/openwritenclose_suffix.c
index 8608810..279c19f 100644
--- a/src/libstddjb/openwritenclose_suffix.c
+++ b/src/libstddjb/openwritenclose_suffix.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/libstddjb/openwritenclose_unsafe.c b/src/libstddjb/openwritenclose_unsafe.c
index 3276c3f..3aebd97 100644
--- a/src/libstddjb/openwritenclose_unsafe.c
+++ b/src/libstddjb/openwritenclose_unsafe.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/src/libstddjb/openwritevnclose_suffix.c b/src/libstddjb/openwritevnclose_suffix.c
index d0185e6..2085fd3 100644
--- a/src/libstddjb/openwritevnclose_suffix.c
+++ b/src/libstddjb/openwritevnclose_suffix.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/uio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/libstddjb/openwritevnclose_unsafe.c b/src/libstddjb/openwritevnclose_unsafe.c
index 19c5f88..4bc7b2b 100644
--- a/src/libstddjb/openwritevnclose_unsafe.c
+++ b/src/libstddjb/openwritevnclose_unsafe.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/src/libstddjb/pathexec_r.c b/src/libstddjb/pathexec_r.c
index 38420cb..fe05434 100644
--- a/src/libstddjb/pathexec_r.c
+++ b/src/libstddjb/pathexec_r.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/djbunix.h>
 
 void pathexec_r (char const *const *argv, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen)
diff --git a/src/libstddjb/pathexec_r_name.c b/src/libstddjb/pathexec_r_name.c
index 68016e5..29c0863 100644
--- a/src/libstddjb/pathexec_r_name.c
+++ b/src/libstddjb/pathexec_r_name.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libstddjb/prot_readgroups.c b/src/libstddjb/prot_readgroups.c
index 47cbfc7..431cf1c 100644
--- a/src/libstddjb/prot_readgroups.c
+++ b/src/libstddjb/prot_readgroups.c
@@ -2,7 +2,6 @@
 
 /* MT-unsafe */
 
-#include <sys/types.h>
 #include <grp.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/libstddjb/rm_rf_tmp.c b/src/libstddjb/rm_rf_tmp.c
index d1a8b1a..402ceee 100644
--- a/src/libstddjb/rm_rf_tmp.c
+++ b/src/libstddjb/rm_rf_tmp.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/libstddjb/sanitize_read.c b/src/libstddjb/sanitize_read.c
index 136f7ee..a38f538 100644
--- a/src/libstddjb/sanitize_read.c
+++ b/src/libstddjb/sanitize_read.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
-#include <skalibs/allreadwrite.h>
 #include <skalibs/error.h>
+#include <skalibs/allreadwrite.h>
 
 ssize_t sanitize_read (ssize_t r)
 {
diff --git a/src/libstddjb/selfpipe_read.c b/src/libstddjb/selfpipe_read.c
index 92adf02..cd7098f 100644
--- a/src/libstddjb/selfpipe_read.c
+++ b/src/libstddjb/selfpipe_read.c
@@ -3,7 +3,6 @@
 /* MT-unsafe */
 
 #include <skalibs/sysdeps.h>
-#include <sys/types.h>
 #include <skalibs/allreadwrite.h>
 #include "selfpipe-internal.h"
 #include <skalibs/selfpipe.h>
diff --git a/src/libstddjb/skagetln.c b/src/libstddjb/skagetln.c
index 45d81d8..206bc54 100644
--- a/src/libstddjb/skagetln.c
+++ b/src/libstddjb/skagetln.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
 #include <skalibs/stralloc.h>
diff --git a/src/libstddjb/socket_accept4.c b/src/libstddjb/socket_accept4.c
index a50ade0..c77d0e2 100644
--- a/src/libstddjb/socket_accept4.c
+++ b/src/libstddjb/socket_accept4.c
@@ -4,7 +4,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_accept4_u32.c b/src/libstddjb/socket_accept4_u32.c
index 1817ec3..0646013 100644
--- a/src/libstddjb/socket_accept4_u32.c
+++ b/src/libstddjb/socket_accept4_u32.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/socket.h>
 
diff --git a/src/libstddjb/socket_accept6.c b/src/libstddjb/socket_accept6.c
index ff11bce..6942997 100644
--- a/src/libstddjb/socket_accept6.c
+++ b/src/libstddjb/socket_accept6.c
@@ -5,7 +5,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libstddjb/socket_bind4.c b/src/libstddjb/socket_bind4.c
index 6700b1e..cc1a079 100644
--- a/src/libstddjb/socket_bind4.c
+++ b/src/libstddjb/socket_bind4.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
-#include <stdint.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_bind4r.c b/src/libstddjb/socket_bind4r.c
index 2c43d9a..6c4b7e2 100644
--- a/src/libstddjb/socket_bind4r.c
+++ b/src/libstddjb/socket_bind4r.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
-#include <stdint.h>
 #include <skalibs/socket.h>
 
 int socket_bind4_reuse (int s, char const *ip, uint16_t port)
diff --git a/src/libstddjb/socket_bind6.c b/src/libstddjb/socket_bind6.c
index e6c08fe..ca14052 100644
--- a/src/libstddjb/socket_bind6.c
+++ b/src/libstddjb/socket_bind6.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/socket.h>
diff --git a/src/libstddjb/socket_bind6r.c b/src/libstddjb/socket_bind6r.c
index de24c61..e52876a 100644
--- a/src/libstddjb/socket_bind6r.c
+++ b/src/libstddjb/socket_bind6r.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
-#include <stdint.h>
 #include <skalibs/socket.h>
 
 int socket_bind6_reuse (int s, char const *ip6, uint16_t port)
diff --git a/src/libstddjb/socket_conn4.c b/src/libstddjb/socket_conn4.c
index 78a10b9..ee9eacb 100644
--- a/src/libstddjb/socket_conn4.c
+++ b/src/libstddjb/socket_conn4.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_conn4_u32.c b/src/libstddjb/socket_conn4_u32.c
index 162bf72..6061e65 100644
--- a/src/libstddjb/socket_conn4_u32.c
+++ b/src/libstddjb/socket_conn4_u32.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/socket.h>
 
diff --git a/src/libstddjb/socket_conn6.c b/src/libstddjb/socket_conn6.c
index 9b0316b..612545d 100644
--- a/src/libstddjb/socket_conn6.c
+++ b/src/libstddjb/socket_conn6.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_deadlineconnstamp4.c b/src/libstddjb/socket_deadlineconnstamp4.c
index a57718d..1bb4e34 100644
--- a/src/libstddjb/socket_deadlineconnstamp4.c
+++ b/src/libstddjb/socket_deadlineconnstamp4.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <stdint.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
 int socket_deadlineconnstamp (int s, char const *ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libstddjb/socket_deadlineconnstamp46.c b/src/libstddjb/socket_deadlineconnstamp46.c
index 774e840..437cdb9 100644
--- a/src/libstddjb/socket_deadlineconnstamp46.c
+++ b/src/libstddjb/socket_deadlineconnstamp46.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <stdint.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 #include <skalibs/ip46.h>
 
diff --git a/src/libstddjb/socket_deadlineconnstamp4_u32.c b/src/libstddjb/socket_deadlineconnstamp4_u32.c
index 296f26d..655c379 100644
--- a/src/libstddjb/socket_deadlineconnstamp4_u32.c
+++ b/src/libstddjb/socket_deadlineconnstamp4_u32.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
-#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
 int socket_deadlineconnstamp4_u32 (int s, uint32_t ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libstddjb/socket_deadlineconnstamp6.c b/src/libstddjb/socket_deadlineconnstamp6.c
index 7d7bcab..656a2d1 100644
--- a/src/libstddjb/socket_deadlineconnstamp6.c
+++ b/src/libstddjb/socket_deadlineconnstamp6.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <stdint.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
 int socket_deadlineconnstamp6 (int s, char const *ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libstddjb/socket_ioloop.c b/src/libstddjb/socket_ioloop.c
index 0a3a5ae..0a61a8c 100644
--- a/src/libstddjb/socket_ioloop.c
+++ b/src/libstddjb/socket_ioloop.c
@@ -1,10 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/socket.h>
 
diff --git a/src/libstddjb/socket_ioloop_send4.c b/src/libstddjb/socket_ioloop_send4.c
index 94eb311..10298ef 100644
--- a/src/libstddjb/socket_ioloop_send4.c
+++ b/src/libstddjb/socket_ioloop_send4.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/socket.h>
 
 ssize_t socket_ioloop_send4 (int fd, char *s, size_t len, char *ip, uint16_t *port)
diff --git a/src/libstddjb/socket_ioloop_send6.c b/src/libstddjb/socket_ioloop_send6.c
index f201437..a56f7c6 100644
--- a/src/libstddjb/socket_ioloop_send6.c
+++ b/src/libstddjb/socket_ioloop_send6.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/socket.h>
 
 ssize_t socket_ioloop_send6 (int fd, char *s, size_t len, char *ip, uint16_t *port)
diff --git a/src/libstddjb/socket_local4.c b/src/libstddjb/socket_local4.c
index 60dcd9d..03628e1 100644
--- a/src/libstddjb/socket_local4.c
+++ b/src/libstddjb/socket_local4.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/socket.h>
diff --git a/src/libstddjb/socket_local46.c b/src/libstddjb/socket_local46.c
index 2483996..e913634 100644
--- a/src/libstddjb/socket_local46.c
+++ b/src/libstddjb/socket_local46.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/ip46.h>
diff --git a/src/libstddjb/socket_local6.c b/src/libstddjb/socket_local6.c
index 6c2a0e5..7f74943 100644
--- a/src/libstddjb/socket_local6.c
+++ b/src/libstddjb/socket_local6.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/socket.h>
diff --git a/src/libstddjb/socket_recv4.c b/src/libstddjb/socket_recv4.c
index 09572d9..844cc0b 100644
--- a/src/libstddjb/socket_recv4.c
+++ b/src/libstddjb/socket_recv4.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_recv6.c b/src/libstddjb/socket_recv6.c
index be6ce3f..2c9733f 100644
--- a/src/libstddjb/socket_recv6.c
+++ b/src/libstddjb/socket_recv6.c
@@ -4,7 +4,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/ip46.h>
diff --git a/src/libstddjb/socket_remote4.c b/src/libstddjb/socket_remote4.c
index 57058d5..19b8756 100644
--- a/src/libstddjb/socket_remote4.c
+++ b/src/libstddjb/socket_remote4.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/socket.h>
diff --git a/src/libstddjb/socket_remote46.c b/src/libstddjb/socket_remote46.c
index 6bd24a9..7ae077d 100644
--- a/src/libstddjb/socket_remote46.c
+++ b/src/libstddjb/socket_remote46.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/ip46.h>
diff --git a/src/libstddjb/socket_remote6.c b/src/libstddjb/socket_remote6.c
index 6b282ef..6736581 100644
--- a/src/libstddjb/socket_remote6.c
+++ b/src/libstddjb/socket_remote6.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <skalibs/uint16.h>
 #include <skalibs/ip46.h>
diff --git a/src/libstddjb/socket_send4.c b/src/libstddjb/socket_send4.c
index 0431aa5..cc358cf 100644
--- a/src/libstddjb/socket_send4.c
+++ b/src/libstddjb/socket_send4.c
@@ -3,7 +3,6 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
diff --git a/src/libstddjb/socket_send6.c b/src/libstddjb/socket_send6.c
index 82a0357..807f2a0 100644
--- a/src/libstddjb/socket_send6.c
+++ b/src/libstddjb/socket_send6.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/nonposix.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/src/libstddjb/socket_timeoutconn.c b/src/libstddjb/socket_timeoutconn.c
index 3288426..5f9f0cd 100644
--- a/src/libstddjb/socket_timeoutconn.c
+++ b/src/libstddjb/socket_timeoutconn.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
diff --git a/src/libstddjb/socket_waitconn.c b/src/libstddjb/socket_waitconn.c
index aca0bbf..35eb526 100644
--- a/src/libstddjb/socket_waitconn.c
+++ b/src/libstddjb/socket_waitconn.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/socket.h>
 
diff --git a/src/libstddjb/string_quote.c b/src/libstddjb/string_quote.c
index e648af4..f995beb 100644
--- a/src/libstddjb/string_quote.c
+++ b/src/libstddjb/string_quote.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <string.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 
diff --git a/src/libstddjb/string_unquote_nodelim.c b/src/libstddjb/string_unquote_nodelim.c
index cabe504..8d50ac0 100644
--- a/src/libstddjb/string_unquote_nodelim.c
+++ b/src/libstddjb/string_unquote_nodelim.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/skamisc.h>
 
diff --git a/src/libstddjb/string_unquote_withdelim.c b/src/libstddjb/string_unquote_withdelim.c
index a3e0a68..3ebd07d 100644
--- a/src/libstddjb/string_unquote_withdelim.c
+++ b/src/libstddjb/string_unquote_withdelim.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/error.h>
 #include <skalibs/bytestr.h>
diff --git a/src/libstddjb/strn_fmt.c b/src/libstddjb/strn_fmt.c
index d8cf58f..1a36f2c 100644
--- a/src/libstddjb/strn_fmt.c
+++ b/src/libstddjb/strn_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/types.h>
 #include <skalibs/fmtscan.h>
 
diff --git a/src/libstddjb/sysclock_from_localtmn.c b/src/libstddjb/sysclock_from_localtmn.c
index a0ee34b..2b9dbb9 100644
--- a/src/libstddjb/sysclock_from_localtmn.c
+++ b/src/libstddjb/sysclock_from_localtmn.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int sysclock_from_localtmn (tain_t *a, localtmn_t const *l)
diff --git a/src/libstddjb/sysclock_from_ltm64.c b/src/libstddjb/sysclock_from_ltm64.c
index abdd31d..8e951d5 100644
--- a/src/libstddjb/sysclock_from_ltm64.c
+++ b/src/libstddjb/sysclock_from_ltm64.c
@@ -6,8 +6,6 @@
 
 #ifdef SKALIBS_FLAG_CLOCKISTAI
 
-#include <skalibs/tai.h>
-
 int sysclock_from_ltm64 (uint64_t *u)
 {
   tai_t t ;
diff --git a/src/libstddjb/sysclock_from_tai.c b/src/libstddjb/sysclock_from_tai.c
index 02e5e2a..003e962 100644
--- a/src/libstddjb/sysclock_from_tai.c
+++ b/src/libstddjb/sysclock_from_tai.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <skalibs/config.h>
-#include <skalibs/uint64.h>
 #include <skalibs/tai.h>
 
 #ifdef SKALIBS_FLAG_CLOCKISTAI
diff --git a/src/libstddjb/sysclock_from_utc.c b/src/libstddjb/sysclock_from_utc.c
index 3f862aa..49fe558 100644
--- a/src/libstddjb/sysclock_from_utc.c
+++ b/src/libstddjb/sysclock_from_utc.c
@@ -7,8 +7,6 @@
 
 #ifdef SKALIBS_FLAG_CLOCKISTAI
 
-#include <skalibs/tai.h>
-
 int sysclock_from_utc (uint64_t *u)
 {
   tai_t t ;
diff --git a/src/libstddjb/tai_from_localtm.c b/src/libstddjb/tai_from_localtm.c
index b372bf5..b2dfbc6 100644
--- a/src/libstddjb/tai_from_localtm.c
+++ b/src/libstddjb/tai_from_localtm.c
@@ -2,7 +2,6 @@
 
 #include <time.h>
 #include <skalibs/uint64.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int tai_from_localtm (tai_t *t, struct tm const *l)
diff --git a/src/libstddjb/tai_from_ltm64.c b/src/libstddjb/tai_from_ltm64.c
index a2a4e4c..be3a11b 100644
--- a/src/libstddjb/tai_from_ltm64.c
+++ b/src/libstddjb/tai_from_ltm64.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/uint64.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 #include "djbtime-internal.h"
 
diff --git a/src/libstddjb/tai_from_utc.c b/src/libstddjb/tai_from_utc.c
index 1b9762b..f1cea31 100644
--- a/src/libstddjb/tai_from_utc.c
+++ b/src/libstddjb/tai_from_utc.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/uint64.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 #include "djbtime-internal.h"
diff --git a/src/libstddjb/tain_fmt.c b/src/libstddjb/tain_fmt.c
index ce64832..54f0e6a 100644
--- a/src/libstddjb/tain_fmt.c
+++ b/src/libstddjb/tain_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/tai.h>
 
diff --git a/src/libstddjb/tain_from_localtmn.c b/src/libstddjb/tain_from_localtmn.c
index cc9bd19..3a71889 100644
--- a/src/libstddjb/tain_from_localtmn.c
+++ b/src/libstddjb/tain_from_localtmn.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 
 int tain_from_localtmn (tain_t *a, localtmn_t const *l)
diff --git a/src/libstddjb/tain_scan.c b/src/libstddjb/tain_scan.c
index 6ab181d..2522726 100644
--- a/src/libstddjb/tain_scan.c
+++ b/src/libstddjb/tain_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/tai.h>
 
diff --git a/src/libstddjb/timestamp_fmt.c b/src/libstddjb/timestamp_fmt.c
index 816e523..78d2dc2 100644
--- a/src/libstddjb/timestamp_fmt.c
+++ b/src/libstddjb/timestamp_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/tai.h>
 
 size_t timestamp_fmt (char *s, tain_t const *a)
diff --git a/src/libstddjb/timestamp_scan.c b/src/libstddjb/timestamp_scan.c
index 95671ee..677cf09 100644
--- a/src/libstddjb/timestamp_scan.c
+++ b/src/libstddjb/timestamp_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/tai.h>
 
 size_t timestamp_scan (char const *s, tain_t *a)
diff --git a/src/libstddjb/ucharn_findlen.c b/src/libstddjb/ucharn_findlen.c
index b770035..64c64c0 100644
--- a/src/libstddjb/ucharn_findlen.c
+++ b/src/libstddjb/ucharn_findlen.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 
 size_t ucharn_findlen (char const *s)
diff --git a/src/libstddjb/ucharn_fmt.c b/src/libstddjb/ucharn_fmt.c
index cf2b2af..40fe5f7 100644
--- a/src/libstddjb/ucharn_fmt.c
+++ b/src/libstddjb/ucharn_fmt.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 
 size_t ucharn_fmt (char *s, char const *key, size_t n)
diff --git a/src/libstddjb/ucharn_fmt_little.c b/src/libstddjb/ucharn_fmt_little.c
index 3848082..b66886c 100644
--- a/src/libstddjb/ucharn_fmt_little.c
+++ b/src/libstddjb/ucharn_fmt_little.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 
 size_t ucharn_fmt_little (char *s, char const *key, size_t n)
diff --git a/src/libstddjb/ucharn_scan.c b/src/libstddjb/ucharn_scan.c
index 6a9b1fd..64c46e4 100644
--- a/src/libstddjb/ucharn_scan.c
+++ b/src/libstddjb/ucharn_scan.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 
 size_t ucharn_scan (char const *s, char *key, size_t n)
diff --git a/src/libstddjb/ucharn_scan_little.c b/src/libstddjb/ucharn_scan_little.c
index 52fdd62..a6a4694 100644
--- a/src/libstddjb/ucharn_scan_little.c
+++ b/src/libstddjb/ucharn_scan_little.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/fmtscan.h>
 
 size_t ucharn_scan_little (char const *s, char *key, size_t n)
diff --git a/src/libstddjb/uint16_pack.c b/src/libstddjb/uint16_pack.c
index 56b5dcb..de0a09b 100644
--- a/src/libstddjb/uint16_pack.c
+++ b/src/libstddjb/uint16_pack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint16.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/uint16_pack_big.c b/src/libstddjb/uint16_pack_big.c
index b5b0f01..f73f88b 100644
--- a/src/libstddjb/uint16_pack_big.c
+++ b/src/libstddjb/uint16_pack_big.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint16.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/uint16_reverse.c b/src/libstddjb/uint16_reverse.c
index 9a6e8d9..b4fe2c8 100644
--- a/src/libstddjb/uint16_reverse.c
+++ b/src/libstddjb/uint16_reverse.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint16.h>
 
 void uint16_reverse (char *s, size_t n)
diff --git a/src/libstddjb/uint32_pack.c b/src/libstddjb/uint32_pack.c
index 75febe0..a5320e0 100644
--- a/src/libstddjb/uint32_pack.c
+++ b/src/libstddjb/uint32_pack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/uint32_pack_big.c b/src/libstddjb/uint32_pack_big.c
index 02f0eb6..2a17a7b 100644
--- a/src/libstddjb/uint32_pack_big.c
+++ b/src/libstddjb/uint32_pack_big.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <skalibs/uint32.h>
 #include <skalibs/bytestr.h>
 
diff --git a/src/libstddjb/uint32_reverse.c b/src/libstddjb/uint32_reverse.c
index 6a33f23..51c9877 100644
--- a/src/libstddjb/uint32_reverse.c
+++ b/src/libstddjb/uint32_reverse.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint32.h>
 
 void uint32_reverse (char *s, size_t n)
diff --git a/src/libstddjb/uint64_reverse.c b/src/libstddjb/uint64_reverse.c
index 29e81d1..5a616f5 100644
--- a/src/libstddjb/uint64_reverse.c
+++ b/src/libstddjb/uint64_reverse.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/uint64.h>
 
 void uint64_reverse (char *s, size_t n)
diff --git a/src/libstddjb/unsanitize_read.c b/src/libstddjb/unsanitize_read.c
index d21cacd..585e103 100644
--- a/src/libstddjb/unsanitize_read.c
+++ b/src/libstddjb/unsanitize_read.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/error.h>
 #include <skalibs/allreadwrite.h>
diff --git a/src/libstddjb/utc_from_tai.c b/src/libstddjb/utc_from_tai.c
index 1e5e094..0b46721 100644
--- a/src/libstddjb/utc_from_tai.c
+++ b/src/libstddjb/utc_from_tai.c
@@ -1,14 +1,12 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <skalibs/uint64.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 #include "djbtime-internal.h"
 
-int utc_from_tai (uint64 *u, tai_t const *t)
+int utc_from_tai (uint64_t *u, tai_t const *t)
 {
-  uint64 tt = t->x - 10 ;
+  uint64_t tt = t->x - 10 ;
   if (t->x < 10U) return (errno = EINVAL, 0) ;
   leapsecs_sub(&tt) ;
   *u = tt ;
diff --git a/src/libunixonacid/bufalloc_timed_flush.c b/src/libunixonacid/bufalloc_timed_flush.c
index df0eb79..7ebb70e 100644
--- a/src/libunixonacid/bufalloc_timed_flush.c
+++ b/src/libunixonacid/bufalloc_timed_flush.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/bufalloc.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 static int bufalloc_isnonempty (bufalloc *ba)
diff --git a/src/libunixonacid/buffer_timed_fill.c b/src/libunixonacid/buffer_timed_fill.c
index fc24bc9..eb41b5b 100644
--- a/src/libunixonacid/buffer_timed_fill.c
+++ b/src/libunixonacid/buffer_timed_fill.c
@@ -1,10 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 static ssize_t get (buffer *b)
diff --git a/src/libunixonacid/buffer_timed_flush.c b/src/libunixonacid/buffer_timed_flush.c
index 94d2c83..4de467a 100644
--- a/src/libunixonacid/buffer_timed_flush.c
+++ b/src/libunixonacid/buffer_timed_flush.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/buffer.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 static int buffer_isnonempty (buffer *b)
diff --git a/src/libunixonacid/buffer_timed_get.c b/src/libunixonacid/buffer_timed_get.c
index 4eb1033..8dee2c2 100644
--- a/src/libunixonacid/buffer_timed_get.c
+++ b/src/libunixonacid/buffer_timed_get.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
+#include <skalibs/functypes.h>
 #include <skalibs/buffer.h>
-#include <skalibs/buffer.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 struct blah_s
diff --git a/src/libunixonacid/dd_commit.c b/src/libunixonacid/dd_commit.c
index b4d1511..1c940d2 100644
--- a/src/libunixonacid/dd_commit.c
+++ b/src/libunixonacid/dd_commit.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/libunixonacid/dd_commit_devino.c b/src/libunixonacid/dd_commit_devino.c
index 364e466..96713fe 100644
--- a/src/libunixonacid/dd_commit_devino.c
+++ b/src/libunixonacid/dd_commit_devino.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <skalibs/types.h>
 #include <skalibs/unix-transactional.h>
 
 int dd_commit_devino (dirdescriptor_t *dd, dev_t *dev, ino_t *ino)
diff --git a/src/libunixonacid/dd_open_write.c b/src/libunixonacid/dd_open_write.c
index 40d3443..fbaf28e 100644
--- a/src/libunixonacid/dd_open_write.c
+++ b/src/libunixonacid/dd_open_write.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/libunixonacid/ipc_timed_recv.c b/src/libunixonacid/ipc_timed_recv.c
index acf3d48..ca3b57f 100644
--- a/src/libunixonacid/ipc_timed_recv.c
+++ b/src/libunixonacid/ipc_timed_recv.c
@@ -1,8 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
+#include <skalibs/allreadwrite.h>
 #include <skalibs/webipc.h>
 #include <skalibs/unix-timed.h>
 
diff --git a/src/libunixonacid/ipc_timed_send.c b/src/libunixonacid/ipc_timed_send.c
index 959c4bc..13f8501 100644
--- a/src/libunixonacid/ipc_timed_send.c
+++ b/src/libunixonacid/ipc_timed_send.c
@@ -1,10 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/unix-timed.h>
 
diff --git a/src/libunixonacid/kolbak_queue_init.c b/src/libunixonacid/kolbak_queue_init.c
index d2f11da..a6c8fa5 100644
--- a/src/libunixonacid/kolbak_queue_init.c
+++ b/src/libunixonacid/kolbak_queue_init.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/kolbak.h>
 
diff --git a/src/libunixonacid/netstring_timed_get.c b/src/libunixonacid/netstring_timed_get.c
index c8c954d..c540a3f 100644
--- a/src/libunixonacid/netstring_timed_get.c
+++ b/src/libunixonacid/netstring_timed_get.c
@@ -1,11 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/buffer.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/netstring.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/unix-timed.h>
 
diff --git a/src/libunixonacid/open2_at.c b/src/libunixonacid/open2_at.c
index 625ec20..6b581e4 100644
--- a/src/libunixonacid/open2_at.c
+++ b/src/libunixonacid/open2_at.c
@@ -19,7 +19,6 @@ int open2_at (int dirfd, char const *file, int flags)
 
 #else
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/libunixonacid/open3_at.c b/src/libunixonacid/open3_at.c
index f92fa59..22bbecd 100644
--- a/src/libunixonacid/open3_at.c
+++ b/src/libunixonacid/open3_at.c
@@ -19,7 +19,6 @@ int open3_at (int dirfd, char const *file, int flags, unsigned int mode)
 
 #else
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/libunixonacid/open_appendat.c b/src/libunixonacid/open_appendat.c
index debfe8a..5ad73d1 100644
--- a/src/libunixonacid/open_appendat.c
+++ b/src/libunixonacid/open_appendat.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <skalibs/unix-transactional.h>
diff --git a/src/libunixonacid/open_readat.c b/src/libunixonacid/open_readat.c
index 7764ffc..05f6926 100644
--- a/src/libunixonacid/open_readat.c
+++ b/src/libunixonacid/open_readat.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/open_truncat.c b/src/libunixonacid/open_truncat.c
index 2a868d2..ce4f132 100644
--- a/src/libunixonacid/open_truncat.c
+++ b/src/libunixonacid/open_truncat.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/open_writeat.c b/src/libunixonacid/open_writeat.c
index 6b1a173..695e343 100644
--- a/src/libunixonacid/open_writeat.c
+++ b/src/libunixonacid/open_writeat.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/opengetlnclose.c b/src/libunixonacid/opengetlnclose.c
index 2615c6b..19383b1 100644
--- a/src/libunixonacid/opengetlnclose.c
+++ b/src/libunixonacid/opengetlnclose.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/unix-transactional.h>
diff --git a/src/libunixonacid/opengetlnclose_at.c b/src/libunixonacid/opengetlnclose_at.c
index 7d2bee3..62fd5fd 100644
--- a/src/libunixonacid/opengetlnclose_at.c
+++ b/src/libunixonacid/opengetlnclose_at.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/unix-transactional.h>
@@ -16,7 +15,7 @@ int opengetlnclose_at (int dirfd, char const *fn, stralloc *sa, int sep)
   int e ;
   int fd = open_readatb(dirfd, fn) ;
   if (fd < 0) return -1 ;
-  buffer_init(&b, &fd_readv, fd, buf, BUFFER_INSIZE) ;
+  buffer_init(&b, &buffer_read, fd, buf, BUFFER_INSIZE) ;
   r = skagetln(&b, sa, sep) ;
   e = errno ;
   fd_close(fd) ;
diff --git a/src/libunixonacid/openreadnclose_at.c b/src/libunixonacid/openreadnclose_at.c
index fb58935..e03c04b 100644
--- a/src/libunixonacid/openreadnclose_at.c
+++ b/src/libunixonacid/openreadnclose_at.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libunixonacid/openslurpclose_at.c b/src/libunixonacid/openslurpclose_at.c
index 24a2d1c..f4e0615 100644
--- a/src/libunixonacid/openslurpclose_at.c
+++ b/src/libunixonacid/openslurpclose_at.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/openwritenclose.c b/src/libunixonacid/openwritenclose.c
index 2c5ffb7..d8dc174 100644
--- a/src/libunixonacid/openwritenclose.c
+++ b/src/libunixonacid/openwritenclose.c
@@ -1,8 +1,5 @@
 /* ISC license. */
 
-/* MT-unsafe */
-
-#include <sys/types.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/openwritenclose_devino.c b/src/libunixonacid/openwritenclose_devino.c
index 28e686e..5a9c38d 100644
--- a/src/libunixonacid/openwritenclose_devino.c
+++ b/src/libunixonacid/openwritenclose_devino.c
@@ -1,9 +1,5 @@
 /* ISC license. */
 
-/* MT-unsafe */
-
-#include <sys/types.h>
-#include <skalibs/types.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/unix-transactional.h>
 
diff --git a/src/libunixonacid/openwritenclose_tmp.c b/src/libunixonacid/openwritenclose_tmp.c
index 5b3fe15..a8cb78f 100644
--- a/src/libunixonacid/openwritenclose_tmp.c
+++ b/src/libunixonacid/openwritenclose_tmp.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <skalibs/types.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/unix-transactional.h>
 
 int openwritenclose_tmp (char const *fn, char const *s, size_t len, stralloc *tmp)
diff --git a/src/libunixonacid/skaclient_init.c b/src/libunixonacid/skaclient_init.c
index 0ab4137..a1cda0a 100644
--- a/src/libunixonacid/skaclient_init.c
+++ b/src/libunixonacid/skaclient_init.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <skalibs/kolbak.h>
-#include <skalibs/skaclient.h>
 #include <skalibs/unixmessage.h>
+#include <skalibs/skaclient.h>
 #include "skaclient-internal.h"
 
 int skaclient_init (
diff --git a/src/libunixonacid/skaclient_put.c b/src/libunixonacid/skaclient_put.c
index d15c0ec..214d013 100644
--- a/src/libunixonacid/skaclient_put.c
+++ b/src/libunixonacid/skaclient_put.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/skaclient.h>
 #include <skalibs/unixmessage.h>
 
diff --git a/src/libunixonacid/skaclient_send.c b/src/libunixonacid/skaclient_send.c
index 2e63c34..980d953 100644
--- a/src/libunixonacid/skaclient_send.c
+++ b/src/libunixonacid/skaclient_send.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <skalibs/tai.h>
 #include <skalibs/unixmessage.h>
 #include <skalibs/skaclient.h>
 
diff --git a/src/libunixonacid/skaclient_sendmsg.c b/src/libunixonacid/skaclient_sendmsg.c
index 371e84a..6ace2ba 100644
--- a/src/libunixonacid/skaclient_sendmsg.c
+++ b/src/libunixonacid/skaclient_sendmsg.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/tai.h>
-#include <skalibs/unixmessage.h>
 #include <skalibs/skaclient.h>
 
 int skaclient_sendmsg_and_close (skaclient_t *a, unixmessage_t const *m, unsigned char const *bits, unixmessage_handler_func_t_ref cb, void *result, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/skaclient_sendmsgv.c b/src/libunixonacid/skaclient_sendmsgv.c
index 91467a2..0b8a702 100644
--- a/src/libunixonacid/skaclient_sendmsgv.c
+++ b/src/libunixonacid/skaclient_sendmsgv.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/tai.h>
-#include <skalibs/unixmessage.h>
 #include <skalibs/skaclient.h>
 
 int skaclient_sendmsgv_and_close (skaclient_t *a, unixmessage_v_t const *m, unsigned char const *bits, unixmessage_handler_func_t_ref cb, void *result, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/skaclient_sendv.c b/src/libunixonacid/skaclient_sendv.c
index 224a38a..fa2713d 100644
--- a/src/libunixonacid/skaclient_sendv.c
+++ b/src/libunixonacid/skaclient_sendv.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <sys/uio.h>
 #include <skalibs/skaclient.h>
-#include <skalibs/tai.h>
 #include <skalibs/unixmessage.h>
 
 int skaclient_sendv (skaclient_t *a, struct iovec const *v, unsigned int vlen, unixmessage_handler_func_t *cb, void *result, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/skaclient_server_ack.c b/src/libunixonacid/skaclient_server_ack.c
index 6b59563..181559d 100644
--- a/src/libunixonacid/skaclient_server_ack.c
+++ b/src/libunixonacid/skaclient_server_ack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <string.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libunixonacid/skaclient_server_bidi_ack.c b/src/libunixonacid/skaclient_server_bidi_ack.c
index 0a3e5da..4a65fdb 100644
--- a/src/libunixonacid/skaclient_server_bidi_ack.c
+++ b/src/libunixonacid/skaclient_server_bidi_ack.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/skaclient.h>
 #include <skalibs/unixmessage.h>
 
diff --git a/src/libunixonacid/skaclient_server_init.c b/src/libunixonacid/skaclient_server_init.c
index ec5623a..827a5e4 100644
--- a/src/libunixonacid/skaclient_server_init.c
+++ b/src/libunixonacid/skaclient_server_init.c
@@ -1,9 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/skaclient.h>
-#include <skalibs/tai.h>
 #include <skalibs/unixmessage.h>
 
 int skaclient_server_init (unixmessage_receiver_t *in, unixmessage_sender_t *out, unixmessage_sender_t *asyncout, char const *before, size_t beforelen, char const *after, size_t afterlen, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/skaclient_start.c b/src/libunixonacid/skaclient_start.c
index 7a166ae..d78a1e3 100644
--- a/src/libunixonacid/skaclient_start.c
+++ b/src/libunixonacid/skaclient_start.c
@@ -1,11 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/kolbak.h>
 #include <skalibs/skaclient.h>
-#include <skalibs/tai.h>
 #include "skaclient-internal.h"
 
 int skaclient_start (
diff --git a/src/libunixonacid/skaclient_start_async.c b/src/libunixonacid/skaclient_start_async.c
index 467acd9..02ca421 100644
--- a/src/libunixonacid/skaclient_start_async.c
+++ b/src/libunixonacid/skaclient_start_async.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
-#include <stdint.h>
 #include <skalibs/error.h>
 #include <skalibs/kolbak.h>
 #include <skalibs/skaclient.h>
diff --git a/src/libunixonacid/skaclient_startf.c b/src/libunixonacid/skaclient_startf.c
index 755bc78..9d9cbff 100644
--- a/src/libunixonacid/skaclient_startf.c
+++ b/src/libunixonacid/skaclient_startf.c
@@ -1,11 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/kolbak.h>
 #include <skalibs/skaclient.h>
-#include <skalibs/tai.h>
 #include "skaclient-internal.h"
 
 int skaclient_startf (
diff --git a/src/libunixonacid/skaclient_startf_async.c b/src/libunixonacid/skaclient_startf_async.c
index dce692e..7ce85d8 100644
--- a/src/libunixonacid/skaclient_startf_async.c
+++ b/src/libunixonacid/skaclient_startf_async.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <errno.h>
 #include <signal.h>
 #include <skalibs/djbunix.h>
diff --git a/src/libunixonacid/skaclient_syncify.c b/src/libunixonacid/skaclient_syncify.c
index ea5afb4..a0fd30f 100644
--- a/src/libunixonacid/skaclient_syncify.c
+++ b/src/libunixonacid/skaclient_syncify.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <errno.h>
-#include <skalibs/tai.h>
 #include <skalibs/skaclient.h>
 
 int skaclient_syncify (skaclient_t *a, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/stat_at.c b/src/libunixonacid/stat_at.c
index 3f0f1a5..2eb90a5 100644
--- a/src/libunixonacid/stat_at.c
+++ b/src/libunixonacid/stat_at.c
@@ -27,8 +27,6 @@ int lstat_at (int dirfd, char const *file, struct stat *st)
 
  /* OpenBSD plz. lstat() is POSIX. */
 #include <skalibs/nonposix.h>
-
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/libunixonacid/timed_flush.c b/src/libunixonacid/timed_flush.c
index ced60b6..10367ad 100644
--- a/src/libunixonacid/timed_flush.c
+++ b/src/libunixonacid/timed_flush.c
@@ -2,10 +2,7 @@
 
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/bufalloc.h>
-#include <skalibs/functypes.h>
 #include <skalibs/iopause.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 int timed_flush (void *b, initfunc_t_ref getfd, initfunc_t_ref isnonempty, initfunc_t_ref flush, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libunixonacid/timed_get.c b/src/libunixonacid/timed_get.c
index e93478e..ddbfa97 100644
--- a/src/libunixonacid/timed_get.c
+++ b/src/libunixonacid/timed_get.c
@@ -1,10 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/iopause.h>
 #include <skalibs/unix-timed.h>
 
diff --git a/src/libunixonacid/timed_getln.c b/src/libunixonacid/timed_getln.c
index f699d97..dda0a9f 100644
--- a/src/libunixonacid/timed_getln.c
+++ b/src/libunixonacid/timed_getln.c
@@ -6,7 +6,6 @@
 #include <skalibs/functypes.h>
 #include <skalibs/skamisc.h>
 #include <skalibs/stralloc.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 struct blah_s
diff --git a/src/libunixonacid/timed_getlnmax.c b/src/libunixonacid/timed_getlnmax.c
index 1d89d85..a054b59 100644
--- a/src/libunixonacid/timed_getlnmax.c
+++ b/src/libunixonacid/timed_getlnmax.c
@@ -5,7 +5,6 @@
 #include <skalibs/buffer.h>
 #include <skalibs/functypes.h>
 #include <skalibs/skamisc.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 
 struct blah_s
diff --git a/src/libunixonacid/unixmessage_receiver_init.c b/src/libunixonacid/unixmessage_receiver_init.c
index 117512e..32a514a 100644
--- a/src/libunixonacid/unixmessage_receiver_init.c
+++ b/src/libunixonacid/unixmessage_receiver_init.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <errno.h>
 #include <skalibs/cbuffer.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/unixmessage.h>
diff --git a/src/libunixonacid/unixmessage_sender_flush.c b/src/libunixonacid/unixmessage_sender_flush.c
index 8cfb709..e7d4299 100644
--- a/src/libunixonacid/unixmessage_sender_flush.c
+++ b/src/libunixonacid/unixmessage_sender_flush.c
@@ -4,12 +4,12 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <string.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
 #include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/disize.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/genalloc.h>
@@ -84,7 +84,7 @@ int unixmessage_sender_flush (unixmessage_sender_t *b)
     {
       struct cmsghdr *cp = CMSG_FIRSTHDR(&hdr) ;
       size_t i = 0 ;
-      byte_zero(ancilbuf, sizeof(ancilbuf)) ;
+      memset(ancilbuf, 0, sizeof(ancilbuf)) ;
       cp->cmsg_level = SOL_SOCKET ;
       cp->cmsg_type = SCM_RIGHTS ;
       cp->cmsg_len = CMSG_LEN(nfds * sizeof(int)) ;
diff --git a/src/libunixonacid/unixmessage_sender_timed_flush.c b/src/libunixonacid/unixmessage_sender_timed_flush.c
index e144c82..65b1b7d 100644
--- a/src/libunixonacid/unixmessage_sender_timed_flush.c
+++ b/src/libunixonacid/unixmessage_sender_timed_flush.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 #include <skalibs/unixmessage.h>
 
diff --git a/src/libunixonacid/unixmessage_timed_handle.c b/src/libunixonacid/unixmessage_timed_handle.c
index ae10621..dd198e7 100644
--- a/src/libunixonacid/unixmessage_timed_handle.c
+++ b/src/libunixonacid/unixmessage_timed_handle.c
@@ -1,8 +1,6 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 #include <skalibs/unixmessage.h>
 
diff --git a/src/libunixonacid/unixmessage_timed_receive.c b/src/libunixonacid/unixmessage_timed_receive.c
index dc83ff7..08aabb2 100644
--- a/src/libunixonacid/unixmessage_timed_receive.c
+++ b/src/libunixonacid/unixmessage_timed_receive.c
@@ -2,7 +2,6 @@
 
 #include <sys/types.h>
 #include <skalibs/functypes.h>
-#include <skalibs/tai.h>
 #include <skalibs/unix-timed.h>
 #include <skalibs/unixmessage.h>
 
diff --git a/src/libunixonacid/unixmessage_unput.c b/src/libunixonacid/unixmessage_unput.c
index 180c5a7..3ee2abc 100644
--- a/src/libunixonacid/unixmessage_unput.c
+++ b/src/libunixonacid/unixmessage_unput.c
@@ -1,6 +1,5 @@
  /* ISC license. */
 
-#include <sys/types.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/disize.h>
 #include <skalibs/djbunix.h>