From 55d9fac2fbe6c1e55119dc2de54de7e150b0f688 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 26 Sep 2017 16:35:34 +0200
Subject: [PATCH] Debugger: Clean up outdated includes and files

Change-Id: I1b4b84ff9bfa3f6e0fe3030d70a114e2cf0f0604
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggerruncontrol.h      | 3 ---
 src/plugins/debugger/debuggerstartparameters.h | 2 --
 src/plugins/valgrind/memchecktool.cpp          | 3 +++
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 src/plugins/debugger/debuggerstartparameters.h

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>