More superflous headers cleanup and tiny fixes

165 files changed, 11 insertions, 199 deletions

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 ;