8 files changed, 4 insertions, 14 deletions
diff --git a/src/skadns/skadns_cancel.c b/src/skadns/skadns_cancel.c
index 3595585..8a4ec7c 100644
--- a/src/skadns/skadns_cancel.c
+++ b/src/skadns/skadns_cancel.c
@@ -5,11 +5,9 @@
 #define _BSD_SOURCE
 #endif
 
-#include <stdint.h>
 #include <errno.h>
-#include <skalibs/types.h>
+#include <skalibs/uint16.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/skaclient.h>
 #include <s6-dns/skadns.h>
diff --git a/src/skadns/skadns_packet.c b/src/skadns/skadns_packet.c
index c77bb04..ff5f300 100644
--- a/src/skadns/skadns_packet.c
+++ b/src/skadns/skadns_packet.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/gensetdyn.h>
 #include <s6-dns/skadns.h>
diff --git a/src/skadns/skadns_packetlen.c b/src/skadns/skadns_packetlen.c
index 77e3ba1..bf9f98b 100644
--- a/src/skadns/skadns_packetlen.c
+++ b/src/skadns/skadns_packetlen.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/gensetdyn.h>
 #include <s6-dns/skadns.h>
diff --git a/src/skadns/skadns_release.c b/src/skadns/skadns_release.c
index f563dbe..26c9c4f 100644
--- a/src/skadns/skadns_release.c
+++ b/src/skadns/skadns_release.c
@@ -5,7 +5,6 @@
 #define _BSD_SOURCE
 #endif
 
-#include <stdint.h>
 #include <errno.h>
 #include <skalibs/alloc.h>
 #include <skalibs/gensetdyn.h>
diff --git a/src/skadns/skadns_send.c b/src/skadns/skadns_send.c
index 35177c2..9df39f0 100644
--- a/src/skadns/skadns_send.c
+++ b/src/skadns/skadns_send.c
@@ -4,19 +4,16 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <skalibs/types.h>
-#include <skalibs/tai.h>
-#include <skalibs/stralloc.h>
+#include <skalibs/uint16.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/skaclient.h>
-#include <s6-dns/s6dns-domain.h>
 #include <s6-dns/skadns.h>
 
 static skadnsanswer_t const skadnsanswer_initial = { .status = EAGAIN, .data = 0, .len = 0 } ;
 
 int skadns_send (skadns_t *a, uint16_t *u, s6dns_domain_t const *d, uint16_t qtype, tain_t const *limit, tain_t const *deadline, tain_t *stamp)
 {
-  unsigned int i ;
+  uint32_t i ;
   char tmp[17] = "--Q" ;
   char err ;
   struct iovec v[2] = { { .iov_base = tmp, .iov_len = 17 }, { .iov_base = (void *)d->s, .iov_len = d->len } } ;
diff --git a/src/skadns/skadns_start.c b/src/skadns/skadns_start.c
index 2f56cc8..f2376e2 100644
--- a/src/skadns/skadns_start.c
+++ b/src/skadns/skadns_start.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/tai.h>
 #include <skalibs/skaclient.h>
 #include <s6-dns/skadns.h>
 
diff --git a/src/skadns/skadns_startf.c b/src/skadns/skadns_startf.c
index ac19a0c..8dc1675 100644
--- a/src/skadns/skadns_startf.c
+++ b/src/skadns/skadns_startf.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <skalibs/environ.h>
-#include <skalibs/tai.h>
 #include <skalibs/skaclient.h>
 #include <s6-dns/skadns.h>
 
diff --git a/src/skadns/skadns_update.c b/src/skadns/skadns_update.c
index 24b1e2e..39b1dd0 100644
--- a/src/skadns/skadns_update.c
+++ b/src/skadns/skadns_update.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/types.h>
+#include <skalibs/uint16.h>
 #include <skalibs/alloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/gensetdyn.h>