diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp
index 9b42267324..c43c7fc5d7 100644
--- a/Common/CPUDetect.cpp
+++ b/Common/CPUDetect.cpp
@@ -27,7 +27,6 @@
 #undef _interlockedbittestandreset
 #undef _interlockedbittestandset64
 #undef _interlockedbittestandreset64
-#include <windows.h>
 #else
 
 #ifndef _M_GENERIC
diff --git a/Qt/Core.pro b/Qt/Core.pro
index d31aaeb1f5..d9f6260185 100755
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@@ -6,7 +6,7 @@ CONFIG += staticlib
 
 include(Settings.pri)
 
-INCLUDEPATH += ../native ../Core/MIPS ../Common ../
+INCLUDEPATH += ../native ../Core/MIPS ../
 
 arm {
 	SOURCES += ../Core/MIPS/ARM/*.cpp \ #CoreARM
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 9f2b69972b..f6f24b6c87 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -4,11 +4,13 @@ unix:!blackberry:!symbian:!macx: CONFIG += linux
 
 # Global specific
 DEFINES -= UNICODE
-INCLUDEPATH += ../ext/zlib ../native/ext/glew
+INCLUDEPATH += ../ext/zlib ../native/ext/glew ../Common
 
-win32-msvc2010 {
-	QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2
-	DEFINES += _MBCS GLEW_STATIC
+win32-msvc* {
+	QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
+	DEFINES += _MBCS GLEW_STATIC NOMINMAX
+	PRECOMPILED_HEADER = ../Windows/stdafx.h
+	PRECOMPILED_SOURCE = ../Windows/stdafx.cpp
 } else {
 	QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
 	QMAKE_CXXFLAGS += -std=c++0x -ffast-math -fno-strict-aliasing
@@ -16,7 +18,7 @@ win32-msvc2010 {
 
 # Arch specific
 contains(QT_ARCH, i686)|contains(QT_ARCH, x86)|contains(QT_ARCH, x86_64)|contains(QT_ARCH, windows): {
-	!win32-msvc2010: QMAKE_CXXFLAGS += -msse2
+	!win32-msvc*: QMAKE_CXXFLAGS += -msse2
 	CONFIG += x86
 }
 else { # Assume ARM
diff --git a/native b/native
index 3caced8524..f5e7bd5a9c 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 3caced8524c06cabcf968942a7780d80337de7bf
+Subproject commit f5e7bd5a9c3e4b39a4eac71b577f06ad54f2bc96