diff --git a/build/win64/build-me.bat b/build/win64/build-me.bat
index d18a706..77e749a 100644
--- a/build/win64/build-me.bat
+++ b/build/win64/build-me.bat
@@ -43,6 +43,7 @@
 @set TMPOPTS=%TMPOPTS% -G "Visual Studio 10 Win64"
 @REM set TMPOPTS=%TMPOPTS% -DTIDY_CONFIG_FILE="C:\MDOS\tidy5.cfg"
 @REM set TMPOPTS=%TMPOPTS% -DTIDY_USER_CONFIG_FILE="C:\MDOS\tidy5.cfg"
+@set TMPOPTS=%TMPOPTS% -DBUILD_SHARED_LIB:BOOL=OFF
 
 :RPT
 @if "%~1x" == "x" goto GOTCMD
diff --git a/src/mappedio.c b/src/mappedio.c
index 5efed4c..61cf748 100644
--- a/src/mappedio.c
+++ b/src/mappedio.c
@@ -97,15 +97,15 @@ void TY_(freeFileSource)( TidyInputSource* inp, Bool closeIt )
 
 
 #if defined(_WIN32)
-#include "streamio.h"
-#include "tidy-int.h"
-#include "message.h"
-
-#include <errno.h>
 #if defined(_MSC_VER) && (_MSC_VER < 1300)  /* less than msvc++ 7.0 */
 #pragma warning(disable:4115) /* named type definition in parentheses in windows headers */
 #endif
 #include <windows.h>
+#include <errno.h>
+
+#include "streamio.h"
+#include "tidy-int.h"
+#include "message.h"
 
 typedef struct _fp_input_mapped_source
 {
diff --git a/version.txt b/version.txt
index 6b72aa3..37795fe 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-5.1.4
-2015.07.31
+5.1.5
+2015.08.10