diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index ac0b35ede073f226c718f038fc9c0db6b8b9195e..a0ed6a0ac718e919ba0ed26d040cf7fd56466af8 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -47,9 +47,10 @@ class Project;
 }
 
 namespace Qt4ProjectManager {
-namespace Internal {
 class Qt4BuildConfiguration;
 
+namespace Internal {
+
 class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
     Q_OBJECT
@@ -83,7 +84,7 @@ public:
     explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
     virtual ~MakeStep();
 
-    Internal::Qt4BuildConfiguration *qt4BuildConfiguration() const;
+    Qt4BuildConfiguration *qt4BuildConfiguration() const;
 
     virtual bool init();
     virtual void run(QFutureInterface<bool> &);
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 09befadf7384eda863693de24d89f2484fc8345c..aaa37d3c4a48aead86ab9da0541e07c81282f977 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -44,9 +44,9 @@ class Project;
 
 namespace Qt4ProjectManager {
 class Qt4Project;
+class Qt4BuildConfiguration;
 
 namespace Internal {
-class Qt4BuildConfiguration;
 
 class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
@@ -77,7 +77,7 @@ public:
     explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
     virtual ~QMakeStep();
 
-    Internal::Qt4BuildConfiguration *qt4BuildConfiguration() const;
+    Qt4BuildConfiguration *qt4BuildConfiguration() const;
     virtual bool init();
     virtual void run(QFutureInterface<bool> &);
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
index a62b5fc4f461b9ac6c376a20a879ed078bbf3e10..b7175116b72060c2a01d69238426e7b60c91430a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
@@ -54,9 +54,9 @@ QT_FORWARD_DECLARE_CLASS(QTimer);
 namespace ProjectExplorer { class BuildStep; }
 
 namespace Qt4ProjectManager {
-namespace Internal {
-
 class Qt4BuildConfiguration;
+
+namespace Internal {
 class Qt4ProFileNode;
 
 class MaemoDeployables : public QAbstractListModel
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
index a05e5b0c587f3fe902df0edfa3501d5419d4b01a..79c9529000a14e3b75fabdf4ea6cf9fdae5e6925 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
@@ -51,13 +51,13 @@ class QProcess;
 QT_END_NAMESPACE
 
 namespace Qt4ProjectManager {
-namespace Internal {
+class Qt4BuildConfiguration;
 
-class MaemoDeployableListModel;
+namespace Internal {
 class MaemoDeployStep;
+class MaemoDeployableListModel;
 class MaemoToolChain;
 class MaemoProFileWrapper;
-class Qt4BuildConfiguration;
 
 class MaemoPackageCreationStep : public ProjectExplorer::BuildStep
 {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
index 2df403bbf5140987509b68a97973fa7ab42e863f..d911a241a9ee277bef7f362096b8460b15aaad71 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
@@ -39,8 +39,8 @@ class Project;
 }
 
 namespace Qt4ProjectManager {
-namespace Internal {
 class Qt4BuildConfiguration;
+namespace Internal {
 
 class MaemoPublisherFremantleFree : public QObject
 {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h
index 3dd9d568acef0e48e2a59af4ed3a3dfc175ad2c9..0c25f5b608b0dbfd95c6c296e40d1733472f2bd1 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublishingbuildsettingspagefremantlefree.h
@@ -41,9 +41,10 @@ QT_END_NAMESPACE
 namespace ProjectExplorer { class Project; }
 
 namespace Qt4ProjectManager {
+class Qt4BuildConfiguration;
+
 namespace Internal {
 class MaemoPublisherFremantleFree;
-class Qt4BuildConfiguration;
 
 class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage
 {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
index 883fef516a619a73b1478d0abcf750dd1809d109..c83ddd26f2ff74aee8bffd6b42f60f12f0facdcc 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
@@ -45,13 +45,13 @@ QT_FORWARD_DECLARE_CLASS(QWidget)
 
 namespace Qt4ProjectManager {
 
+class Qt4BuildConfiguration;
 class Qt4Project;
+class Qt4Target;
 
 namespace Internal {
 
-class Qt4BuildConfiguration;
 class Qt4ProFileNode;
-class Qt4Target;
 
 class MaemoDeviceConfigListModel;
 class MaemoDeployStep;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
index b88613dcf5be812d5b3f05e85e1685a2f5dbf916..1066a82328f82a9ce70bdd7a1c6266cb896f3f24 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
@@ -60,11 +60,11 @@ class EnvironmentWidget;
 namespace Utils { class DetailsWidget; }
 
 namespace Qt4ProjectManager {
-namespace Internal {
+class Qt4BuildConfiguration;
 
+namespace Internal {
 class MaemoDeviceEnvReader;
 class MaemoRunConfiguration;
-class Qt4BuildConfiguration;
 
 class MaemoRunConfigurationWidget : public QWidget
 {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
index 37b07fd345060a2825ef5b843a9391b5e8c2331f..7dcc8c33fe7fdf973c156d78c57dfc666b4b378d 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
@@ -46,10 +46,10 @@ class Target;
 
 namespace Qt4ProjectManager {
 class Qt4Project;
+class Qt4Target;
 
 namespace Internal {
 class Qt4ProFileNode;
-class Qt4Target;
 
 class MaemoTemplatesManager : public QObject
 {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index b5adbd040afa04146820e11c0d01b5a887fddf9a..cf8b61aada97e1dbdacf11c8a881d99f4f18f0ae 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -58,6 +58,7 @@
 #include <QSettings>
 #include <QMessageBox>
 
+using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
 namespace {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
index a82eaa45ab7356c6b2faab44b4df61a7236dfe00..496badd1d035c2b60dc26586850b30d95d77246f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
@@ -40,10 +40,10 @@ class RunConfiguration;
 
 namespace Qt4ProjectManager {
 class QtVersion;
+class Qt4Target;
 
 namespace Internal {
 class Qt4ProFileNode;
-class Qt4Target;
 class S60DeployConfigurationFactory;
 class S60DeviceRunConfiguration;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 56dc41a97c1ce9957f2ba5037462b6f0fbdf860c..3d89fb63d03bfa134e92066e11ec7d035f0dca00 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -53,10 +53,10 @@ class Launcher;
 
 namespace Qt4ProjectManager {
 class QtVersion;
+class Qt4Target;
 
 namespace Internal {
 class Qt4ProFileNode;
-class Qt4Target;
 class S60DeviceRunConfigurationFactory;
 
 class S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration
@@ -65,7 +65,7 @@ class S60DeviceRunConfiguration : public ProjectExplorer::RunConfiguration
     friend class S60DeviceRunConfigurationFactory;
 
 public:
-    S60DeviceRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, const QString &proFilePath);
+    S60DeviceRunConfiguration(Qt4ProjectManager::Qt4Target *parent, const QString &proFilePath);
     virtual ~S60DeviceRunConfiguration();
 
     Qt4Target *qt4Target() const;
@@ -97,7 +97,7 @@ signals:
     void targetInformationChanged();
 
 protected:
-    S60DeviceRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, S60DeviceRunConfiguration *source);
+    S60DeviceRunConfiguration(Qt4ProjectManager::Qt4Target *parent, S60DeviceRunConfiguration *source);
     QString defaultDisplayName() const;
     virtual bool fromMap(const QVariantMap &map);
 private slots:
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index e4d1c7673f9c8f7f495daafaaada6051665993be..9ac4acb2170edc18c41ee778e36df05f5fced2df 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -47,10 +47,10 @@ class DetailsWidget;
 
 namespace Qt4ProjectManager {
 class Qt4Project;
+class Qt4Target;
 
 namespace Internal {
 class Qt4ProFileNode;
-class Qt4Target;
 class S60EmulatorRunConfigurationFactory;
 
 class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
@@ -59,7 +59,7 @@ class S60EmulatorRunConfiguration : public ProjectExplorer::RunConfiguration
     friend class S60EmulatorRunConfigurationFactory;
 
 public:
-    S60EmulatorRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, const QString &proFilePath);
+    S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4Target *parent, const QString &proFilePath);
     virtual ~S60EmulatorRunConfiguration();
 
     Qt4Target *qt4Target() const;
@@ -82,7 +82,7 @@ private slots:
     void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
 
 protected:
-    S60EmulatorRunConfiguration(Qt4ProjectManager::Internal::Qt4Target *parent, S60EmulatorRunConfiguration *source);
+    S60EmulatorRunConfiguration(Qt4ProjectManager::Qt4Target *parent, S60EmulatorRunConfiguration *source);
     virtual bool fromMap(const QVariantMap &map);
 
 private:
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 09ae045934e6112658fa1421c84265ae3b88eef3..3fce259144669ff39e868ec4d4cdb9e64a369600 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -726,7 +726,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target
     QtVersion *version = QtVersionManager::instance()->version(info.versionId);
     Q_ASSERT(version);
 
-    Qt4Target *qt4Target(static_cast<Qt4Target *>(parent));
+    Qt4Target *qt4Target = static_cast<Qt4Target *>(parent);
 
     bool ok;
     QString buildConfigurationName = QInputDialog::getText(0,
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 2a1940bbfecfa90de021c55e3ec7dd818fb6a03a..a850f75eb8afce1dc365711b859a966055ad6a95 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -43,16 +43,17 @@ namespace Qt4ProjectManager {
 
 class QMakeStep;
 class MakeStep;
+class Qt4Target;
 
 namespace Internal {
 class Qt4ProFileNode;
 class Qt4BuildConfigurationFactory;
-class Qt4Target;
+}
 
 class Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration
 {
     Q_OBJECT
-    friend class Qt4BuildConfigurationFactory;
+    friend class Internal::Qt4BuildConfigurationFactory;
 
 public:
     explicit Qt4BuildConfiguration(Qt4Target *target);
@@ -133,7 +134,7 @@ signals:
 
     /// emitted if the build configuration changed in a way that
     /// should trigger a reevaluation of all .pro files
-    void proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *);
+    void proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *);
 
     void buildDirectoryInitialized();
 
@@ -160,6 +161,7 @@ private:
     Qt4ProjectManager::Internal::Qt4ProFileNode *m_subNodeBuild;
 };
 
+namespace Internal {
 class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
 {
     Q_OBJECT
@@ -196,7 +198,7 @@ private:
     QMap<QString, VersionInfo> m_versions;
 };
 
-} // namespace Qt4ProjectManager
 } // namespace Internal
+} // namespace Qt4ProjectManager
 
 #endif // QT4BUILDCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 8e4ddafaa4c9c8484309b2e140359fe1f2bceb94..6e43de33aff7a76ba1e68f20117d22a2b8103a7a 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -372,11 +372,11 @@ void Qt4Project::onAddedTarget(ProjectExplorer::Target *t)
     Q_ASSERT(qt4target);
     connect(qt4target, SIGNAL(buildDirectoryInitialized()),
             this, SIGNAL(buildDirectoryInitialized()));
-    connect(qt4target, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target*)),
-            this, SLOT(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target*)));
+    connect(qt4target, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target*)),
+            this, SLOT(proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target*)));
 }
 
-void Qt4Project::proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target *target)
+void Qt4Project::proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target *target)
 {
     if (activeTarget() == target)
         scheduleAsyncUpdate();
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index bde487b5850f4d046d0074c2eb4db1fbabe9240d..3807cf86d676b723bb5be3f7f42be940210e7adf 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -153,7 +153,7 @@ public:
 
     Internal::Qt4TargetFactory *targetFactory() const;
 
-    Internal::Qt4Target *activeTarget() const;
+    Qt4Target *activeTarget() const;
 
     QList<Core::IFile *> dependencies();     //NBS remove
     QList<ProjectExplorer::Project *>dependsOn();
@@ -208,7 +208,7 @@ protected:
     virtual bool fromMap(const QVariantMap &map);
 
 private slots:
-    void proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target *target);
+    void proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target *target);
 
     void asyncUpdate();
 
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index b49a7a9dd8cc13087392a30e4c512eb7974823ce..59505bf9f55a099426f1d778153847c045305249 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -41,13 +41,11 @@ namespace Utils {
 }
 
 namespace Qt4ProjectManager {
-
-class Qt4Project;
-
-namespace Internal {
+class Qt4Target;
 class Qt4BuildConfiguration;
 class Qt4Target;
 
+namespace Internal {
 namespace Ui {
 class Qt4ProjectConfigWidget;
 }
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 8acfd5f9f8c99d5185dccedfd391678dbc90fbd5..a816b15ce5bfe6e92f7968acf4a3222b1b5b39cf 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -55,14 +55,13 @@ namespace ProjectExplorer {
 }
 
 namespace Qt4ProjectManager {
-
 class Qt4Project;
+class Qt4Target;
 
 namespace Internal {
 class Qt4PriFileNode;
 class Qt4ProFileNode;
 class Qt4RunConfigurationFactory;
-class Qt4Target;
 
 class Qt4RunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
 {
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 6e30e4f496cb34d83077856cfe09e262bb23389e..921e8a218a7e3bba92128a1e2234bb92048f2282 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -444,8 +444,8 @@ void Qt4Target::onAddedBuildConfiguration(ProjectExplorer::BuildConfiguration *b
     Q_ASSERT(qt4bc);
     connect(qt4bc, SIGNAL(buildDirectoryInitialized()),
             this, SIGNAL(buildDirectoryInitialized()));
-    connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *)),
-            this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *)));
+    connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *)),
+            this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *)));
 }
 
 void Qt4Target::onAddedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
@@ -466,7 +466,7 @@ void Qt4Target::slotUpdateDeviceInformation()
     }
 }
 
-void Qt4Target::onProFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *bc)
+void Qt4Target::onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *bc)
 {
     if (bc && bc == activeBuildConfiguration())
         emit proFileEvaluateNeeded(this);
diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h
index ff936b6d78ae8f77962567ee9a52ff656cb13b94..c40f76c9aa138778c7fac8a11f91cc025c503a0d 100644
--- a/src/plugins/qt4projectmanager/qt4target.h
+++ b/src/plugins/qt4projectmanager/qt4target.h
@@ -55,6 +55,7 @@ struct BuildConfigurationInfo {
     QString additionalArguments;
     QString directory;
 };
+}
 
 class Qt4Target : public ProjectExplorer::Target
 {
@@ -70,7 +71,7 @@ public:
     Qt4BuildConfiguration *activeBuildConfiguration() const;
     Qt4ProjectManager::Qt4Project *qt4Project() const;
 
-    Internal::Qt4BuildConfiguration *addQt4BuildConfiguration(QString displayName,
+    Qt4BuildConfiguration *addQt4BuildConfiguration(QString displayName,
                                                               QtVersion *qtversion,
                                                               QtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
                                                               QString additionalArguments,
@@ -86,21 +87,20 @@ public:
     QString defaultBuildDirectory() const;
     static QString defaultShadowBuildDirectory(const QString &projectLocation, const QString &id);
 
+    bool fromMap(const QVariantMap &map);
+
 signals:
     void buildDirectoryInitialized();
     /// emitted if the build configuration changed in a way that
     /// should trigger a reevaluation of all .pro files
-    void proFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4Target *);
-
-protected:
-    bool fromMap(const QVariantMap &map);
+    void proFileEvaluateNeeded(Qt4ProjectManager::Qt4Target *);
 
 private slots:
     void updateQtVersion();
     void onAddedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc);
     void onAddedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc);
     void slotUpdateDeviceInformation();
-    void onProFileEvaluateNeeded(Qt4ProjectManager::Internal::Qt4BuildConfiguration *bc);
+    void onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void emitProFileEvaluateNeeded();
     void updateToolTipAndIcon();
 
@@ -112,6 +112,7 @@ private:
     Internal::Qt4DeployConfigurationFactory *m_deployConfigurationFactory;
 };
 
+namespace Internal {
 class Qt4TargetFactory : public ProjectExplorer::ITargetFactory
 {
     Q_OBJECT
@@ -126,14 +127,13 @@ public:
     QString displayNameForId(const QString &id) const;
 
     bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
-    Internal::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id);
-    Internal::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id, QList<QtVersion *> versions);
-    Internal::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id, QList<BuildConfigurationInfo> infos);
+    Qt4ProjectManager::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id);
+    Qt4ProjectManager::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id, QList<QtVersion *> versions);
+    Qt4ProjectManager::Qt4Target *create(ProjectExplorer::Project *parent, const QString &id, QList<Internal::BuildConfigurationInfo> infos);
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
-    Internal::Qt4Target *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
+    Qt4ProjectManager::Qt4Target *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 };
-
-} // namespace Internal
+}
 
 } // namespace Qt4ProjectManager
 
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 979c7f88a8e2b3d49876927945ba8739f5b86166..b8f35530b5a9a49fcc96659a8ec9ccdabffd5a6a 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -52,6 +52,7 @@
 #include <QtGui/QPushButton>
 #include <QtGui/QTreeWidget>
 
+using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
 namespace {