diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 78bccaa4c1b..db5ecfc5280 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -25,14 +25,9 @@
 
 #include "remotelinuxdeployconfiguration.h"
 
-#include "checkforfreediskspacestep.h"
-#include "genericdirectuploadstep.h"
 #include "makeinstallstep.h"
-#include "killappstep.h"
 #include "remotelinux_constants.h"
-#include "rsyncdeploystep.h"
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
@@ -67,14 +62,14 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
         }
     });
 
-    addInitialStep(MakeInstallStep::stepId(), needsMakeInstall);
-    addInitialStep(CheckForFreeDiskSpaceStep::stepId());
-    addInitialStep(KillAppStep::stepId());
-    addInitialStep(RsyncDeployStep::stepId(), [](Target *target) {
+    addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
+    addInitialStep(Constants::CheckForFreeDiskSpaceId);
+    addInitialStep(Constants::KillAppStepId);
+    addInitialStep(Constants::RsyncDeployStepId, [](Target *target) {
         auto device = DeviceKitAspect::device(target->kit());
         return device && device->extraData(Constants::SupportsRSync).toBool();
     });
-    addInitialStep(GenericDirectUploadStep::stepId(), [](Target *target) {
+    addInitialStep(Constants::DirectUploadStepId, [](Target *target) {
         auto device = DeviceKitAspect::device(target->kit());
         return device && !device->extraData(Constants::SupportsRSync).toBool();
     });