diff --git a/src/common/crypto_rand.c b/src/common/crypto_rand.c
index 66506235a0..5abf0b0968 100644
--- a/src/common/crypto_rand.c
+++ b/src/common/crypto_rand.c
@@ -14,13 +14,13 @@
 #ifndef CRYPTO_RAND_PRIVATE
 #define CRYPTO_RAND_PRIVATE
 
+#include "crypto_rand.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #include <wincrypt.h>
 #endif /* defined(_WIN32) */
 
-#include "crypto_rand.h"
-
 #include "container.h"
 #include "compat.h"
 #include "compat_openssl.h"
diff --git a/src/common/crypto_util.c b/src/common/crypto_util.c
index c09afe6eeb..b0d5b6b2f7 100644
--- a/src/common/crypto_util.c
+++ b/src/common/crypto_util.c
@@ -13,14 +13,16 @@
 #ifndef CRYPTO_UTIL_PRIVATE
 #define CRYPTO_UTIL_PRIVATE
 
+#include "crypto_util.h"
+
 #include <string.h>
 
 #ifdef _WIN32
+#include <winsock2.h>
 #include <windows.h>
 #include <wincrypt.h>
 #endif /* defined(_WIN32) */
 
-#include "crypto_util.h"
 #include "util.h"
 
 DISABLE_GCC_WARNING(redundant-decls)