diff --git a/NTMakefile b/NTMakefile
index 4b5267eb82f6a124c76e7617b33819190d367dcc..0e503ce6f402ebe30b8568fd53c6b45409fc1144 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -27,7 +27,7 @@ CFLAGS   = -O3 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-stro
 else
 ifdef AMD64
 CXXFLAGS   = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8 -std=c++14 -DVERSION=\"$(GIT_VERSION)\"
-CFLAGS   = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8 -std=c11 -DVERSION=\"$(GIT_VERSION)\"
+CFLAGS   = -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -std=c11 -DVERSION=\"$(GIT_VERSION)\" -flto=8
 endif
 endif
 endif
@@ -50,16 +50,16 @@ endif
 endif
 
 ifdef AMD64_DEBUG
-LIBS       = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
 LDFLAGS    = -L ./deps/lib/nt_amd64 -Og -g3 -fstack-protector-strong -fPIE 
 else
 ifdef AMD64_RELEASE
-LIBS       = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
 LDFLAGS    = -L ./deps/lib/nt_amd64/release -O3 -flto=8 -march=opteron -mtune=opteron -mfpmath=sse -fstack-protector-strong -fPIE 
 else
 ifdef AMD64
-LIBS       = -lglfw -lopenGL32 -lGLEW64 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
-LDFLAGS    = -L ./deps/lib/nt_amd64 -O3 -flto=8 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE 
+LIBS       = -lglfw -lopenGL32 -lglew32 -lgdi32 -lpolarssl -lws2_32 -lharfbuzz -lfreetype -lpng -lbz2 -lz
+LDFLAGS    = -L ./deps/lib/nt_amd64 -O3 -march=core2 -mfpmath=sse -fstack-protector-strong -fPIE -flto=8
 endif
 endif
 endif
diff --git a/deps/lib/nt_amd64/glew32.dll b/deps/lib/nt_amd64/glew32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..4f466928eaf680ff2e421a73c0422f5347d40701
Binary files /dev/null and b/deps/lib/nt_amd64/glew32.dll differ
diff --git a/deps/lib/nt_amd64/glew64.dll b/deps/lib/nt_amd64/glew64.dll
deleted file mode 100644
index db4e09d561bcc2583dbe1a128a86fc1df85ddfbf..0000000000000000000000000000000000000000
Binary files a/deps/lib/nt_amd64/glew64.dll and /dev/null differ
diff --git a/deps/lib/nt_amd64/libbz2.a b/deps/lib/nt_amd64/libbz2.a
new file mode 100644
index 0000000000000000000000000000000000000000..52ed3356d6251c131f0d92920c89e976d027db95
Binary files /dev/null and b/deps/lib/nt_amd64/libbz2.a differ
diff --git a/deps/lib/nt_amd64/libfreetype.a b/deps/lib/nt_amd64/libfreetype.a
new file mode 100644
index 0000000000000000000000000000000000000000..11a7002bc235f43a68e37bbb2cbdcc887a5d458b
Binary files /dev/null and b/deps/lib/nt_amd64/libfreetype.a differ
diff --git a/deps/lib/nt_amd64/libglfw.a b/deps/lib/nt_amd64/libglfw.a
new file mode 100644
index 0000000000000000000000000000000000000000..e14088c96eed1a01777a8e6d4435afb91bdf2960
Binary files /dev/null and b/deps/lib/nt_amd64/libglfw.a differ
diff --git a/deps/lib/nt_amd64/libharfbuzz.a b/deps/lib/nt_amd64/libharfbuzz.a
new file mode 100644
index 0000000000000000000000000000000000000000..9599fb5122095dee0b81f992f7fc8a9c5b67fb2f
Binary files /dev/null and b/deps/lib/nt_amd64/libharfbuzz.a differ
diff --git a/deps/lib/nt_amd64/libpng.a b/deps/lib/nt_amd64/libpng.a
new file mode 100644
index 0000000000000000000000000000000000000000..900c9309eb97263eb55e44c27d5d6cccb8cc9bc3
Binary files /dev/null and b/deps/lib/nt_amd64/libpng.a differ
diff --git a/deps/lib/nt_amd64/libpolarssl.a b/deps/lib/nt_amd64/libpolarssl.a
new file mode 100644
index 0000000000000000000000000000000000000000..a5b1f072109382620fc9bdf0c37885044deac2f0
Binary files /dev/null and b/deps/lib/nt_amd64/libpolarssl.a differ
diff --git a/deps/lib/nt_amd64/libz.a b/deps/lib/nt_amd64/libz.a
new file mode 100644
index 0000000000000000000000000000000000000000..670da768d995739b85ddabef06065eaac48dc994
Binary files /dev/null and b/deps/lib/nt_amd64/libz.a differ
diff --git a/deps/lib/nt_amd64/release/glew32.dll b/deps/lib/nt_amd64/release/glew32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..4f466928eaf680ff2e421a73c0422f5347d40701
Binary files /dev/null and b/deps/lib/nt_amd64/release/glew32.dll differ
diff --git a/deps/lib/nt_amd64/release/glew64.dll b/deps/lib/nt_amd64/release/glew64.dll
deleted file mode 100644
index db4e09d561bcc2583dbe1a128a86fc1df85ddfbf..0000000000000000000000000000000000000000
Binary files a/deps/lib/nt_amd64/release/glew64.dll and /dev/null differ
diff --git a/deps/lib/nt_amd64/release/libbz2.a b/deps/lib/nt_amd64/release/libbz2.a
new file mode 100644
index 0000000000000000000000000000000000000000..7eeb998741e292d5b43d5a45cd7ee5215b3e0010
Binary files /dev/null and b/deps/lib/nt_amd64/release/libbz2.a differ
diff --git a/deps/lib/nt_amd64/release/libfreetype.a b/deps/lib/nt_amd64/release/libfreetype.a
new file mode 100644
index 0000000000000000000000000000000000000000..b290dd6d706c80b1e9988ed23f22228cbf6f3168
Binary files /dev/null and b/deps/lib/nt_amd64/release/libfreetype.a differ
diff --git a/deps/lib/nt_amd64/release/libglfw.a b/deps/lib/nt_amd64/release/libglfw.a
new file mode 100644
index 0000000000000000000000000000000000000000..d1b6bc69776880af8f7e5cb7ac3e215059925090
Binary files /dev/null and b/deps/lib/nt_amd64/release/libglfw.a differ
diff --git a/deps/lib/nt_amd64/release/libharfbuzz.a b/deps/lib/nt_amd64/release/libharfbuzz.a
new file mode 100644
index 0000000000000000000000000000000000000000..24f898d6a6ade8b207a8e13cbef3d5e433c2d181
Binary files /dev/null and b/deps/lib/nt_amd64/release/libharfbuzz.a differ
diff --git a/deps/lib/nt_amd64/release/libpng.a b/deps/lib/nt_amd64/release/libpng.a
new file mode 100644
index 0000000000000000000000000000000000000000..4e1373f369fd373a493ef34bd2c3467b250eae2a
Binary files /dev/null and b/deps/lib/nt_amd64/release/libpng.a differ
diff --git a/deps/lib/nt_amd64/release/libpolarssl.a b/deps/lib/nt_amd64/release/libpolarssl.a
new file mode 100644
index 0000000000000000000000000000000000000000..35d19c60fe3b9b239adf25f25b8e58e26a58326e
Binary files /dev/null and b/deps/lib/nt_amd64/release/libpolarssl.a differ
diff --git a/deps/lib/nt_amd64/release/libz.a b/deps/lib/nt_amd64/release/libz.a
new file mode 100644
index 0000000000000000000000000000000000000000..b261b8bea314cc160eee42b4fbe0739bec33c00c
Binary files /dev/null and b/deps/lib/nt_amd64/release/libz.a differ
diff --git a/deps/lib/nt_i386/libpolarssl.a b/deps/lib/nt_i386/libpolarssl.a
index 882d15f6ee9fec5590f65b575ba83e0dd495f2aa..5f6ae6a2405424810f21dca48e9f2b641d1dbf0f 100644
Binary files a/deps/lib/nt_i386/libpolarssl.a and b/deps/lib/nt_i386/libpolarssl.a differ
diff --git a/deps/lib/nt_i386/release/libbz2.a b/deps/lib/nt_i386/release/libbz2.a
new file mode 100644
index 0000000000000000000000000000000000000000..fe50653bd4de9c45d8df7bcc3969613fc5bff42e
Binary files /dev/null and b/deps/lib/nt_i386/release/libbz2.a differ
diff --git a/deps/lib/nt_i386/release/libfreetype.a b/deps/lib/nt_i386/release/libfreetype.a
new file mode 100644
index 0000000000000000000000000000000000000000..65d1e8cebf955316e354cabfb7b39592b0f7fb80
Binary files /dev/null and b/deps/lib/nt_i386/release/libfreetype.a differ
diff --git a/deps/lib/nt_i386/release/libglfw3.a b/deps/lib/nt_i386/release/libglfw3.a
new file mode 100644
index 0000000000000000000000000000000000000000..188c5e533a1e0be749dc07531c9974925689c87a
Binary files /dev/null and b/deps/lib/nt_i386/release/libglfw3.a differ
diff --git a/deps/lib/nt_i386/release/libharfbuzz.a b/deps/lib/nt_i386/release/libharfbuzz.a
new file mode 100644
index 0000000000000000000000000000000000000000..dd60976a49e506e1e2a639b99557db5d9379ef6e
Binary files /dev/null and b/deps/lib/nt_i386/release/libharfbuzz.a differ
diff --git a/deps/lib/nt_i386/release/libpng.a b/deps/lib/nt_i386/release/libpng.a
new file mode 100644
index 0000000000000000000000000000000000000000..3c827b02f2b0dcc74ffd17d04dfcb4c9e1172386
Binary files /dev/null and b/deps/lib/nt_i386/release/libpng.a differ
diff --git a/deps/lib/nt_i386/release/libpolarssl.a b/deps/lib/nt_i386/release/libpolarssl.a
new file mode 100644
index 0000000000000000000000000000000000000000..85f3b7a8a3bc55f00058c48c7d21885d7ca73d86
Binary files /dev/null and b/deps/lib/nt_i386/release/libpolarssl.a differ
diff --git a/deps/lib/nt_i386/release/libz.a b/deps/lib/nt_i386/release/libz.a
new file mode 100644
index 0000000000000000000000000000000000000000..ce7a576fc3d52aa650acbaa13b8a0c23a1f4d090
Binary files /dev/null and b/deps/lib/nt_i386/release/libz.a differ
diff --git a/reltools/winnt/amd64/glew32.dll b/reltools/winnt/amd64/glew32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..4f466928eaf680ff2e421a73c0422f5347d40701
Binary files /dev/null and b/reltools/winnt/amd64/glew32.dll differ
diff --git a/reltools/winnt/amd64/libgcc_s_seh-1.dll b/reltools/winnt/amd64/libgcc_s_seh-1.dll
new file mode 100644
index 0000000000000000000000000000000000000000..c2cb099075820a27a71e48b88147888a0b17a251
Binary files /dev/null and b/reltools/winnt/amd64/libgcc_s_seh-1.dll differ
diff --git a/reltools/winnt/amd64/libssp-0.dll b/reltools/winnt/amd64/libssp-0.dll
new file mode 100644
index 0000000000000000000000000000000000000000..1a72f8246d9b354d19a994c41c2de7fa7324bd20
Binary files /dev/null and b/reltools/winnt/amd64/libssp-0.dll differ
diff --git a/reltools/winnt/amd64/libstdc++-6.dll b/reltools/winnt/amd64/libstdc++-6.dll
new file mode 100644
index 0000000000000000000000000000000000000000..d53101e7ee563076f54bc583622b8291ef56e7d4
Binary files /dev/null and b/reltools/winnt/amd64/libstdc++-6.dll differ
diff --git a/reltools/winnt/amd64/libwinpthread-1.dll b/reltools/winnt/amd64/libwinpthread-1.dll
new file mode 100644
index 0000000000000000000000000000000000000000..11a98619aac9df5f8b098db970054247fc4b70fe
Binary files /dev/null and b/reltools/winnt/amd64/libwinpthread-1.dll differ
diff --git a/reltools/winnt/glew32.dll b/reltools/winnt/i386/glew32.dll
similarity index 100%
rename from reltools/winnt/glew32.dll
rename to reltools/winnt/i386/glew32.dll
diff --git a/reltools/winnt/libgcc_s_sjlj-1.dll b/reltools/winnt/i386/libgcc_s_sjlj-1.dll
similarity index 100%
rename from reltools/winnt/libgcc_s_sjlj-1.dll
rename to reltools/winnt/i386/libgcc_s_sjlj-1.dll
diff --git a/reltools/winnt/libssp-0.dll b/reltools/winnt/i386/libssp-0.dll
similarity index 100%
rename from reltools/winnt/libssp-0.dll
rename to reltools/winnt/i386/libssp-0.dll
diff --git a/reltools/winnt/libstdc++-6.dll b/reltools/winnt/i386/libstdc++-6.dll
similarity index 100%
rename from reltools/winnt/libstdc++-6.dll
rename to reltools/winnt/i386/libstdc++-6.dll
diff --git a/src/tlsf.c b/src/tlsf.c
index eff7913172d2f6b641a4271f0bfdb43e63a9215c..285a08499e6cd7a5605dfacaa31d5010395f451d 100644
--- a/src/tlsf.c
+++ b/src/tlsf.c
@@ -137,7 +137,7 @@
 #define _DEBUG_TLSF_  (0)
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #include "tlsf-winnt.h"
 BOOL using_dynamic_heap = TRUE;
 SYSTEM_INFO nt_sysinfo;
@@ -190,11 +190,12 @@ cache_system_info (void)
     nt_build_number &= 0xffff;
 }
 
+#ifndef _WIN64
 int getpagesize()
 {
 	return nt_sysinfo.dwPageSize;
 }
-
+#endif
 /* Info for managing our preload heap, which is essentially a fixed size
    data area in the executable.  */
 PIMAGE_SECTION_HEADER preload_heap_section;
diff --git a/winnt-ci.sh b/winnt-ci.sh
index 7c5e79dc9a87b3dce8be5152324faaac36361e4c..a8a3a070b78b4014d2c6d147ac0c8acb466e644f 100644
--- a/winnt-ci.sh
+++ b/winnt-ci.sh
@@ -10,6 +10,11 @@ strip -s netrunner.exe
 mv *.pnm bin 2> /dev/null
 mv *.crt bin 2> /dev/null
 mv *.ttf bin 2> /dev/null
-cp reltools/winnt/*.dll bin
+if [ $MSYSTEM == "MINGW32" ]
+then
+	cp reltools/winnt/i386/*.dll bin
+else
+	cp reltools/wint/amd64/*.dll bin
+fi
 mv LICENSE bin
 mv netrunner.exe bin
\ No newline at end of file