diff --git a/ChangeLog b/ChangeLog
index c86e441e0..bafc92a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ Bugfix
    * Memory leak when using RSA_PKCS_V21 operations fixed
    * Handle encryption with private key and decryption with public key as per
      RFC 2313
+   * Fixes for MSVC6
 
 Security
    * Fixed potential memory zeroization on miscrafted RSA key (found by Eloi
diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index a0c9b7bc0..b5d9f787c 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -40,10 +40,10 @@
 #if !defined(POLARSSL_NO_PLATFORM_ENTROPY)
 #if defined(_WIN32)
 
-#include <windows.h>
 #if !defined(_WIN32_WINNT)
 #define _WIN32_WINNT 0x0400
 #endif
+#include <windows.h>
 #include <wincrypt.h>
 
 int platform_entropy_poll( void *data, unsigned char *output, size_t len,