diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index bb2c56325d5..664a1c2f971 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -34,7 +34,7 @@
 #include "deployablefile.h"
 #include "deploymentinfo.h"
 #include "genericdirectuploadservice.h"
-#include "qt4maemodeployconfiguration.h"
+#include "remotelinuxdeployconfiguration.h"
 
 #include <QtCore/QList>
 #include <QtCore/QSharedPointer>
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
index 7d45a951627..fdaf5671afd 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Maemo Device Configurations</string>
+   <string>Linux Device Configurations</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
diff --git a/src/plugins/remotelinux/maemoconstants.h b/src/plugins/remotelinux/maemoconstants.h
index cf82017d3a1..d6a1fd80840 100644
--- a/src/plugins/remotelinux/maemoconstants.h
+++ b/src/plugins/remotelinux/maemoconstants.h
@@ -52,16 +52,12 @@ const char MeeGoOsType[] = "MeeGoOsType";
 static const QLatin1String MAEMO_RC_ID(PREFIX);
 static const QLatin1String MAEMO_RC_ID_PREFIX(PREFIX ".");
 
-static const QLatin1String ArgumentsKey(PREFIX ".Arguments");
 static const QLatin1String LastDeployedHostsKey(PREFIX ".LastDeployedHosts");
 static const QLatin1String LastDeployedFilesKey(PREFIX ".LastDeployedFiles");
 static const QLatin1String LastDeployedRemotePathsKey(PREFIX ".LastDeployedRemotePaths");
 static const QLatin1String LastDeployedTimesKey(PREFIX ".LastDeployedTimes");
-static const QLatin1String ProFileKey(PREFIX ".ProFile");
 static const QLatin1String ExportedLocalDirsKey(PREFIX ".ExportedLocalDirs");
 static const QLatin1String RemoteMountPointsKey(PREFIX ".RemoteMountPoints");
-static const QLatin1String BaseEnvironmentBaseKey(PREFIX ".BaseEnvironmentBase");
-static const QLatin1String UserEnvironmentChangesKey(PREFIX ".UserEnvironmentChanges");
 
 } // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index ff4368ac997..4f214f15ff8 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -32,14 +32,15 @@
 #include "remotelinuxdebugsupport.h"
 
 #include "linuxdeviceconfiguration.h"
-#include "qt4maemotarget.h"
 #include "remotelinuxapplicationrunner.h"
 #include "remotelinuxusedportsgatherer.h"
 
 #include <debugger/debuggerengine.h>
 #include <projectexplorer/abi.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
+#include <qt4projectmanager/qt4buildconfiguration.h>
 #include <utils/qtcassert.h>
 
 using namespace Utils;
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index e1a54422e14..ebe1499b433 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -59,6 +59,13 @@ using namespace Qt4ProjectManager;
 
 namespace RemoteLinux {
 namespace Internal {
+namespace {
+const char ArgumentsKey[] = "Qt4ProjectManager.MaemoRunConfiguration.Arguments";
+const char ProFileKey[] = "Qt4ProjectManager.MaemoRunConfiguration.ProFile";
+const char BaseEnvironmentBaseKey[] = "Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase";
+const char UserEnvironmentChangesKey[]
+    = "Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges";
+} // anonymous namespace
 
 class RemoteLinuxRunConfigurationPrivate {
 public:
@@ -200,11 +207,11 @@ void RemoteLinuxRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNod
 QVariantMap RemoteLinuxRunConfiguration::toMap() const
 {
     QVariantMap map(RunConfiguration::toMap());
-    map.insert(ArgumentsKey, m_d->arguments);
+    map.insert(QLatin1String(ArgumentsKey), m_d->arguments);
     const QDir dir = QDir(target()->project()->projectDirectory());
-    map.insert(ProFileKey, dir.relativeFilePath(m_d->proFilePath));
-    map.insert(BaseEnvironmentBaseKey, m_d->baseEnvironmentType);
-    map.insert(UserEnvironmentChangesKey,
+    map.insert(QLatin1String(ProFileKey), dir.relativeFilePath(m_d->proFilePath));
+    map.insert(QLatin1String(BaseEnvironmentBaseKey), m_d->baseEnvironmentType);
+    map.insert(QLatin1String(UserEnvironmentChangesKey),
         Utils::EnvironmentItem::toStringList(m_d->userEnvironmentChanges));
     return map;
 }
@@ -214,13 +221,13 @@ bool RemoteLinuxRunConfiguration::fromMap(const QVariantMap &map)
     if (!RunConfiguration::fromMap(map))
         return false;
 
-    m_d->arguments = map.value(ArgumentsKey).toString();
+    m_d->arguments = map.value(QLatin1String(ArgumentsKey)).toString();
     const QDir dir = QDir(target()->project()->projectDirectory());
-    m_d->proFilePath = dir.filePath(map.value(ProFileKey).toString());
+    m_d->proFilePath = dir.filePath(map.value(QLatin1String(ProFileKey)).toString());
     m_d->userEnvironmentChanges =
-        Utils::EnvironmentItem::fromStringList(map.value(UserEnvironmentChangesKey)
+        Utils::EnvironmentItem::fromStringList(map.value(QLatin1String(UserEnvironmentChangesKey))
         .toStringList());
-    m_d->baseEnvironmentType = static_cast<BaseEnvironmentType> (map.value(BaseEnvironmentBaseKey,
+    m_d->baseEnvironmentType = static_cast<BaseEnvironmentType>(map.value(QLatin1String(BaseEnvironmentBaseKey),
         SystemBaseEnvironment).toInt());
 
     m_d->validParse = qt4Target()->qt4Project()->validParse(m_d->proFilePath);
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index a8c0f81df2b..ea249616da7 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -33,7 +33,6 @@
 #ifndef REMOTELINUXRUNCONFIGURATION_H
 #define REMOTELINUXRUNCONFIGURATION_H
 
-#include "maemoconstants.h"
 #include "portlist.h"
 #include "remotelinux_export.h"
 
@@ -59,7 +58,6 @@ class RemoteLinuxRunConfigurationWidget;
 class RemoteLinuxDeployConfiguration;
 
 namespace Internal {
-class MaemoDeviceConfigListModel;
 class RemoteLinuxRunConfigurationPrivate;
 class RemoteLinuxRunConfigurationFactory;
 } // namespace Internal