More superflous headers cleanup and tiny fixes

49 files changed, 6 insertions, 85 deletions

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>