diff --git a/compiler.pri b/compiler.pri
index 10ebd66b3..2ec5dd166 100644
--- a/compiler.pri
+++ b/compiler.pri
@@ -69,9 +69,12 @@ win32 {
 		QMAKE_LFLAGS *= /OPT:REF /OPT:ICF
 	}
 
-	CONFIG(debug, debug|release) {
-		INCLUDEPATH *= "$$VLD_PATH/include"
-		QMAKE_LIBDIR *= "$$VLD_PATH/lib"
+	!CONFIG(no-vld) {
+		CONFIG(debug, debug|release) {
+			DEFINES *= USE_VLD
+			INCLUDEPATH *= "$$VLD_PATH/include"
+			QMAKE_LIBDIR *= "$$VLD_PATH/lib"
+		}
 	}
 }
 
diff --git a/main.pro b/main.pro
index 3be2f21ab..50a2a0e2f 100644
--- a/main.pro
+++ b/main.pro
@@ -17,7 +17,12 @@ CONFIG *= ordered debug_and_release
   !CONFIG(no-11x) {
     SUBDIRS *= src/mumble11x
   }
-  SUBDIRS *= src/mumble plugins
+
+  SUBDIRS *= src/mumble
+
+  !CONFIG(no-plugins) {
+    SUBDIRS *= plugins
+  }
 
   win32 {
     SUBDIRS *= overlay