diff --git a/jdapistd.c b/jdapistd.c
index d134242b..2d00b199 100644
--- a/jdapistd.c
+++ b/jdapistd.c
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * Copyright (C) 2015, Google, Inc.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -18,6 +18,7 @@
  * whole decompression library into a transcoder.
  */
 
+#include "jinclude.h"
 #include "jdmainct.h"
 #include "jdcoefct.h"
 #include "jdsample.h"
diff --git a/jdcoefct.c b/jdcoefct.c
index baf6bc8c..c51e3ffa 100644
--- a/jdcoefct.c
+++ b/jdcoefct.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1994-1997, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -18,6 +18,7 @@
  * Also, the input side (only) is used when reading a file for transcoding.
  */
 
+#include "jinclude.h"
 #include "jdcoefct.h"
 #include "jpegcomp.h"
 
diff --git a/jdcoefct.h b/jdcoefct.h
index 55b877a0..28e7a2d9 100644
--- a/jdcoefct.h
+++ b/jdcoefct.h
@@ -10,7 +10,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 
 
diff --git a/jdmainct.c b/jdmainct.c
index d656b683..ebb069b0 100644
--- a/jdmainct.c
+++ b/jdmainct.c
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -16,6 +16,7 @@
  * supplies the equivalent of the main buffer in that case.
  */
 
+#include "jinclude.h"
 #include "jdmainct.h"
 
 
diff --git a/jdmainct.h b/jdmainct.h
index 3e23aa83..c7de6195 100644
--- a/jdmainct.h
+++ b/jdmainct.h
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"
 #include "jpegcomp.h"
 
diff --git a/jdsample.c b/jdsample.c
index 276feae2..c9c815a5 100644
--- a/jdsample.c
+++ b/jdsample.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2010, 2015, D. R. Commander.
+ * Copyright (C) 2010, 2015-2016, D. R. Commander.
  * Copyright (C) 2014, MIPS Technologies, Inc., California
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -23,6 +23,7 @@
  *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
  */
 
+#include "jinclude.h"
 #include "jdsample.h"
 #include "jsimd.h"
 #include "jpegcomp.h"
diff --git a/jdsample.h b/jdsample.h
index da905a62..630d07e4 100644
--- a/jdsample.h
+++ b/jdsample.h
@@ -8,7 +8,6 @@
  */
 
 #define JPEG_INTERNALS
-#include "jinclude.h"
 #include "jpeglib.h"