diff --git a/.travis.yml b/.travis.yml
index 14a688f0..1fa6c2d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,27 +15,27 @@ jobs:
     script:
       - sh ${TRAVIS_BUILD_DIR}/.travis/script-linux.sh
 
-  - name: "win32 cross-compilation"
-    os: linux
-    compiler: gcc
-    dist: bionic
-    env:
-      - TARGET="win32"
-    services:
-      - xvfb
-    script:
-      - sh ${TRAVIS_BUILD_DIR}/.travis/script-win32.sh
+  #- name: "win32 cross-compilation"
+    #os: linux
+    #compiler: gcc
+    #dist: bionic
+    #env:
+      #- TARGET="win32"
+    #services:
+      #- xvfb
+    #script:
+      #- sh ${TRAVIS_BUILD_DIR}/.travis/script-win32.sh
 
-  - name: "win64 cross-compilation"
-    os: linux
-    compiler: gcc
-    dist: bionic
-    env:
-      - TARGET="win32"
-    services:
-      - xvfb
-    script:
-      - sh ${TRAVIS_BUILD_DIR}/.travis/script-win64.sh
+  #- name: "win64 cross-compilation"
+    #os: linux
+    #compiler: gcc
+    #dist: bionic
+    #env:
+      #- TARGET="win32"
+    #services:
+      #- xvfb
+    #script:
+      #- sh ${TRAVIS_BUILD_DIR}/.travis/script-win64.sh
 
 before_install:
   - bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
index f245ef1a..d9969934 100644
--- a/Makefile.plugins.mk
+++ b/Makefile.plugins.mk
@@ -339,13 +339,13 @@ endif
 -include $(BUILD_DIR)/DistrhoPluginMain_LADSPA.cpp.d
 -include $(BUILD_DIR)/DistrhoPluginMain_DSSI.cpp.d
 -include $(BUILD_DIR)/DistrhoPluginMain_LV2.cpp.d
--include $(BUILD_DIR)/DistrhoPluginMain_VST.cpp.d
+-include $(BUILD_DIR)/DistrhoPluginMain_VST2.cpp.d
 -include $(BUILD_DIR)/DistrhoPluginMain_VST3.cpp.d
 
 -include $(BUILD_DIR)/DistrhoUIMain_JACK.cpp.d
 -include $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.d
 -include $(BUILD_DIR)/DistrhoUIMain_LV2.cpp.d
--include $(BUILD_DIR)/DistrhoUIMain_VST.cpp.d
+-include $(BUILD_DIR)/DistrhoUIMain_VST2.cpp.d
 -include $(BUILD_DIR)/DistrhoUIMain_VST3.cpp.d
 
 # ---------------------------------------------------------------------------------------------------------------------