diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 794ee3ee6b6..e6e4f6a1819 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -32,9 +32,6 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 
-#include <ssh/sshconnection.h> // FIXME: Remove after downstream was adapted
-#include <QHostAddress> // FIXME: Remove after downstream was adapted
-
 namespace Debugger {
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
deleted file mode 100644
index da1bca17234..00000000000
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-// Remove after downstream was adapted
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index f668ee3a5fb..e5821e142fa 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -70,6 +70,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/id.h>
 
+#include <ssh/sshconnection.h>
+
 #include <utils/fancymainwindow.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
@@ -78,6 +80,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QHostAddress>
 #include <QLabel>
 #include <QMenu>
 #include <QToolButton>