diff --git a/src/plugins/diffeditor/diffeditor.qbs b/src/plugins/diffeditor/diffeditor.qbs
index e4afa534f47..deb8585b6ff 100644
--- a/src/plugins/diffeditor/diffeditor.qbs
+++ b/src/plugins/diffeditor/diffeditor.qbs
@@ -12,10 +12,10 @@ QtcPlugin {
 
 
     files: [
-        "diffeditor_global.h",
-        "diffeditorconstants.h",
         "diffeditor.cpp",
         "diffeditor.h",
+        "diffeditor_global.h",
+        "diffeditorconstants.h",
         "diffeditorfile.cpp",
         "diffeditorfile.h",
         "diffeditorplugin.cpp",
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index d14ba9fbc39..0558ed8e875 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
         "pythoneditorconstants.h",
         "pythoneditorfactory.cpp",
         "pythoneditorfactory.h",
-        "pythoneditorfeatures.h",
         "pythoneditorplugin.cpp",
         "pythoneditorplugin.h",
         "pythoneditorplugin.qrc",
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 37637338cf1..b494f19dc25 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -47,6 +47,8 @@ QtcPlugin {
             "qmakeglobals.h",
             "qmakeparser.cpp",
             "qmakeparser.h",
+            "qmakevfs.cpp",
+            "qmakevfs.h",
         ]
     }
 
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 36336e6d65a..1458b756a31 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -114,6 +114,7 @@ QtcPlugin {
     ]
 
     Export {
+        Depends { name: "AnalyzerBase" }
         Depends { name: "Core" }
         Depends { name: "QtcSsh" }
     }