diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index c885de9f..4f46698f 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -25,9 +25,9 @@
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN
 
+#include "tiffiop.h"
 #include <stdlib.h>
 
-#include "tiffiop.h"
 #ifdef JPEG_SUPPORT
 
 /*
diff --git a/libtiff/tif_vms.c b/libtiff/tif_vms.c
index bda9d859..cf4e9f34 100644
--- a/libtiff/tif_vms.c
+++ b/libtiff/tif_vms.c
@@ -26,9 +26,9 @@
  * TIFF Library VMS-specific Routines.
  */
 
+#include "tiffiop.h"
 #include <stdlib.h>
 #include <unixio.h>
-#include "tiffiop.h"
 #if !HAVE_IEEEFP
 #include <math.h>
 #endif
diff --git a/tools/tiffset.c b/tools/tiffset.c
index e6e77cd7..9a75d910 100644
--- a/tools/tiffset.c
+++ b/tools/tiffset.c
@@ -27,6 +27,7 @@
  ******************************************************************************
  */
 
+#include "tif_config.h"
 
 #include <stdio.h>
 #include <string.h>