diff --git a/tinydnssec-x/auto-str.c b/tinydnssec-x/auto-str.c
index 2daa1c9..0dce23c 100644
--- a/tinydnssec-x/auto-str.c
+++ b/tinydnssec-x/auto-str.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 
 char bspace[256];
-substdio b = SUBSTDIO_FDBUF(write,1,bspace,sizeof bspace);
+substdio b = SUBSTDIO_FDBUF((ssize_t (*)(int,  char *, size_t)) write,1,bspace,sizeof bspace);
 
 void myputs(const char *s)
 {
diff --git a/tinydnssec-x/axfr-get.c b/tinydnssec-x/axfr-get.c
index 31a0d06..5bd64df 100644
--- a/tinydnssec-x/axfr-get.c
+++ b/tinydnssec-x/axfr-get.c
@@ -90,9 +90,9 @@ ssize_t safewrite(int fd,char *buf,unsigned int len)
   return r;
 }
 char netreadspace[1024];
-substdio netread = SUBSTDIO_FDBUF(saferead,6,netreadspace,sizeof netreadspace);
+substdio netread = SUBSTDIO_FDBUF((ssize_t (*)(int,  char *, size_t)) saferead,6,netreadspace,sizeof netreadspace);
 char netwritespace[1024];
-substdio netwrite = SUBSTDIO_FDBUF(safewrite,7,netwritespace,sizeof netwritespace);
+substdio netwrite = SUBSTDIO_FDBUF((ssize_t (*)(int,  char *, size_t)) safewrite,7,netwritespace,sizeof netwritespace);
 
 void netget(char *buf,unsigned int len)
 {
@@ -317,7 +317,7 @@ int main(int argc,char **argv)
     if (errno != error_noent) die_read();
   }
   else {
-    substdio_fdbuf(&b,read,fd,bspace,sizeof bspace);
+    substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) read,fd,bspace,sizeof bspace);
     if (getln(&b,&line,&match,'\n') == -1) die_read();
     if (!stralloc_0(&line)) die_read();
     if (line.s[0] == '#') {
@@ -370,7 +370,7 @@ int main(int argc,char **argv)
 
   fd = open_trunc(fntmp);
   if (fd == -1) die_write();
-  substdio_fdbuf(&b,write,fd,bspace,sizeof bspace);
+  substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) write,fd,bspace,sizeof bspace);
 
   if (!stralloc_copyb(&packet,"\0\0\0\0\0\1\0\0\0\0\0\0",12)) die_generate();
   if (!stralloc_catb(&packet,zone,zonelen)) die_generate();
diff --git a/tinydnssec-x/axfrdns.c b/tinydnssec-x/axfrdns.c
index 018e4ce..1c1a236 100644
--- a/tinydnssec-x/axfrdns.c
+++ b/tinydnssec-x/axfrdns.c
@@ -70,7 +70,7 @@ ssize_t safewrite(int fd,char *buf,unsigned int len)
 }
 
 char netwritespace[1024];
-substdio netwrite = SUBSTDIO_FDBUF(safewrite,1,netwritespace,sizeof netwritespace);
+substdio netwrite = SUBSTDIO_FDBUF((ssize_t (*)(int,  char *, size_t)) safewrite,1,netwritespace,sizeof netwritespace);
 
 void print(char *buf,unsigned int len)
 {
@@ -256,7 +256,7 @@ void doaxfr(char id[2])
   print(soa.s,soa.len);
 
   seek_begin(fdcdb);
-  substdio_fdbuf(&bcdb,read,fdcdb,bcdbspace,sizeof bcdbspace);
+  substdio_fdbuf(&bcdb,(ssize_t (*)(int,  char *, size_t)) read,fdcdb,bcdbspace,sizeof bcdbspace);
 
   pos = 0;
   get(num,4); pos += 4;
diff --git a/tinydnssec-x/curvedns-conf.c b/tinydnssec-x/curvedns-conf.c
index 7fccd57..1e52d42 100644
--- a/tinydnssec-x/curvedns-conf.c
+++ b/tinydnssec-x/curvedns-conf.c
@@ -83,7 +83,7 @@ int main(int argc,char **argv)
   outs(auto_home); outs("/bin/curvedns $LISTEN_IPS $LISTEN_PORT $TARGET_IP $TARGET_PORT\n'\n"); finish();
   perm(0755);
   start("private.key");
-  substdio_fdbuf(&sspbuf,read,privatekeyfd,pbuf,sizeof pbuf);
+  substdio_fdbuf(&sspbuf,(ssize_t (*)(int,  char *, size_t)) read,privatekeyfd,pbuf,sizeof pbuf);
   copyfrom(&sspbuf);
   finish();
   perm(0600);
diff --git a/tinydnssec-x/dnscache-conf.c b/tinydnssec-x/dnscache-conf.c
index d1c6a59..1bdbd22 100644
--- a/tinydnssec-x/dnscache-conf.c
+++ b/tinydnssec-x/dnscache-conf.c
@@ -127,7 +127,7 @@ int main(int argc,char **argv)
   seed_addtime(); makedir("root/servers");
   seed_addtime(); perm(02755);
   seed_addtime(); start("root/servers/@");
-  substdio_fdbuf(&ssrootservers,read,fdrootservers,rootserversbuf,sizeof rootserversbuf);
+  substdio_fdbuf(&ssrootservers,(ssize_t (*)(int,  char *, size_t)) read,fdrootservers,rootserversbuf,sizeof rootserversbuf);
   copyfrom(&ssrootservers);
   finish();
   seed_addtime(); perm(0644);
diff --git a/tinydnssec-x/dnscache.c b/tinydnssec-x/dnscache.c
index 88d7ae3..738d569 100644
--- a/tinydnssec-x/dnscache.c
+++ b/tinydnssec-x/dnscache.c
@@ -428,7 +428,7 @@ static void doit(void)
 char seed[128];
 
 void
-SigTerm()
+SigTerm(int x)
 {
 	_exit(0);
 }
diff --git a/tinydnssec-x/dq-20161210/dq/buffer.c b/tinydnssec-x/dq-20161210/dq/buffer.c
index 846377a..d713c69 100644
--- a/tinydnssec-x/dq-20161210/dq/buffer.c
+++ b/tinydnssec-x/dq-20161210/dq/buffer.c
@@ -1,6 +1,6 @@
 #include "buffer.h"
 
-void buffer_init(buffer *s, long long (*op)(), int fd, char *buf, long long len) {
+void buffer_init(buffer *s, long long (*op)(int, char *, unsigned long long), int fd, char *buf, unsigned long long len) {
 
     s->x  = buf;
     s->fd = fd;
diff --git a/tinydnssec-x/dq-20161210/dq/buffer.h b/tinydnssec-x/dq-20161210/dq/buffer.h
index a1539ac..6d0e1c6 100644
--- a/tinydnssec-x/dq-20161210/dq/buffer.h
+++ b/tinydnssec-x/dq-20161210/dq/buffer.h
@@ -6,7 +6,7 @@ typedef struct buffer {
     long long p;
     long long n;
     int fd;
-    long long (*op)();
+    long long (*op)(int, char *, unsigned long long);
 } buffer;
 
 #define BUFFER_INIT(op, fd, buf, len) { (buf), 0, (len), (fd), (op) }
@@ -14,12 +14,12 @@ typedef struct buffer {
 #define BUFFER_OUTSIZE 8192
 #define BUFFER_ERRSIZE 256
 
-extern void buffer_init(buffer *, long long (*op)(), int, char *, long long);
+extern void buffer_init(buffer *, long long (*op)(int, char *, unsigned long long), int, char *, unsigned long long);
 
 extern int buffer_flush(buffer *);
-extern int buffer_putalign(buffer *, const char *, long long);
-extern int buffer_put(buffer *, const char *, long long);
-extern int buffer_putflush(buffer *, const char *, long long);
+extern int buffer_putalign(buffer *, const char *, unsigned long long);
+extern int buffer_put(buffer *, const char *, unsigned long long);
+extern int buffer_putflush(buffer *, const char *, unsigned long long);
 extern int buffer_putsalign(buffer *, const char *);
 extern int buffer_puts(buffer *, const char *);
 extern int buffer_putsflush(buffer *, const char *);
@@ -30,12 +30,12 @@ extern int buffer_putsflush(buffer *, const char *);
     : buffer_put((s),&(c),1) \
   )
 
-extern long long buffer_get(buffer *, char *, long long);
-extern long long buffer_bget(buffer *, char *, long long);
+extern long long buffer_get(buffer *, char *, unsigned long long);
+extern long long buffer_bget(buffer *, char *, unsigned long long);
 extern long long buffer_feed(buffer *);
 
 extern char *buffer_peek(buffer *);
-extern void buffer_seek(buffer *, long long);
+extern void buffer_seek(buffer *, unsigned long long);
 
 #define buffer_PEEK(s) ( (s)->x + (s)->n )
 #define buffer_SEEK(s,len) ( ( (s)->p -= (len) ) , ( (s)->n += (len) ) )
@@ -48,8 +48,8 @@ extern void buffer_seek(buffer *, long long);
 
 extern int buffer_copy(buffer *,buffer *);
 
-extern long long buffer_unixread(int, char *, long long);
-extern long long buffer_unixwrite(int, const char *, long long);
+extern long long buffer_unixread(int, char *, unsigned long long);
+extern long long buffer_unixwrite(int, const char *, unsigned long long);
 
 #define buffer_PEEK(s) ( (s)->x + (s)->n )
 #define buffer_SEEK(s, len) ( ( (s)->p -= (len) ) , ( (s)->n += (len) ) )
diff --git a/tinydnssec-x/dq-20161210/dq/buffer_2.c b/tinydnssec-x/dq-20161210/dq/buffer_2.c
index 28764ec..e3190d2 100644
--- a/tinydnssec-x/dq-20161210/dq/buffer_2.c
+++ b/tinydnssec-x/dq-20161210/dq/buffer_2.c
@@ -1,5 +1,5 @@
 #include "buffer.h"
 
 char buffer_2_space[BUFFER_ERRSIZE];
-static buffer it = BUFFER_INIT(buffer_unixwrite, 2, buffer_2_space, sizeof buffer_2_space);
+static buffer it = BUFFER_INIT((long long (*)(int,  char *, unsigned long long)) buffer_unixwrite, 2, buffer_2_space, sizeof buffer_2_space);
 buffer *buffer_2 = &it;
diff --git a/tinydnssec-x/dq-20161210/dq/buffer_put.c b/tinydnssec-x/dq-20161210/dq/buffer_put.c
index 81df976..3535ef9 100644
--- a/tinydnssec-x/dq-20161210/dq/buffer_put.c
+++ b/tinydnssec-x/dq-20161210/dq/buffer_put.c
@@ -3,7 +3,7 @@
 #include "byte.h"
 #include "buffer.h"
 
-static int allwrite(long long (*op)(int, const char *, long long), int fd, const char *buf, long long len) {
+static int allwrite(long long (*op)(int, const char *, unsigned long long), int fd, const char *buf, unsigned long long len) {
 
     long long w;
 
@@ -31,10 +31,10 @@ int buffer_flush(buffer *s) {
     p = s->p;
     if (!p) return 0;
     s->p = 0;
-    return allwrite(s->op, s->fd, s->x, p);
+    return allwrite((long long (*)(int, const char *, unsigned long long)) s->op, s->fd, s->x, p);
 }
 
-int buffer_putalign(buffer *s, const char *buf, long long len) {
+int buffer_putalign(buffer *s, const char *buf, unsigned long long len) {
 
     long long n;
 
@@ -52,7 +52,7 @@ int buffer_putalign(buffer *s, const char *buf, long long len) {
 }
 
 
-int buffer_put(buffer *s, const char *buf, long long len) {
+int buffer_put(buffer *s, const char *buf, unsigned long long len) {
 
     long long n;
 
@@ -65,7 +65,7 @@ int buffer_put(buffer *s, const char *buf, long long len) {
         if (n < BUFFER_OUTSIZE) n = BUFFER_OUTSIZE;
         while (len > s->n) {
             if (n > len) n = len;
-            if (allwrite(s->op, s->fd, buf, n) == -1) return -1;
+            if (allwrite((long long (*)(int, const char *, unsigned long long)) s->op, s->fd, buf, n) == -1) return -1;
             buf += n;
             len -= n;
         }
@@ -76,9 +76,9 @@ int buffer_put(buffer *s, const char *buf, long long len) {
     return 0;
 }
 
-int buffer_putflush(buffer *s, const char *buf, long long len) {
+int buffer_putflush(buffer *s, const char *buf, unsigned long long len) {
     if (buffer_flush(s) == -1) return -1;
-    return allwrite(s->op, s->fd, buf, len);
+    return allwrite((long long (*)(int, const char *, unsigned long long)) s->op, s->fd, buf, len);
 }
 
 int buffer_putsalign(buffer *s, const char *buf) {
diff --git a/tinydnssec-x/dq-20161210/dq/buffer_write.c b/tinydnssec-x/dq-20161210/dq/buffer_write.c
index bea27b5..c3597a2 100644
--- a/tinydnssec-x/dq-20161210/dq/buffer_write.c
+++ b/tinydnssec-x/dq-20161210/dq/buffer_write.c
@@ -1,7 +1,7 @@
 #include "writeall.h"
 #include "buffer.h"
 
-long long buffer_unixwrite(int fd, const char *x, long long xlen) {
+long long buffer_unixwrite(int fd, const char *x, unsigned long long xlen) {
 
     if (writeall(fd, x, xlen) == -1) return -1;
     return xlen;
diff --git a/tinydnssec-x/dq-20161210/dq/cache.c b/tinydnssec-x/dq-20161210/dq/cache.c
index 83e2168..5f712cc 100644
--- a/tinydnssec-x/dq-20161210/dq/cache.c
+++ b/tinydnssec-x/dq-20161210/dq/cache.c
@@ -255,7 +255,7 @@ int cache_dump(void) {
     fd = open_trunc(fntmp);
     if (fd == -1) return -1;
 
-    buffer_init(&b, buffer_unixwrite, fd, bspace, sizeof bspace);
+    buffer_init(&b, (long long (*)(int, char *, unsigned long long)) buffer_unixwrite, fd, bspace, sizeof bspace);
 
     pos = oldest;
     while (pos < unused) {
diff --git a/tinydnssec-x/dqcache-conf.c b/tinydnssec-x/dqcache-conf.c
index c04c1b5..f6767d1 100644
--- a/tinydnssec-x/dqcache-conf.c
+++ b/tinydnssec-x/dqcache-conf.c
@@ -79,7 +79,7 @@ int main(int argc,char **argv)
   makedir("root/servers");
   perm(02755);
   start("root/servers/@");
-  substdio_fdbuf(&ssrootservers,read,fdrootservers,rootserversbuf,sizeof rootserversbuf);
+  substdio_fdbuf(&ssrootservers,(ssize_t (*)(int,  char *, size_t)) read,fdrootservers,rootserversbuf,sizeof rootserversbuf);
   copyfrom(&ssrootservers);
   finish();
   perm(0644);
diff --git a/tinydnssec-x/generic-conf.c b/tinydnssec-x/generic-conf.c
index 3827239..87dcc11 100644
--- a/tinydnssec-x/generic-conf.c
+++ b/tinydnssec-x/generic-conf.c
@@ -67,7 +67,7 @@ void start(const char *s)
   fn = s;
   fd = open_trunc(fn);
   if (fd == -1) fail();
-  substdio_fdbuf(&ss,write,fd,buf,sizeof buf);
+  substdio_fdbuf(&ss,(ssize_t (*)(int,  char *, size_t)) write,fd,buf,sizeof buf);
 }
 
 void outs(const char *s)
diff --git a/tinydnssec-x/installer.c b/tinydnssec-x/installer.c
index 2b5ea6a..ea832e6 100644
--- a/tinydnssec-x/installer.c
+++ b/tinydnssec-x/installer.c
@@ -480,10 +480,10 @@ doit(stralloc *line, int uninstall, int check)
 				else
 					strerr_die4sys(111, FATAL, "unable to read ", name, ": ");
 			}
-			substdio_fdbuf(&ssin, read, fdin, inbuf, sizeof (inbuf));
+			substdio_fdbuf(&ssin, (ssize_t (*)(int,  char *, size_t)) read, fdin, inbuf, sizeof (inbuf));
 			if ((fdout = open_trunc(target.s)) == -1)
 				strerr_die4sys(111, FATAL, "unable to write ", target.s, ": ");
-			substdio_fdbuf(&ssout, write, fdout, outbuf, sizeof (outbuf));
+			substdio_fdbuf(&ssout, (ssize_t (*)(int,  char *, size_t)) write, fdout, outbuf, sizeof (outbuf));
 			switch (substdio_copy(&ssout, &ssin))
 			{
 			case -2:
@@ -542,7 +542,7 @@ die_usage()
 }
 
 char            buf[256];
-substdio        in = SUBSTDIO_FDBUF(read, 0, buf, sizeof (buf));
+substdio        in = SUBSTDIO_FDBUF((ssize_t (*)(int,  char *, size_t)) read, 0, buf, sizeof (buf));
 stralloc        line = { 0 };
 
 int
diff --git a/tinydnssec-x/pickdns-data.c b/tinydnssec-x/pickdns-data.c
index 69a1abe..9dc1531 100644
--- a/tinydnssec-x/pickdns-data.c
+++ b/tinydnssec-x/pickdns-data.c
@@ -140,7 +140,7 @@ int main()
 
   fd = open_read("data");
   if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: ");
-  substdio_fdbuf(&b,read,fd,bspace,sizeof bspace);
+  substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) read,fd,bspace,sizeof bspace);
 
   fdcdb = open_trunc("data.tmp");
   if (fdcdb == -1) die_datatmp();
diff --git a/tinydnssec-x/rbldns-data.c b/tinydnssec-x/rbldns-data.c
index 6cf6ee8..5beae03 100644
--- a/tinydnssec-x/rbldns-data.c
+++ b/tinydnssec-x/rbldns-data.c
@@ -58,7 +58,7 @@ int main()
 
   fd = open_read("data");
   if (fd == -1) strerr_die2sys(111,FATAL,"unable to open data: ");
-  substdio_fdbuf(&b,read,fd,bspace,sizeof bspace);
+  substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) read,fd,bspace,sizeof bspace);
 
   fdcdb = open_trunc("data.tmp");
   if (fdcdb == -1) die_datatmp();
diff --git a/tinydnssec-x/select.h1 b/tinydnssec-x/select.h1
index fe725b6..59ffcfe 100644
--- a/tinydnssec-x/select.h1
+++ b/tinydnssec-x/select.h1
@@ -5,6 +5,5 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
-extern int select();
 
 #endif
diff --git a/tinydnssec-x/select.h2 b/tinydnssec-x/select.h2
index 2bc2044..e3af670 100644
--- a/tinydnssec-x/select.h2
+++ b/tinydnssec-x/select.h2
@@ -6,6 +6,5 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/select.h>
-extern int select();
 
 #endif
diff --git a/tinydnssec-x/tinydns-data.c b/tinydnssec-x/tinydns-data.c
index 7dcced0..2b5ca28 100644
--- a/tinydnssec-x/tinydns-data.c
+++ b/tinydnssec-x/tinydns-data.c
@@ -239,7 +239,7 @@ int main()
     strerr_die2sys(111,FATAL,"unable to open data: ");
   defaultsoa_init(fddata);
 
-  substdio_fdbuf(&b,read,fddata,bspace,sizeof bspace);
+  substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) read,fddata,bspace,sizeof bspace);
 
   fdcdb = open_trunc("data.tmp");
   if (fdcdb == -1) die_datatmp();
diff --git a/tinydnssec-x/tinydns-edit.c b/tinydnssec-x/tinydns-edit.c
index eea014f..e360314 100644
--- a/tinydnssec-x/tinydns-edit.c
+++ b/tinydnssec-x/tinydns-edit.c
@@ -122,12 +122,12 @@ int main(int argc,char **argv)
   fd = open_read(fn);
   if (fd == -1) die_read();
   if (fstat(fd,&st) == -1) die_read();
-  substdio_fdbuf(&b,read,fd,bspace,sizeof bspace);
+  substdio_fdbuf(&b,(ssize_t (*)(int,  char *, size_t)) read,fd,bspace,sizeof bspace);
 
   fdnew = open_trunc(fnnew);
   if (fdnew == -1) die_write();
   if (fchmod(fdnew,st.st_mode & 0644) == -1) die_write();
-  substdio_fdbuf(&bnew,write,fdnew,bnewspace,sizeof bnewspace);
+  substdio_fdbuf(&bnew,(ssize_t (*)(int,  char *, size_t)) write,fdnew,bnewspace,sizeof bnewspace);
 
   switch(mode) {
     case '.': case '&':