WT-2372 - wt_internal.h should always be the first include, when needed

9 files changed, 16 insertions, 16 deletions

diff --git a/bench/wtperf/wtperf.h b/bench/wtperf/wtperf.h
index f8d5a5c0bc9..120b93262b4 100644
--- a/bench/wtperf/wtperf.h
+++ b/bench/wtperf/wtperf.h
@@ -29,6 +29,8 @@
 #ifndef	HAVE_WTPERF_H
 #define	HAVE_WTPERF_H
 
+#include <wt_internal.h>
+
 #ifndef _WIN32
 #include <sys/time.h>
 #endif
@@ -56,8 +58,6 @@
 #include <unistd.h>
 #endif
 
-#include <wt_internal.h>
-
 #ifdef _WIN32
 #include "windows_shim.h"
 #endif
diff --git a/ext/compressors/lz4/lz4_compress.c b/ext/compressors/lz4/lz4_compress.c
index 3e6609beb80..062307b721a 100644
--- a/ext/compressors/lz4/lz4_compress.c
+++ b/ext/compressors/lz4/lz4_compress.c
@@ -26,13 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <wt_internal.h>
+
 #include <lz4.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <wt_internal.h>
-
 /* Local compressor structure. */
 typedef struct {
 	WT_COMPRESSOR compressor;		/* Must come first */
diff --git a/ext/compressors/snappy/snappy_compress.c b/ext/compressors/snappy/snappy_compress.c
index d1bd2e1813c..fcefb8bb575 100644
--- a/ext/compressors/snappy/snappy_compress.c
+++ b/ext/compressors/snappy/snappy_compress.c
@@ -26,13 +26,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <wt_internal.h>
+
 #include <snappy-c.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <wt_internal.h>
-
 /* Local compressor structure. */
 typedef struct {
 	WT_COMPRESSOR compressor;		/* Must come first */
diff --git a/src/support/hash_city.c b/src/support/hash_city.c
index f12bfc9a70c..d1d2ac0b412 100644
--- a/src/support/hash_city.c
+++ b/src/support/hash_city.c
@@ -57,8 +57,8 @@
  * compromising on hash quality.
  */
 
-#include <string.h>
 #include "wt_internal.h"
+#include <string.h>
 
 /*
  * Google City Hash implementation. Based on source code from:
diff --git a/src/support/hash_fnv.c b/src/support/hash_fnv.c
index 35e7e5f3a73..62c6fde4d30 100644
--- a/src/support/hash_fnv.c
+++ b/src/support/hash_fnv.c
@@ -83,8 +83,8 @@
  * Share and Enjoy!	:-)
  */
 
-#include <stdlib.h>
 #include "wt_internal.h"
+#include <stdlib.h>
 
 /*
  * This file contains a 64 bit hash implementation of the FNV 1a 64 bit hash
diff --git a/test/packing/intpack-test.c b/test/packing/intpack-test.c
index a48f9fc4fe4..08cc3807725 100644
--- a/test/packing/intpack-test.c
+++ b/test/packing/intpack-test.c
@@ -26,10 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-
 #include "wt_internal.h"			/* For __wt_XXX */
 
+#include <assert.h>
+
 int
 main(void)
 {
diff --git a/test/packing/intpack-test2.c b/test/packing/intpack-test2.c
index 68f794f0bf5..7555d2724e7 100644
--- a/test/packing/intpack-test2.c
+++ b/test/packing/intpack-test2.c
@@ -26,10 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-
 #include "wt_internal.h"			/* For __wt_XXX */
 
+#include <assert.h>
+
 int
 main(void)
 {
diff --git a/test/packing/intpack-test3.c b/test/packing/intpack-test3.c
index 2bce88c3568..2ebc01f9e2e 100644
--- a/test/packing/intpack-test3.c
+++ b/test/packing/intpack-test3.c
@@ -26,10 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-
 #include "wt_internal.h"			/* For __wt_XXX */
 
+#include <assert.h>
+
 void test_value(int64_t);
 void test_spread(int64_t, int64_t, int64_t);
 
diff --git a/test/packing/packing-test.c b/test/packing/packing-test.c
index 1d2194bee50..9b7105d7d4a 100644
--- a/test/packing/packing-test.c
+++ b/test/packing/packing-test.c
@@ -26,10 +26,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
-
 #include "wt_internal.h"			/* For __wt_XXX */
 
+#include <assert.h>
+
 static void
 check(const char *fmt, ...)
 {