diff --git a/gutenprint/configure.ac b/gutenprint/configure.ac
index 2b1cd098..0d0152d7 100644
--- a/gutenprint/configure.ac
+++ b/gutenprint/configure.ac
@@ -210,6 +210,8 @@ if test "$ac_cv_prog_gnu_ld" = "yes" ; then
   AC_DEFINE(HAVE_GNU_LD,, [Define if GNU ld is present.])
 fi
 
+AC_SYS_LARGEFILE
+
 dnl Set up maintainer mode
 AM_MAINTAINER_MODE
 if test x${USE_MAINTAINER_MODE} = xyes ; then
diff --git a/gutenprint/src/cups/backend_common.h b/gutenprint/src/cups/backend_common.h
index d901c62b..03d02d12 100644
--- a/gutenprint/src/cups/backend_common.h
+++ b/gutenprint/src/cups/backend_common.h
@@ -26,6 +26,7 @@
  *
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/gutenprint/src/cups/commandtocanon.c b/gutenprint/src/cups/commandtocanon.c
index 13d96d7b..31281e2e 100644
--- a/gutenprint/src/cups/commandtocanon.c
+++ b/gutenprint/src/cups/commandtocanon.c
@@ -11,6 +11,7 @@
  * Include necessary headers...
  */
 
+#include <config.h>
 #include <cups/cups.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/gutenprint/src/cups/commandtoepson.c b/gutenprint/src/cups/commandtoepson.c
index 7bac83c5..7ee697c2 100644
--- a/gutenprint/src/cups/commandtoepson.c
+++ b/gutenprint/src/cups/commandtoepson.c
@@ -25,6 +25,7 @@
  * Include necessary headers...
  */
 
+#include <config.h>
 #include <cups/cups.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/gutenprint/src/cups/cups-genppd.c b/gutenprint/src/cups/cups-genppd.c
index f8791fab..d6a17eb8 100644
--- a/gutenprint/src/cups/cups-genppd.c
+++ b/gutenprint/src/cups/cups-genppd.c
@@ -33,6 +33,7 @@
  *   write_ppd()         - Write a PPD file.
  */
 
+#include <config.h>
 #include "genppd.h"
 
 static int	generate_ppd(const char *prefix, int verbose,
diff --git a/gutenprint/src/cups/i18n.c b/gutenprint/src/cups/i18n.c
index 89ff2b69..2e5e09b8 100644
--- a/gutenprint/src/cups/i18n.c
+++ b/gutenprint/src/cups/i18n.c
@@ -28,8 +28,8 @@
  * Include necessary files...
  */
 
-#include "i18n.h"
 #include <config.h>
+#include "i18n.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/gutenprint/src/main/mxml-file.c b/gutenprint/src/main/mxml-file.c
index 4ee13287..67152212 100644
--- a/gutenprint/src/main/mxml-file.c
+++ b/gutenprint/src/main/mxml-file.c
@@ -35,8 +35,8 @@
  * Include necessary headers...
  */
 
-#include <gutenprint/mxml.h>
 #include "config.h"
+#include <gutenprint/mxml.h>
 #define MXML_BUFSIZE (64)
 #define ENTITY_BUFSIZE (64)
 
diff --git a/gutenprint/src/main/path.c b/gutenprint/src/main/path.c
index 8a0ec1ba..32c3d0e8 100644
--- a/gutenprint/src/main/path.c
+++ b/gutenprint/src/main/path.c
@@ -18,6 +18,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gutenprint/gutenprint.h>
 #include "gutenprint-internal.h"
 #include <gutenprint/gutenprint-intl-internal.h>
diff --git a/gutenprint/src/main/xmlppd.c b/gutenprint/src/main/xmlppd.c
index dbbd2de5..037c7176 100644
--- a/gutenprint/src/main/xmlppd.c
+++ b/gutenprint/src/main/xmlppd.c
@@ -21,6 +21,7 @@
  * 02110-1301 USA
  */
 
+#include <config.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <gutenprint/mxml.h>
diff --git a/gutenprint/src/testpattern/testpattern.c b/gutenprint/src/testpattern/testpattern.c
index 2474d691..374ef084 100644
--- a/gutenprint/src/testpattern/testpattern.c
+++ b/gutenprint/src/testpattern/testpattern.c
@@ -31,6 +31,8 @@
  * black and white).
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/gutenprint/test/pixma_parse.c b/gutenprint/test/pixma_parse.c
index 19ec8e2f..b01580c2 100644
--- a/gutenprint/test/pixma_parse.c
+++ b/gutenprint/test/pixma_parse.c
@@ -18,6 +18,7 @@
  *
  *****************************************************************************/
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>