diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 2d345fb5b81..642742187d1 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -297,6 +297,8 @@ plugin_analyzerbase.depends += plugin_cpptools
 plugin_valgrind.subdir = valgrind
 plugin_valgrind.depends = plugin_coreplugin
 plugin_valgrind.depends += plugin_analyzerbase
+plugin_valgrind.depends += plugin_remotelinux
+plugin_valgrind.depends += plugin_texteditor
 
 plugin_qmlprofiler.subdir = qmlprofiler
 plugin_qmlprofiler.depends = plugin_coreplugin
diff --git a/src/plugins/valgrind/Valgrind.pluginspec.in b/src/plugins/valgrind/Valgrind.pluginspec.in
index 31a1de78e7d..c0a5f9f8767 100644
--- a/src/plugins/valgrind/Valgrind.pluginspec.in
+++ b/src/plugins/valgrind/Valgrind.pluginspec.in
@@ -14,7 +14,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <description>Valgrind Plugin</description>
     <url>http://qt.nokia.com</url>
     <dependencyList>
-        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri
index b6b5ec7ed6e..ea9b0abc94c 100644
--- a/src/plugins/valgrind/valgrind_dependencies.pri
+++ b/src/plugins/valgrind/valgrind_dependencies.pri
@@ -2,4 +2,5 @@ include(../../libs/cplusplus/cplusplus.pri)
 include(../../plugins/analyzerbase/analyzerbase.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../plugins/texteditor/texteditor.pri)
+include(../../plugins/remotelinux/remotelinux.pri)
 include(../../libs/utils/utils.pri)
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 6d10de2b6dd..98c3caf978d 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -45,9 +45,6 @@
 #include <projectexplorer/applicationrunconfiguration.h>
 #include <projectexplorer/projectexplorer.h>
 
-#include <remotelinux/linuxdeviceconfiguration.h>
-#include <remotelinux/remotelinuxrunconfiguration.h>
-
 #include <utils/qtcassert.h>
 
 #include <QDebug>