diff --git a/src/defines.pri b/src/defines.pri
index 6d38ef51b..18f7ff65a 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -10,7 +10,7 @@ unix: VERSION = 1.3.1
 #DEFINES *= USE_WEBGL
 #DEFINES *= KDE
 #DEFINES *= PORTABLE_BUILD
-win32 {
+win32-msvc* {
     DEFINES *= W7API
     LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
 }
@@ -32,7 +32,9 @@ d_disable_dbus = $$(DISABLE_DBUS)
 
 equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
 equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
-equals(d_w7api, "true") { DEFINES *= W7API }
+win32-msvc* {
+    equals(d_w7api, "true") { DEFINES *= W7API }
+}
 equals(d_kde, "true") { DEFINES *= KDE }
 equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
 equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }
diff --git a/src/lib/3rdparty/qtwin.h b/src/lib/3rdparty/qtwin.h
index fbcaf7156..b104cfb88 100644
--- a/src/lib/3rdparty/qtwin.h
+++ b/src/lib/3rdparty/qtwin.h
@@ -38,14 +38,15 @@
   * these functions will simply not do anything.
   */
 #ifdef Q_WS_WIN
-#include <ShlObj.h>
-#include <shlwapi.h>
-#include <Propvarutil.h>
-#include "msvc2008.h"
-
-DEFINE_PROPERTYKEY(PKEY_Title, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 2);
-DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 6);
-
+    #ifdef W7API
+    #include <ShlObj.h>
+    #include <shlwapi.h>
+    #include <Propvarutil.h>
+    #include "msvc2008.h"
+    
+    DEFINE_PROPERTYKEY(PKEY_Title, 0xF29F85E0, 0x4FF9, 0x1068, 0xAB, 0x91, 0x08, 0x00, 0x2B, 0x27, 0xB3, 0xD9, 2);
+    DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 6);
+    #endif
 #endif
 class WindowNotifier;
 class QT_QUPZILLA_EXPORT QtWin : public QObject