diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index cbb84a442b8..c27bafb6a73 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -45,13 +45,11 @@ enum State { Inactive, Connecting, RunningUname, TestingPorts };
 class GenericLinuxDeviceTesterPrivate
 {
 public:
-    GenericLinuxDeviceTesterPrivate() : connection(0), state(Inactive) {}
-
     IDevice::ConstPtr deviceConfiguration;
-    SshConnection *connection;
+    SshConnection *connection = nullptr;
     SshRemoteProcess::Ptr process;
     DeviceUsedPortsGatherer portsGatherer;
-    State state;
+    State state = Inactive;
 };
 
 } // namespace Internal
@@ -105,11 +103,6 @@ void GenericLinuxDeviceTester::stopTest()
     setFinished(TestFailure);
 }
 
-DeviceUsedPortsGatherer *GenericLinuxDeviceTester::usedPortsGatherer() const
-{
-    return &d->portsGatherer;
-}
-
 void GenericLinuxDeviceTester::handleConnected()
 {
     QTC_ASSERT(d->state == Connecting, return);
diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h
index 8c658bf150b..8a20edde037 100644
--- a/src/plugins/remotelinux/linuxdevicetester.h
+++ b/src/plugins/remotelinux/linuxdevicetester.h
@@ -29,10 +29,6 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 
-namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
-namespace QSsh { class SshConnection; }
-namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
-
 namespace RemoteLinux {
 
 namespace Internal { class GenericLinuxDeviceTesterPrivate; }
@@ -48,8 +44,6 @@ public:
     void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration);
     void stopTest();
 
-    ProjectExplorer::DeviceUsedPortsGatherer *usedPortsGatherer() const;
-
 private:
     void handleConnected();
     void handleConnectionFailure();