--- libidn2-0.16-abi_x86_64.amd64/src/idn2.c	2017-03-22 20:32:05.633705986 +0100
+++ libidn2-0.16-abi_x86_64.amd64/src/idn2.c	2017-03-22 20:34:32.469700243 +0100
@@ -31,7 +31,6 @@
 #include <unistr.h>
 
 /* Gnulib headers. */
-#include "error.h"
 #include "gettext.h"
 #define _(String) dgettext (PACKAGE, String)
 #include "progname.h"
@@ -161,9 +160,7 @@
       free (output);
     }
   else
-    error (EXIT_FAILURE, 0, "%s: %s",
-	   args_info.register_given ? "register" : "lookup",
-	   idn2_strerror (rc));
+	perror (idn2_strerror (rc));
 }
 
 int
@@ -222,7 +219,7 @@
     }
 
   if (ferror (stdin))
-    error (EXIT_FAILURE, errno, "%s", _("input error"));
+    perror (_("input error"));
 
   cmdline_parser_free (&args_info);
 
--- libidn2-0.16-abi_x86_64.amd64/tr46map.c	2017-03-22 20:32:05.629705986 +0100
+++ libidn2-0.16-abi_x86_64.amd64/tr46map.c	2017-03-22 20:34:02.485701416 +0100
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <stdlib.h>		/* bsearch */
 #include <string.h>		/* memset */
+# include <sys/types.h>		/* ssize_t */
 
 #include "tr46map_data.c"