diff --git a/src/script/script.h b/src/script/script.h
index ed456f5c5..d5045005b 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_SCRIPT_SCRIPT_H
 #define BITCOIN_SCRIPT_SCRIPT_H
 
+#include "crypto/common.h"
+
 #include <assert.h>
 #include <climits>
 #include <limits>
@@ -14,7 +16,6 @@
 #include <string.h>
 #include <string>
 #include <vector>
-#include "crypto/common.h"
 
 static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes
 
diff --git a/src/serialize.h b/src/serialize.h
index 741f78f8b..53d8af142 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_SERIALIZE_H
 #define BITCOIN_SERIALIZE_H
 
+#include "compat/endian.h"
+
 #include <algorithm>
 #include <assert.h>
 #include <ios>
@@ -18,8 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "compat/endian.h"
-
 class CScript;
 
 static const unsigned int MAX_SIZE = 0x02000000;
diff --git a/src/util.cpp b/src/util.cpp
index da5b259ae..bfb95c904 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7,11 +7,6 @@
 #include "config/bitcoin-config.h"
 #endif
 
-#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
-#include <pthread.h>
-#include <pthread_np.h>
-#endif
-
 #include "util.h"
 
 #include "chainparamsbase.h"
@@ -23,6 +18,11 @@
 
 #include <stdarg.h>
 
+#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
+#include <pthread.h>
+#include <pthread_np.h>
+#endif
+
 #ifndef WIN32
 // for posix_fallocate
 #ifdef __linux__