diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h
index b3cc0671..d4c5e1fe 100644
--- a/Contrib/Makensisw/afxres.h
+++ b/Contrib/Makensisw/afxres.h
@@ -1,3 +1,4 @@
+#define _WIN32_IE 0x0400
 #include <windows.h>
 
 #ifndef IDC_STATIC
diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index f1318181..cfa9e77e 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -20,12 +20,9 @@
 */
 #define MAKENSISW_CPP
 
-#define _WIN32_IE 0x0400
-
-#include <windows.h>
+#include "makensisw.h"
 #include <windowsx.h>
 #include <stdio.h>
-#include "makensisw.h"
 #include "resource.h"
 #include "noclib.h"
 #include "toolbar.h"
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index dffbd890..48817cbe 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -22,6 +22,8 @@
 #ifndef MAKENSIS_H
 #define MAKENSIS_H
 
+#define _WIN32_IE 0x0400
+#include <windows.h>
 #include <commctrl.h>
 #include "utils.h"
 #define _RICHEDIT_VER 0x0200
diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp
index eaa53e21..3cf23713 100644
--- a/Contrib/Makensisw/toolbar.cpp
+++ b/Contrib/Makensisw/toolbar.cpp
@@ -21,9 +21,8 @@
 */
 #define TOOLBAR_CPP
 
-#include <windows.h>
-#include "resource.h"
 #include "makensisw.h"
+#include "resource.h"
 #include "noclib.h"
 #include "toolbar.h"
 
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index 06354d82..e3807494 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -19,9 +19,9 @@
   3. This notice may not be removed or altered from any source distribution.
 
 */
-#include <windows.h>
-#include "resource.h"
+
 #include "makensisw.h"
+#include "resource.h"
 #include "toolbar.h"
 #include "noclib.h"