diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index ca620cbe99..8d6c33b8b0 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -19,6 +19,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_VERSION@
 
+@LIBLWRES_API@
+
 @BIND9_INCLUDES@
 
 CINCLUDES =	-I. -I./include -I${srcdir}/include ${ISC_INCLUDES}
@@ -55,15 +57,15 @@ version.@O@: version.c
 		-DLIBAGE=${LIBAGE} \
 		-c ${srcdir}/version.c
 
-liblwres.@A@: ${OBJS}
-	${AR} ${ARFLAGS} $@ ${OBJS}
+liblwres.@A@: ${OBJS} version.@O@
+	${AR} ${ARFLAGS} $@ ${OBJS} version.@O@
 	${RANLIB} $@
 
-liblwres.la: ${OBJS}
+liblwres.la: ${OBJS} version.@O@
 	${LIBTOOL} --mode=link \
 		${CC} ${ALL_CFLAGS} -o liblwres.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-		${OBJS} ${LIBS}
+		${OBJS} version.@O@ ${LIBS}
 
 timestamp: liblwres.@A@
 	touch timestamp
diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 460c8eee07..7ab6e0df17 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -29,7 +29,7 @@
 #include "context_p.h"
 #include "assert_p.h"
 
-int
+lwres_result_t
 lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
 			 lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -91,7 +91,7 @@ lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
 			  lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -179,7 +179,7 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_gabnrequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			lwres_lwpacket_t *pkt, lwres_gabnrequest_t **structp)
 {
@@ -224,7 +224,7 @@ lwres_gabnrequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_gabnresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			lwres_lwpacket_t *pkt, lwres_gabnresponse_t **structp)
 {
diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index fda40cbe8d..f9cbfe709a 100644
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -29,7 +29,7 @@
 #include "context_p.h"
 #include "assert_p.h"
 
-int
+lwres_result_t
 lwres_gnbarequest_render(lwres_context_t *ctx, lwres_gnbarequest_t *req,
 			 lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -85,7 +85,7 @@ lwres_gnbarequest_render(lwres_context_t *ctx, lwres_gnbarequest_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_gnbaresponse_render(lwres_context_t *ctx, lwres_gnbaresponse_t *req,
 			  lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -154,7 +154,7 @@ lwres_gnbaresponse_render(lwres_context_t *ctx, lwres_gnbaresponse_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_gnbarequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			lwres_lwpacket_t *pkt, lwres_gnbarequest_t **structp)
 {
@@ -192,7 +192,7 @@ lwres_gnbarequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 	return (ret);
 }
 
-int
+lwres_result_t
 lwres_gnbaresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			 lwres_lwpacket_t *pkt, lwres_gnbaresponse_t **structp)
 {
diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index e986bff617..07f09b60c1 100644
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -29,7 +29,7 @@
 #include "context_p.h"
 #include "assert_p.h"
 
-int
+lwres_result_t
 lwres_nooprequest_render(lwres_context_t *ctx, lwres_nooprequest_t *req,
 			 lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -80,7 +80,7 @@ lwres_nooprequest_render(lwres_context_t *ctx, lwres_nooprequest_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_noopresponse_render(lwres_context_t *ctx, lwres_noopresponse_t *req,
 			  lwres_lwpacket_t *pkt, lwres_buffer_t *b)
 {
@@ -130,7 +130,7 @@ lwres_noopresponse_render(lwres_context_t *ctx, lwres_noopresponse_t *req,
 	return (LWRES_R_SUCCESS);
 }
 
-int
+lwres_result_t
 lwres_nooprequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			lwres_lwpacket_t *pkt, lwres_nooprequest_t **structp)
 {
@@ -177,7 +177,7 @@ lwres_nooprequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 	return (ret);
 }
 
-int
+lwres_result_t
 lwres_noopresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
 			 lwres_lwpacket_t *pkt, lwres_noopresponse_t **structp)
 {