diff --git a/src/context.c b/src/context.c
index 4643ed9e..491b544f 100644
--- a/src/context.c
+++ b/src/context.c
@@ -635,7 +635,7 @@ const getdns_tsig_info *_getdns_get_tsig_info(getdns_tsig_algo tsig_alg)
 	    : &tsig_info[tsig_alg];
 }
 
-static const getdns_tsig_algo _getdns_get_tsig_algo(getdns_bindata *algo)
+static getdns_tsig_algo _getdns_get_tsig_algo(getdns_bindata *algo)
 {
 	getdns_tsig_info *i;
 
diff --git a/src/convert.c b/src/convert.c
index a8bb6dc7..7e59ecaa 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -259,7 +259,7 @@ getdns_return_t
 getdns_rr_dict2wire_buf(
     const getdns_dict *rr_dict, uint8_t *wire, size_t *wire_sz)
 {
-	ssize_t my_wire_sz;
+	int my_wire_sz;
 	getdns_return_t r;
 
 	if (!wire_sz)
@@ -275,7 +275,7 @@ getdns_rr_dict2wire_buf(
 
 getdns_return_t
 getdns_rr_dict2wire_scan(
-    const getdns_dict *rr_dict, uint8_t **wire, ssize_t *wire_sz)
+    const getdns_dict *rr_dict, uint8_t **wire, int *wire_sz)
 {
 	getdns_return_t r;
 	gldns_buffer gbuf;
@@ -404,7 +404,7 @@ getdns_return_t
 getdns_rr_dict2str_buf(
     const getdns_dict *rr_dict, char *str, size_t *str_len)
 {
-	ssize_t my_str_len;
+	int my_str_len;
 	getdns_return_t r;
 
 	if (!str_len)
@@ -421,13 +421,13 @@ getdns_rr_dict2str_buf(
 
 getdns_return_t
 getdns_rr_dict2str_scan(
-    const getdns_dict *rr_dict, char **str, ssize_t *str_len)
+    const getdns_dict *rr_dict, char **str, int *str_len)
 {
 	getdns_return_t r;
 	gldns_buffer gbuf;
 	uint8_t buf_spc[4096], *buf = buf_spc, *scan_buf;
 	size_t sz, scan_sz;
-	ssize_t prev_str_len;
+	int prev_str_len;
 	char *prev_str;
 	int sz_needed;
 
diff --git a/src/getdns/getdns_extra.h.in b/src/getdns/getdns_extra.h.in
index ed56d735..49664177 100644
--- a/src/getdns/getdns_extra.h.in
+++ b/src/getdns/getdns_extra.h.in
@@ -512,7 +512,7 @@ getdns_rr_dict2wire_buf(
  */
 getdns_return_t
 getdns_rr_dict2wire_scan(
-    const getdns_dict *rr_dict, uint8_t **wire, ssize_t *wire_sz);
+    const getdns_dict *rr_dict, uint8_t **wire, int *wire_sz);
 
 
 /**
@@ -604,7 +604,7 @@ getdns_rr_dict2str_buf(
  */
 getdns_return_t
 getdns_rr_dict2str_scan(
-    const getdns_dict *rr_dict, char **str, ssize_t *str_len);
+    const getdns_dict *rr_dict, char **str, int *str_len);
 
 
 /**