diff --git a/gutenprint/Makefile.am b/gutenprint/Makefile.am
index a5cc005..d15571f 100644
--- a/gutenprint/Makefile.am
+++ b/gutenprint/Makefile.am
@@ -18,7 +18,7 @@
 
 @SET_MAKE@
 
-ACLOCAL_AMFLAGS = -I m4 -I m4local
+ACLOCAL_AMFLAGS = -I m4 -I m4local -I m4extra
 
 include $(top_srcdir)/scripts/global.mk
 
diff --git a/gutenprint/src/cups/commandtocanon.c b/gutenprint/src/cups/commandtocanon.c
index 13d96d7..215673e 100644
--- a/gutenprint/src/cups/commandtocanon.c
+++ b/gutenprint/src/cups/commandtocanon.c
@@ -13,6 +13,7 @@
 
 #include <cups/cups.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
diff --git a/gutenprint/src/cups/commandtoepson.c b/gutenprint/src/cups/commandtoepson.c
index 7bac83c..c83be50 100644
--- a/gutenprint/src/cups/commandtoepson.c
+++ b/gutenprint/src/cups/commandtoepson.c
@@ -27,6 +27,7 @@
 
 #include <cups/cups.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/gutenprint/src/main/print-escp2.c b/gutenprint/src/main/print-escp2.c
index 6fe807a..fa48c2d 100644
--- a/gutenprint/src/main/print-escp2.c
+++ b/gutenprint/src/main/print-escp2.c
@@ -2238,6 +2238,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     return;
 
   memset(&description->deflt, 0, sizeof(description->deflt));
+  memset(&description->bounds, 0, sizeof(description->bounds));
 
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)