ProjectExplorer: Remove redundant namespace qualifications

Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>

70 files changed, 334 insertions, 326 deletions

diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 42f6372452..b42cf650b0 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -307,26 +307,26 @@ Abi::Abi(const Architecture &a, const OS &o,
     m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w)
 {
     switch (m_os) {
-    case ProjectExplorer::Abi::UnknownOS:
+    case Abi::UnknownOS:
         m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::LinuxOS:
+    case Abi::LinuxOS:
         if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > AndroidLinuxFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::BsdOS:
+    case Abi::BsdOS:
         if (m_osFlavor < FreeBsdFlavor || m_osFlavor > OpenBsdFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::MacOS:
+    case Abi::MacOS:
         if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::UnixOS:
+    case Abi::UnixOS:
         if (m_osFlavor < GenericUnixFlavor || m_osFlavor > SolarisUnixFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::WindowsOS:
+    case Abi::WindowsOS:
         if (m_osFlavor < WindowsMsvc2005Flavor || m_osFlavor > WindowsCEFlavor)
             m_osFlavor = UnknownFlavor;
         break;
@@ -628,37 +628,37 @@ QString Abi::toString(const OS &o)
 QString Abi::toString(const OSFlavor &of)
 {
     switch (of) {
-    case ProjectExplorer::Abi::GenericLinuxFlavor:
+    case Abi::GenericLinuxFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::AndroidLinuxFlavor:
+    case Abi::AndroidLinuxFlavor:
         return QLatin1String("android");
-    case ProjectExplorer::Abi::FreeBsdFlavor:
+    case Abi::FreeBsdFlavor:
         return QLatin1String("freebsd");
-    case ProjectExplorer::Abi::NetBsdFlavor:
+    case Abi::NetBsdFlavor:
         return QLatin1String("netbsd");
-    case ProjectExplorer::Abi::OpenBsdFlavor:
+    case Abi::OpenBsdFlavor:
         return QLatin1String("openbsd");
-    case ProjectExplorer::Abi::GenericMacFlavor:
+    case Abi::GenericMacFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::GenericUnixFlavor:
+    case Abi::GenericUnixFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::SolarisUnixFlavor:
+    case Abi::SolarisUnixFlavor:
         return QLatin1String("solaris");
-    case ProjectExplorer::Abi::WindowsMsvc2005Flavor:
+    case Abi::WindowsMsvc2005Flavor:
         return QLatin1String("msvc2005");
-    case ProjectExplorer::Abi::WindowsMsvc2008Flavor:
+    case Abi::WindowsMsvc2008Flavor:
         return QLatin1String("msvc2008");
-    case ProjectExplorer::Abi::WindowsMsvc2010Flavor:
+    case Abi::WindowsMsvc2010Flavor:
         return QLatin1String("msvc2010");
-    case ProjectExplorer::Abi::WindowsMsvc2012Flavor:
+    case Abi::WindowsMsvc2012Flavor:
         return QLatin1String("msvc2012");
-    case ProjectExplorer::Abi::WindowsMsvc2013Flavor:
+    case Abi::WindowsMsvc2013Flavor:
         return QLatin1String("msvc2013");
-    case ProjectExplorer::Abi::WindowsMSysFlavor:
+    case Abi::WindowsMSysFlavor:
         return QLatin1String("msys");
-    case ProjectExplorer::Abi::WindowsCEFlavor:
+    case Abi::WindowsCEFlavor:
         return QLatin1String("ce");
-    case ProjectExplorer::Abi::UnknownFlavor: // fall through!
+    case Abi::UnknownFlavor: // fall through!
     default:
         return QLatin1String("unknown");
     }
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 17846cc87d..23bc2cc40a 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -116,17 +116,17 @@ AbstractProcessStep::~AbstractProcessStep()
      Derived classes need to call this function.
 */
 
-void AbstractProcessStep::setOutputParser(ProjectExplorer::IOutputParser *parser)
+void AbstractProcessStep::setOutputParser(IOutputParser *parser)
 {
     delete m_outputParserChain;
     m_outputParserChain = new AnsiFilterParser;
     m_outputParserChain->appendOutputParser(parser);
 
     if (m_outputParserChain) {
-        connect(m_outputParserChain, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat)),
-                this, SLOT(outputAdded(QString,ProjectExplorer::BuildStep::OutputFormat)));
-        connect(m_outputParserChain, SIGNAL(addTask(ProjectExplorer::Task)),
-                this, SLOT(taskAdded(ProjectExplorer::Task)));
+        connect(m_outputParserChain, &IOutputParser::addOutput,
+                this, &AbstractProcessStep::outputAdded);
+        connect(m_outputParserChain, &IOutputParser::addTask,
+                this, &AbstractProcessStep::taskAdded);
     }
 }
 
@@ -134,7 +134,7 @@ void AbstractProcessStep::setOutputParser(ProjectExplorer::IOutputParser *parser
     Appends the given output parser to the existing chain of parsers.
 */
 
-void AbstractProcessStep::appendOutputParser(ProjectExplorer::IOutputParser *parser)
+void AbstractProcessStep::appendOutputParser(IOutputParser *parser)
 {
     if (!parser)
         return;
@@ -144,7 +144,7 @@ void AbstractProcessStep::appendOutputParser(ProjectExplorer::IOutputParser *par
     return;
 }
 
-ProjectExplorer::IOutputParser *AbstractProcessStep::outputParser() const
+IOutputParser *AbstractProcessStep::outputParser() const
 {
     return m_outputParserChain;
 }
@@ -382,7 +382,7 @@ void AbstractProcessStep::checkForCancel()
     }
 }
 
-void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
+void AbstractProcessStep::taskAdded(const Task &task)
 {
     // Do not bother to report issues if we do not care about the results of
     // the buildstep anyway:
@@ -407,7 +407,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
 
         QList<QFileInfo> possibleFiles;
         QString fileName = QFileInfo(filePath).fileName();
-        foreach (const QString &file, project()->files(ProjectExplorer::Project::AllFiles)) {
+        foreach (const QString &file, project()->files(Project::AllFiles)) {
             QFileInfo candidate(file);
             if (candidate.fileName() == fileName)
                 possibleFiles << candidate;
@@ -437,7 +437,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
     emit addTask(editable);
 }
 
-void AbstractProcessStep::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format)
+void AbstractProcessStep::outputAdded(const QString &string, BuildStep::OutputFormat format)
 {
     emit addOutput(string, format, BuildStep::DontAppendNewline);
 }
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 45d1af06db..dd81ce1d75 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -62,9 +62,9 @@ public:
     bool ignoreReturnValue();
     void setIgnoreReturnValue(bool b);
 
-    void setOutputParser(ProjectExplorer::IOutputParser *parser);
-    void appendOutputParser(ProjectExplorer::IOutputParser *parser);
-    ProjectExplorer::IOutputParser *outputParser() const;
+    void setOutputParser(IOutputParser *parser);
+    void appendOutputParser(IOutputParser *parser);
+    IOutputParser *outputParser() const;
 
     void emitFaultyConfigurationMessage();
 
@@ -89,9 +89,9 @@ private slots:
 
     void cleanUp();
 
-    void taskAdded(const ProjectExplorer::Task &task);
+    void taskAdded(const Task &task);
 
-    void outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format);
+    void outputAdded(const QString &string, BuildStep::OutputFormat format);
 
 private:
     QTimer *m_timer;
@@ -99,7 +99,7 @@ private:
     ProcessParameters m_param;
     bool m_ignoreReturnValue;
     Utils::QtcProcess *m_process;
-    ProjectExplorer::IOutputParser *m_outputParserChain;
+    IOutputParser *m_outputParserChain;
     bool m_killProcess;
     bool m_skipFlush;
 };
diff --git a/src/plugins/projectexplorer/ansifilterparser.h b/src/plugins/projectexplorer/ansifilterparser.h
index 5ed0d744aa..9582124de6 100644
--- a/src/plugins/projectexplorer/ansifilterparser.h
+++ b/src/plugins/projectexplorer/ansifilterparser.h
@@ -34,7 +34,7 @@
 
 namespace ProjectExplorer {
 
-class AnsiFilterParser : public ProjectExplorer::IOutputParser
+class AnsiFilterParser : public IOutputParser
 {
     Q_OBJECT
 
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 0968502471..eea84547f1 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -150,7 +150,7 @@ AppOutputPane::AppOutputPane() :
     setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine
 
     // Rerun
-    m_reRunButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL)));
+    m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
     m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
     m_reRunButton->setAutoRaise(true);
     m_reRunButton->setEnabled(false);
@@ -177,7 +177,7 @@ AppOutputPane::AppOutputPane() :
     // Attach
     m_attachButton->setToolTip(msgAttachDebuggerTooltip());
     m_attachButton->setEnabled(false);
-    m_attachButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL)));
+    m_attachButton->setIcon(QIcon(QLatin1String(Constants::ICON_DEBUG_SMALL)));
     m_attachButton->setAutoRaise(true);
 
     connect(m_attachButton, SIGNAL(clicked()),
@@ -430,7 +430,7 @@ void AppOutputPane::attachToRunControl()
 {
     const int index = currentIndex();
     QTC_ASSERT(index != -1, return);
-    ProjectExplorer::RunControl *rc = m_runControlTabs.at(index).runControl;
+    RunControl *rc = m_runControlTabs.at(index).runControl;
     QTC_ASSERT(rc->isRunning(), return);
     ExtensionSystem::Invoker<void>(debuggerCore(), "attachExternalApplication", rc);
 }
@@ -546,7 +546,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning
         }
     } else {
         m_reRunButton->setEnabled(false);
-        m_reRunButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL)));
+        m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
         m_attachButton->setEnabled(false);
         m_attachButton->setToolTip(msgAttachDebuggerTooltip());
         m_stopAction->setEnabled(false);
@@ -591,7 +591,7 @@ void AppOutputPane::slotRunControlStarted()
 
 void AppOutputPane::slotRunControlFinished()
 {
-    ProjectExplorer::RunControl *rc = qobject_cast<RunControl *>(sender());
+    RunControl *rc = qobject_cast<RunControl *>(sender());
     QMetaObject::invokeMethod(this, "slotRunControlFinished2", Qt::QueuedConnection,
                               Q_ARG(ProjectExplorer::RunControl *, rc));
     rc->outputFormatter()->flush();
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 6da9c1a271..39537dc425 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -152,7 +152,7 @@ void BuildConfiguration::setBuildDirectory(const Utils::FileName &dir)
 
 QList<NamedWidget *> BuildConfiguration::createSubConfigWidgets()
 {
-    return QList<NamedWidget *>() << new ProjectExplorer::BuildEnvironmentWidget(this);
+    return QList<NamedWidget *>() << new BuildEnvironmentWidget(this);
 }
 
 Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
@@ -218,8 +218,8 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
     }
 
     // We currently assume there to be at least a clean and build list!
-    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
-    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(Constants::BUILDSTEPS_BUILD)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(Constants::BUILDSTEPS_CLEAN)));
 
     return ProjectConfiguration::fromMap(map);
 }
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 5cb9aec5ce..7ff9289cf1 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -59,7 +59,7 @@ public:
     Utils::FileName buildDirectory() const;
     Utils::FileName rawBuildDirectory() const;
 
-    virtual ProjectExplorer::NamedWidget *createConfigWidget() = 0;
+    virtual NamedWidget *createConfigWidget() = 0;
     virtual QList<NamedWidget *> createSubConfigWidgets();
 
     // Maybe the BuildConfiguration is not the best place for the environment
diff --git a/src/plugins/projectexplorer/buildconfigurationmodel.cpp b/src/plugins/projectexplorer/buildconfigurationmodel.cpp
index a4eb75dbdd..5e6cdbc005 100644
--- a/src/plugins/projectexplorer/buildconfigurationmodel.cpp
+++ b/src/plugins/projectexplorer/buildconfigurationmodel.cpp
@@ -160,7 +160,7 @@ QModelIndex BuildConfigurationModel::indexFor(BuildConfiguration *rc)
     return index(idx, 0);
 }
 
-void BuildConfigurationModel::addedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void BuildConfigurationModel::addedBuildConfiguration(BuildConfiguration *bc)
 {
     // Find the right place to insert
     BuildConfigurationComparer compare;
@@ -179,7 +179,7 @@ void BuildConfigurationModel::addedBuildConfiguration(ProjectExplorer::BuildConf
             this, SLOT(displayNameChanged()));
 }
 
-void BuildConfigurationModel::removedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void BuildConfigurationModel::removedBuildConfiguration(BuildConfiguration *bc)
 {
     int i = m_buildConfigurations.indexOf(bc);
     beginRemoveRows(QModelIndex(), i, i);
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 261a69b624..baa80ae8c1 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -340,7 +340,7 @@ void BuildManager::showBuildResults()
     //toggleTaskWindow();
 }
 
-void BuildManager::addToTaskWindow(const ProjectExplorer::Task &task)
+void BuildManager::addToTaskWindow(const Task &task)
 {
     d->m_outputWindow->registerPositionOf(task);
     // Distribute to all others
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index d285c4a7b9..de5a6da0f6 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -56,8 +56,8 @@ public:
     ~BuildSettingsWidget();
 
     void clearWidgets();
-    void addSubWidget(ProjectExplorer::NamedWidget *widget);
-    QList<ProjectExplorer::NamedWidget *> subWidgets() const;
+    void addSubWidget(NamedWidget *widget);
+    QList<NamedWidget *> subWidgets() const;
 
 private slots:
     void updateBuildSettings();
diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
index c6468f39b1..489fc5aace 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.cpp
+++ b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -182,7 +182,7 @@ static QColor mix_colors(const QColor &a, const QColor &b)
                   (a.blue() + 2* b.blue()) / 3, (a.alpha() + 2 * b.alpha()) / 3);
 }
 
-void CompileOutputWindow::appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format)
+void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputFormat format)
 {
     QPalette p = m_outputWindow->palette();
     QTextCharFormat textFormat;
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index 9068bc2fd9..d7ab6410d5 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -67,7 +67,7 @@ public:
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
-    void appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format);
+    void appendText(const QString &text, BuildStep::OutputFormat format);
     bool canFocus() const;
     bool hasFocus() const;
     void setFocus();
diff --git a/src/plugins/projectexplorer/configtaskhandler.cpp b/src/plugins/projectexplorer/configtaskhandler.cpp
index a4dc2df539..7a275a0c52 100644
--- a/src/plugins/projectexplorer/configtaskhandler.cpp
+++ b/src/plugins/projectexplorer/configtaskhandler.cpp
@@ -47,13 +47,13 @@ ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Core::Id group, Core::
     m_targetPage(page)
 { }
 
-bool ConfigTaskHandler::canHandle(const ProjectExplorer::Task &task) const
+bool ConfigTaskHandler::canHandle(const Task &task) const
 {
     return task.description == m_pattern.description
             && task.category == m_pattern.category;
 }
 
-void ConfigTaskHandler::handle(const ProjectExplorer::Task &task)
+void ConfigTaskHandler::handle(const Task &task)
 {
     Q_UNUSED(task);
     Core::ICore::showOptionsDialog(m_targetGroup, m_targetPage);
diff --git a/src/plugins/projectexplorer/copytaskhandler.cpp b/src/plugins/projectexplorer/copytaskhandler.cpp
index cca6e95634..aceca31ff4 100644
--- a/src/plugins/projectexplorer/copytaskhandler.cpp
+++ b/src/plugins/projectexplorer/copytaskhandler.cpp
@@ -39,7 +39,7 @@
 
 using namespace ProjectExplorer::Internal;
 
-void CopyTaskHandler::handle(const ProjectExplorer::Task &task)
+void CopyTaskHandler::handle(const Task &task)
 {
     QString type;
     switch (task.type) {
diff --git a/src/plugins/projectexplorer/customparserconfigdialog.cpp b/src/plugins/projectexplorer/customparserconfigdialog.cpp
index e5d7b70f0e..c5d1830776 100644
--- a/src/plugins/projectexplorer/customparserconfigdialog.cpp
+++ b/src/plugins/projectexplorer/customparserconfigdialog.cpp
@@ -66,7 +66,7 @@ void CustomParserConfigDialog::setExampleSettings()
     ui->errorMessage->setText(QLatin1String("#error /home/user/src/test.c:891: Unknown identifier `test`"));
 }
 
-void CustomParserConfigDialog::setSettings(const ProjectExplorer::CustomParserSettings &settings)
+void CustomParserConfigDialog::setSettings(const CustomParserSettings &settings)
 {
     if (settings.errorPattern.isEmpty()) {
         setExampleSettings();
@@ -79,9 +79,9 @@ void CustomParserConfigDialog::setSettings(const ProjectExplorer::CustomParserSe
     setMessageCap(settings.messageCap);
 }
 
-ProjectExplorer::CustomParserSettings CustomParserConfigDialog::settings() const
+CustomParserSettings CustomParserConfigDialog::settings() const
 {
-    ProjectExplorer::CustomParserSettings result;
+    CustomParserSettings result;
     result.errorPattern = errorPattern();
     result.fileNameCap = fileNameCap();
     result.lineNumberCap = lineNumberCap();
diff --git a/src/plugins/projectexplorer/customparserconfigdialog.h b/src/plugins/projectexplorer/customparserconfigdialog.h
index 960d4980ac..d79dcb359f 100644
--- a/src/plugins/projectexplorer/customparserconfigdialog.h
+++ b/src/plugins/projectexplorer/customparserconfigdialog.h
@@ -48,8 +48,8 @@ public:
     ~CustomParserConfigDialog();
 
     void setExampleSettings();
-    void setSettings(const ProjectExplorer::CustomParserSettings &settings);
-    ProjectExplorer::CustomParserSettings settings() const;
+    void setSettings(const CustomParserSettings &settings);
+    CustomParserSettings settings() const;
     void setErrorPattern(const QString &errorPattern);
     QString errorPattern() const;
     void setFileNameCap(int fileNameCap);
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index ad04b4c4a8..c6874ee093 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -122,7 +122,7 @@ bool DeployConfiguration::fromMap(const QVariantMap &map)
     }
 
     // We assume that we hold the deploy list
-    Q_ASSERT(m_stepList && m_stepList->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+    Q_ASSERT(m_stepList && m_stepList->id() == Constants::BUILDSTEPS_DEPLOY);
 
     return true;
 }
diff --git a/src/plugins/projectexplorer/deployconfigurationmodel.cpp b/src/plugins/projectexplorer/deployconfigurationmodel.cpp
index 6f1e9cb737..fbc80beeed 100644
--- a/src/plugins/projectexplorer/deployconfigurationmodel.cpp
+++ b/src/plugins/projectexplorer/deployconfigurationmodel.cpp
@@ -158,7 +158,7 @@ QModelIndex DeployConfigurationModel::indexFor(DeployConfiguration *rc)
     return index(idx, 0);
 }
 
-void DeployConfigurationModel::addedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void DeployConfigurationModel::addedDeployConfiguration(DeployConfiguration *dc)
 {
     // Find the right place to insert
     DeployConfigurationComparer compare;
@@ -176,7 +176,7 @@ void DeployConfigurationModel::addedDeployConfiguration(ProjectExplorer::DeployC
             this, SLOT(displayNameChanged()));
 }
 
-void DeployConfigurationModel::removedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void DeployConfigurationModel::removedDeployConfiguration(DeployConfiguration *dc)
 {
     int i = m_deployConfigurations.indexOf(dc);
     if (i < 0)
diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
index 51001610de..fc9834f057 100644
--- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
+++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
@@ -44,7 +44,7 @@ class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
     Q_OBJECT
 public:
     DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id);
-    DeviceCheckBuildStep(ProjectExplorer::BuildStepList *bsl, DeviceCheckBuildStep *bs);
+    DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildStep *bs);
 
     bool init();
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
index 31eb0b1a5e..6f7673690a 100644
--- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp
@@ -51,7 +51,7 @@ public:
     bool finished;
 };
 
-DeviceTestDialog::DeviceTestDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration,
+DeviceTestDialog::DeviceTestDialog(const IDevice::ConstPtr &deviceConfiguration,
                                    QWidget *parent)
     : QDialog(parent), d(new DeviceTestDialogPrivate(deviceConfiguration->createDeviceTester()))
 {
@@ -87,12 +87,12 @@ void DeviceTestDialog::handleErrorMessage(const QString &message)
     addText(message, QLatin1String("red"), false);
 }
 
-void DeviceTestDialog::handleTestFinished(ProjectExplorer::DeviceTester::TestResult result)
+void DeviceTestDialog::handleTestFinished(DeviceTester::TestResult result)
 {
     d->finished = true;
     d->ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
 
-    if (result == ProjectExplorer::DeviceTester::TestSuccess)
+    if (result == DeviceTester::TestSuccess)
         addText(tr("Device test finished successfully."), QLatin1String("blue"), true);
     else
         addText(tr("Device test failed."), QLatin1String("red"), true);
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 4dc5ff21af..56ba476e74 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -388,7 +388,7 @@ void EditorConfiguration::setWrapColumn(int column)
     }
 }
 
-void EditorConfiguration::slotAboutToRemoveProject(ProjectExplorer::Project *project)
+void EditorConfiguration::slotAboutToRemoveProject(Project *project)
 {
     if (project->editorConfiguration() != this)
         return;
diff --git a/src/plugins/projectexplorer/environmentaspectwidget.cpp b/src/plugins/projectexplorer/environmentaspectwidget.cpp
index 75a854b4f7..d90a17db4d 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.cpp
+++ b/src/plugins/projectexplorer/environmentaspectwidget.cpp
@@ -85,7 +85,7 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect, QWid
     if (additionalWidget)
         baseLayout->addWidget(additionalWidget);
 
-    m_environmentWidget = new ProjectExplorer::EnvironmentWidget(this, baseEnvironmentWidget);
+    m_environmentWidget = new EnvironmentWidget(this, baseEnvironmentWidget);
     m_environmentWidget->setBaseEnvironment(m_aspect->baseEnvironment());
     m_environmentWidget->setBaseEnvironmentText(baseDisplayName);
     m_environmentWidget->setUserChanges(m_aspect->userEnvironmentChanges());
diff --git a/src/plugins/projectexplorer/environmentaspectwidget.h b/src/plugins/projectexplorer/environmentaspectwidget.h
index 51d0d53f9b..f45075c71e 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.h
+++ b/src/plugins/projectexplorer/environmentaspectwidget.h
@@ -76,7 +76,7 @@ private:
     QWidget *m_additionalWidget;
     QComboBox *m_baseEnvironmentComboBox;
     Utils::DetailsWidget *m_detailsContainer;
-    ProjectExplorer::EnvironmentWidget *m_environmentWidget;
+    EnvironmentWidget *m_environmentWidget;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 5a65a6f675..54553278e3 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -204,18 +204,18 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
     QTest::newRow("pass-through stdout")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
             << QString::fromLatin1("Sometext\n") << QString()
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("pass-through stderr")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("Sometext\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
 
     QTest::newRow("ar output")
             << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a") << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
 
     QTest::newRow("GCCE error")
@@ -224,7 +224,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "/temp/test/untitled8/main.cpp:9: error: (Each undeclared identifier is reported only once for each function it appears in.)")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `int main(int, char**)':"),
                         Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), -1,
@@ -243,7 +243,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/src/corelib/global/qglobal.h:1635: warning: inline function `QDebug qDebug()' used but never defined")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("inline function `QDebug qDebug()' used but never defined"),
                         Utils::FileName::fromUserInput(QLatin1String("/src/corelib/global/qglobal.h")), 1635,
@@ -253,7 +253,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("main.cpp:7:2: warning: Some warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
+            << (QList<Task>() << Task(Task::Warning,
                                                        QLatin1String("Some warning"),
                                                        Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 7,
                                                        categoryCompile))
@@ -262,7 +262,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:7: #error Symbian error")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("#error Symbian error"),
                         Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 7,
@@ -273,7 +273,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:8: warning: #warning Symbian warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("#warning Symbian warning"),
                         Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 8,
@@ -283,7 +283,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/temp/test/untitled8/main.cpp:8:2: warning: #warning Symbian warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("#warning Symbian warning"),
                         Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), 8,
@@ -295,7 +295,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `main':"),
                         Utils::FileName::fromUserInput(QLatin1String("main.o")), -1,
@@ -316,7 +316,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `main':"),
                         Utils::FileName::fromUserInput(QLatin1String("main.o")), -1,
@@ -335,7 +335,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("c:\\Qt\\4.6\\lib/QtGuid4.dll: file not recognized: File format not recognized")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("file not recognized: File format not recognized"),
                         Utils::FileName::fromUserInput(QLatin1String("c:\\Qt\\4.6\\lib/QtGuid4.dll")), -1,
@@ -345,7 +345,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("g++: /usr/local/lib: No such file or directory")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("/usr/local/lib: No such file or directory"),
                         Utils::FileName(), -1,
@@ -358,7 +358,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "../../../../master/src/plugins/debugger/gdb/gdbengine.cpp:2115: warning: unused variable 'handler'")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'void Debugger::Internal::GdbEngine::handleBreakInsert2(const Debugger::Internal::GdbResponse&)':"),
                         Utils::FileName::fromUserInput(QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp")), -1,
@@ -378,7 +378,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp:264: error: expected ';' before ':' token")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':"),
                         Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp")), -1,
@@ -398,13 +398,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n"
                                                 "distcc[73168] (dcc_build_somewhere) Warning: failed to distribute, running locally instead\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("ld warning (QTCREATORBUG-905)")
             << QString::fromLatin1("ld: warning: Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Warning,
                          QLatin1String("Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o"),
                          Utils::FileName(), -1,
@@ -414,7 +414,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("ld: fatal: Symbol referencing errors. No output written to testproject")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Error,
                          QLatin1String("Symbol referencing errors. No output written to testproject"),
                          Utils::FileName(), -1,
@@ -424,13 +424,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("note")
             << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("initialized from here"),
                          Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/debugger/dumper.cpp")), 1079,
@@ -441,7 +441,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c:194: warning: suggest explicit braces to avoid ambiguous 'else'")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("In static member function 'static std::_Rb_tree_node_base* std::_Rb_global<_Dummy>::_Rebalance_for_erase(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&)':"),
                          Utils::FileName::fromUserInput(QLatin1String("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c")), -1,
@@ -455,19 +455,19 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("ranlib false positive")
             << QString::fromLatin1("ranlib: file: libSupport.a(HashTable.o) has no symbols")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("ranlib: file: libSupport.a(HashTable.o) has no symbols\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("ld: missing library")
             << QString::fromLatin1("/usr/bin/ld: cannot find -ldoesnotexist")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Error,
                          QLatin1String("cannot find -ldoesnotexist"),
                          Utils::FileName(), -1,
@@ -479,7 +479,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "../../scriptbug/main.cpp:8: warning: unused variable c")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("In function void foo(i) [with i = double]:"),
                          Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1,
@@ -497,7 +497,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("main.cpp:10: instantiated from here  ")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("instantiated from here"),
                          Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 10,
@@ -507,7 +507,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/dev/creator/src/plugins/find/basetextfind.h: In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':"),
                          Utils::FileName::fromUserInput(QLatin1String("/dev/creator/src/plugins/find/basetextfind.h")), -1,
@@ -522,7 +522,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "../../scriptbug/main.cpp:5: warning: unused parameter v")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("At global scope:"),
                          Utils::FileName::fromUserInput(QLatin1String("../../scriptbug/main.cpp")), -1,
@@ -549,7 +549,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/home/code/test.cpp:54:38: fatal error: test.moc: No such file or directory")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Error,
                          QLatin1String("test.moc: No such file or directory"),
                          Utils::FileName::fromUserInput(QLatin1String("/home/code/test.cpp")), 54,
@@ -563,7 +563,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `QPlotAxis':"),
                         Utils::FileName::fromUserInput(QLatin1String("debug/qplotaxis.o")), -1,
@@ -590,7 +590,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "../stl/main.cpp:31: warning: unused parameter index")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In member function typename _Vector_base<_Tp, _Alloc>::_Tp_alloc_type::const_reference Vector<_Tp, _Alloc>::at(int) [with _Tp = Point, _Alloc = Allocator<Point>]:"),
                         Utils::FileName::fromUserInput(QLatin1String("../stl/main.cpp")), -1,
@@ -620,7 +620,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "C:/Symbian_SDK/epoc32/include/e32cmn.inl:7094: warning: returning reference to temporary")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from C:/Symbian_SDK/epoc32/include/e32cmn.h:6792,"),
                         Utils::FileName::fromUserInput(QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.h")), 6792,
@@ -643,7 +643,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("../../../src/XmlUg/targetdelete.c: At top level:")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("At top level:"),
                          Utils::FileName::fromUserInput(QLatin1String("../../../src/XmlUg/targetdelete.c")), -1,
@@ -656,7 +656,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh:1134:26: warning: no newline at end of file")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Unknown,
                          QLatin1String("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,"),
                          Utils::FileName::fromUserInput(QLatin1String("/Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h")), 15,
@@ -675,7 +675,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("release/main.o:main.cpp:(.text+0x42): undefined reference to `MainWindow::doSomething()'")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `MainWindow::doSomething()'"),
                         Utils::FileName::fromUserInput(QLatin1String("main.cpp")), -1,
@@ -687,7 +687,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "../../../src/shared/proparser/profileevaluator.cpp:2817:9: warning: case value '0' not in enumerated type 'ProFileEvaluator::Private::TestFunc'")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':"),
                         Utils::FileName::fromUserInput(QLatin1String("../../../src/shared/proparser/profileevaluator.cpp")), -1,
@@ -703,7 +703,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "./mw.h:4:0: warning: \"STUPID_DEFINE\" redefined")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from <command-line>:0:0:"),
                         Utils::FileName::fromUserInput(QLatin1String("<command-line>")), 0,
@@ -719,7 +719,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "file.h:21:5: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function 'void UnitTest::CheckEqual(UnitTest::TestResults&, const Expected&, const Actual&, const UnitTest::TestDetails&) [with Expected = unsigned int, Actual = int]':"),
                         Utils::FileName::fromUserInput(QLatin1String("file.h")), -1,
@@ -737,7 +737,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("cns5k_ins_parser_tests.cpp:(.text._ZN20CNS5kINSParserEngine21DropBytesUntilStartedEP14CircularBufferIhE[CNS5kINSParserEngine::DropBytesUntilStarted(CircularBuffer<unsigned char>*)]+0x6d): undefined reference to `CNS5kINSPacket::SOH_BYTE'")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `CNS5kINSPacket::SOH_BYTE'"),
                         Utils::FileName::fromUserInput(QLatin1String("cns5k_ins_parser_tests.cpp")), -1,
@@ -748,7 +748,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("mainwindow.ui: Warning: The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'.")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Warning,
                          QLatin1String("The name 'pushButton' (QPushButton) is already in use, defaulting to 'pushButton1'."),
                          Utils::FileName::fromUserInput(QLatin1String("mainwindow.ui")), -1,
@@ -759,7 +759,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("libimf.so: warning: warning: feupdateenv is not implemented and will always fail")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                  << Task(Task::Warning,
                          QLatin1String("warning: feupdateenv is not implemented and will always fail"),
                          Utils::FileName::fromUserInput(QLatin1String("libimf.so")), -1,
@@ -773,7 +773,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "                         ^")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from /home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp:31:0:"),
                         Utils::FileName::fromUserInput(QLatin1String("/home/code/src/creator/src/libs/extensionsystem/pluginerrorview.cpp")), 31,
@@ -794,7 +794,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "main.cpp:7:22: error: within this context")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << ( QList<ProjectExplorer::Task>()
+            << ( QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from /usr/include/qt4/QtCore/QString:1:0,"),
                         Utils::FileName::fromUserInput(QLatin1String("/usr/include/qt4/QtCore/QString")), 1,
@@ -824,7 +824,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: error: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `foo()':"),
                         Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1,
@@ -850,7 +850,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: error: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("multiple definition of `foo'"),
                         Utils::FileName::fromUserInput(QLatin1String("foo.o")), -1,
diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp
index b6036fdd1e..9f430a010c 100644
--- a/src/plugins/projectexplorer/gnumakeparser.cpp
+++ b/src/plugins/projectexplorer/gnumakeparser.cpp
@@ -258,7 +258,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
                                    "../../scriptbug/main.cpp: In instantiation of void bar(i) [with i = double]:\n"
                                    "../../scriptbug/main.cpp:8: instantiated from void foo(i) [with i = double]\n"
                                    "../../scriptbug/main.cpp:22: instantiated from here\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString()
             << QStringList();
 
@@ -362,7 +362,7 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
             << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString()
             << QStringList();
     QTest::newRow("Full path make exe")
diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp
index bebb816be8..4382ebef85 100644
--- a/src/plugins/projectexplorer/ioutputparser.cpp
+++ b/src/plugins/projectexplorer/ioutputparser.cpp
@@ -187,12 +187,12 @@ void IOutputParser::stdError(const QString &line)
         m_parser->stdError(line);
 }
 
-void IOutputParser::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format)
+void IOutputParser::outputAdded(const QString &string, BuildStep::OutputFormat format)
 {
     emit addOutput(string, format);
 }
 
-void IOutputParser::taskAdded(const ProjectExplorer::Task &task)
+void IOutputParser::taskAdded(const Task &task)
 {
     emit addTask(task);
 }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index b5c34e7c5f..048e4c6822 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -111,10 +111,10 @@ void JsonSummaryPage::initializePage()
         filePaths << f.file.path();
     }
 
-    Node *contextNode = wiz->value(QLatin1String(ProjectExplorer::Constants::PREFERRED_PROJECT_NODE))
+    Node *contextNode = wiz->value(QLatin1String(Constants::PREFERRED_PROJECT_NODE))
             .value<Node *>();
     initializeProjectTree(contextNode, filePaths, kind,
-                          isProject ? ProjectExplorer::AddSubProject : ProjectExplorer::AddNewFile);
+                          isProject ? AddSubProject : AddNewFile);
 
     initializeVersionControls();
 }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
index c1d18062b3..0a8cc459be 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
@@ -90,7 +90,7 @@ JsonWizard::GeneratorFiles JsonWizard::fileList()
             if (!errorMessage.isEmpty())
                 break;
             list.append(Utils::transform(tmp, [&gen](const Core::GeneratedFile &f)
-                                              { return ProjectExplorer::JsonWizard::GeneratorFile(f, gen); }));
+                                              { return JsonWizard::GeneratorFile(f, gen); }));
         }
 
         if (errorMessage.isEmpty())
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
index 413ed3fa15..5ec6906739 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp
@@ -190,13 +190,13 @@ QWidget *ToolChainInformationConfigWidget::buttonWidget() const
     return m_manageButton;
 }
 
-void ToolChainInformationConfigWidget::toolChainAdded(ProjectExplorer::ToolChain *tc)
+void ToolChainInformationConfigWidget::toolChainAdded(ToolChain *tc)
 {
     m_comboBox->addItem(tc->displayName(), tc->id());
     updateComboBox();
 }
 
-void ToolChainInformationConfigWidget::toolChainRemoved(ProjectExplorer::ToolChain *tc)
+void ToolChainInformationConfigWidget::toolChainRemoved(ToolChain *tc)
 {
     const int pos = indexOf(tc);
     if (pos < 0)
@@ -204,7 +204,7 @@ void ToolChainInformationConfigWidget::toolChainRemoved(ProjectExplorer::ToolCha
     m_comboBox->removeItem(pos);
     updateComboBox();
 }
-void ToolChainInformationConfigWidget::toolChainUpdated(ProjectExplorer::ToolChain *tc)
+void ToolChainInformationConfigWidget::toolChainUpdated(ToolChain *tc)
 {
     const int pos = indexOf(tc);
     if (pos < 0)
diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h
index 5c7ceec39b..e33681872f 100644
--- a/src/plugins/projectexplorer/kitinformationconfigwidget.h
+++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h
@@ -49,7 +49,6 @@ namespace ProjectExplorer {
 
 class DeviceManagerModel;
 class ToolChain;
-class EnvironmentWidget;
 
 namespace Internal {
 
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 7738e21d1b..3449c04549 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -469,7 +469,7 @@ void KitManager::deleteKit(Kit *k)
     delete k;
 }
 
-void KitManager::notifyAboutUpdate(ProjectExplorer::Kit *k)
+void KitManager::notifyAboutUpdate(Kit *k)
 {
     if (!k || !isLoaded())
         return;
@@ -480,7 +480,7 @@ void KitManager::notifyAboutUpdate(ProjectExplorer::Kit *k)
         emit m_instance->unmanagedKitUpdated(k);
 }
 
-bool KitManager::registerKit(ProjectExplorer::Kit *k)
+bool KitManager::registerKit(Kit *k)
 {
     QTC_ASSERT(isLoaded(), return false);
 
diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index 60a99ca795..7c09caec25 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -95,7 +95,7 @@ public:
     virtual QString displayNamePostfix(const Kit *k) const;
 
     virtual QSet<QString> availablePlatforms(const Kit *k) const;
-    virtual QString displayNameForPlatform(const ProjectExplorer::Kit *k, const QString &platform) const;
+    virtual QString displayNameForPlatform(const Kit *k, const QString &platform) const;
     virtual Core::FeatureSet availableFeatures(const Kit *k) const;
 
     virtual Utils::AbstractMacroExpander *createMacroExpander(const Kit *k) const
@@ -144,12 +144,12 @@ public:
 
     static void deleteKit(Kit *k);
 
-    static bool registerKit(ProjectExplorer::Kit *k);
-    static void deregisterKit(ProjectExplorer::Kit *k);
-    static void setDefaultKit(ProjectExplorer::Kit *k);
+    static bool registerKit(Kit *k);
+    static void deregisterKit(Kit *k);
+    static void setDefaultKit(Kit *k);
 
-    static void registerKitInformation(ProjectExplorer::KitInformation *ki);
-    static void deregisterKitInformation(ProjectExplorer::KitInformation *ki);
+    static void registerKitInformation(KitInformation *ki);
+    static void deregisterKitInformation(KitInformation *ki);
 
     static QSet<QString> availablePlatforms();
     static QString displayNameForPlatform(const QString &platform);
@@ -188,7 +188,7 @@ private:
     };
     KitList restoreKits(const Utils::FileName &fileName);
 
-    static void notifyAboutUpdate(ProjectExplorer::Kit *k);
+    static void notifyAboutUpdate(Kit *k);
     void addKit(Kit *k);
 
     friend class ProjectExplorerPlugin; // for constructor
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index 93679b8390..70f69f5114 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -197,7 +197,7 @@ QString KitManagerConfigWidget::validityMessage() const
     return m_modifiedKit->toHtml(tmp);
 }
 
-void KitManagerConfigWidget::addConfigWidget(ProjectExplorer::KitConfigWidget *widget)
+void KitManagerConfigWidget::addConfigWidget(KitConfigWidget *widget)
 {
     QTC_ASSERT(widget, return);
     QTC_ASSERT(!m_widgets.contains(widget), return);
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
index d6c14278aa..4f2eed43c0 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h
@@ -62,11 +62,11 @@ public:
     bool isValid() const;
     bool hasWarning() const;
     QString validityMessage() const;
-    void addConfigWidget(ProjectExplorer::KitConfigWidget *widget);
+    void addConfigWidget(KitConfigWidget *widget);
     void makeStickySubWidgetsReadOnly();
 
     Kit *workingCopy() const;
-    bool configures(ProjectExplorer::Kit *k) const;
+    bool configures(Kit *k) const;
     void setIsDefaultKit(bool d);
     bool isDefaultKit() const;
     void removeKit();
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp
index d4ab5b72ee..df284cdb9f 100644
--- a/src/plugins/projectexplorer/linuxiccparser.cpp
+++ b/src/plugins/projectexplorer/linuxiccparser.cpp
@@ -73,7 +73,7 @@ void LinuxIccParser::stdError(const QString &line)
             type = Task::Error;
         else if (category == QLatin1String("warning"))
             type = Task::Warning;
-        m_temporary = ProjectExplorer::Task(type, m_firstLine.cap(6).trimmed(),
+        m_temporary = Task(type, m_firstLine.cap(6).trimmed(),
                                             Utils::FileName::fromUserInput(m_firstLine.cap(1)),
                                             m_firstLine.cap(2).toInt(),
                                             Constants::TASK_CATEGORY_COMPILE);
@@ -134,12 +134,12 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
     QTest::newRow("pass-through stdout")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
             << QString::fromLatin1("Sometext\n") << QString()
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("pass-through stderr")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("Sometext\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
 
     QTest::newRow("undeclared function")
@@ -149,7 +149,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
                                    "\n")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("\n")
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("identifier \"f\" is undefined\nf(0);"),
                         Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13,
@@ -163,7 +163,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
                                    "\n")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("\n")
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();"),
                         Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 53,
@@ -177,7 +177,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
                                    "\n")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("\n")
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("use of \"=\" where \"==\" may have been intended\nwhile (a = true)"),
                         Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 41,
diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h
index 9165410dc3..e8b36704d9 100644
--- a/src/plugins/projectexplorer/linuxiccparser.h
+++ b/src/plugins/projectexplorer/linuxiccparser.h
@@ -55,7 +55,7 @@ private:
 
     bool m_expectFirstLine;
     int m_indent;
-    ProjectExplorer::Task m_temporary;
+    Task m_temporary;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.cpp b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
index e5072117ff..1fa3438754 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.cpp
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.cpp
@@ -65,7 +65,7 @@ RunControl *LocalApplicationRunControlFactory::create(RunConfiguration *runConfi
 LocalApplicationRunControl::LocalApplicationRunControl(LocalApplicationRunConfiguration *rc, RunMode mode)
     : RunControl(rc, mode), m_running(false)
 {
-    setIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
+    setIcon(QLatin1String(Constants::ICON_RUN_SMALL));
     EnvironmentAspect *environment = rc->extraAspect<EnvironmentAspect>();
     Utils::Environment env;
     if (environment)
diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h
index f02e993eb2..048eae8ee4 100644
--- a/src/plugins/projectexplorer/localapplicationruncontrol.h
+++ b/src/plugins/projectexplorer/localapplicationruncontrol.h
@@ -62,10 +62,10 @@ private slots:
     void processExited(int exitCode, QProcess::ExitStatus status);
     void slotAppendMessage(const QString &err, Utils::OutputFormat isError);
 private:
-    ProjectExplorer::ApplicationLauncher m_applicationLauncher;
+    ApplicationLauncher m_applicationLauncher;
     QString m_executable;
     QString m_commandLineArguments;
-    ProjectExplorer::ApplicationLauncher::Mode m_runMode;
+    ApplicationLauncher::Mode m_runMode;
     ProcessHandle m_applicationProcessHandle;
     bool m_running;
 };
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 846318fd89..1758e49bb9 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -249,7 +249,7 @@ QListWidgetItem *ProjectListWidget::itemForProject(Project *project)
     return 0;
 }
 
-QString ProjectListWidget::fullName(ProjectExplorer::Project *project)
+QString ProjectListWidget::fullName(Project *project)
 {
     return tr("%1 (%2)").arg(project->displayName(), project->projectFilePath().toUserOutput());
 }
@@ -425,7 +425,7 @@ void GenericListWidget::setActiveProjectConfiguration(ProjectConfiguration *acti
     setCurrentItem(item);
 }
 
-void GenericListWidget::addProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc)
+void GenericListWidget::addProjectConfiguration(ProjectConfiguration *pc)
 {
     m_ignoreIndexChange = true;
     QListWidgetItem *lwi = new QListWidgetItem();
@@ -453,7 +453,7 @@ void GenericListWidget::addProjectConfiguration(ProjectExplorer::ProjectConfigur
     m_ignoreIndexChange = false;
 }
 
-void GenericListWidget::removeProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc)
+void GenericListWidget::removeProjectConfiguration(ProjectConfiguration *pc)
 {
     m_ignoreIndexChange = true;
     disconnect(pc, SIGNAL(displayNameChanged()),
@@ -940,27 +940,27 @@ void MiniProjectTargetSelector::doLayout(bool keepSize)
     move(moveTo);
 }
 
-void MiniProjectTargetSelector::setActiveTarget(ProjectExplorer::ProjectConfiguration *pc)
+void MiniProjectTargetSelector::setActiveTarget(ProjectConfiguration *pc)
 {
     m_project->setActiveTarget(static_cast<Target *>(pc));
 }
 
-void MiniProjectTargetSelector::setActiveBuildConfiguration(ProjectExplorer::ProjectConfiguration *pc)
+void MiniProjectTargetSelector::setActiveBuildConfiguration(ProjectConfiguration *pc)
 {
     m_target->setActiveBuildConfiguration(static_cast<BuildConfiguration *>(pc));
 }
 
-void MiniProjectTargetSelector::setActiveDeployConfiguration(ProjectExplorer::ProjectConfiguration *pc)
+void MiniProjectTargetSelector::setActiveDeployConfiguration(ProjectConfiguration *pc)
 {
     m_target->setActiveDeployConfiguration(static_cast<DeployConfiguration *>(pc));
 }
 
-void MiniProjectTargetSelector::setActiveRunConfiguration(ProjectExplorer::ProjectConfiguration *pc)
+void MiniProjectTargetSelector::setActiveRunConfiguration(ProjectConfiguration *pc)
 {
     m_target->setActiveRunConfiguration(static_cast<RunConfiguration *>(pc));
 }
 
-void MiniProjectTargetSelector::projectAdded(ProjectExplorer::Project *project)
+void MiniProjectTargetSelector::projectAdded(Project *project)
 {
     connect(project, SIGNAL(addedTarget(ProjectExplorer::Target*)),
             this, SLOT(slotAddedTarget(ProjectExplorer::Target*)));
@@ -978,7 +978,7 @@ void MiniProjectTargetSelector::projectAdded(ProjectExplorer::Project *project)
     updateRunListVisible();
 }
 
-void MiniProjectTargetSelector::projectRemoved(ProjectExplorer::Project *project)
+void MiniProjectTargetSelector::projectRemoved(Project *project)
 {
     disconnect(project, SIGNAL(addedTarget(ProjectExplorer::Target*)),
                this, SLOT(slotAddedTarget(ProjectExplorer::Target*)));
@@ -996,7 +996,7 @@ void MiniProjectTargetSelector::projectRemoved(ProjectExplorer::Project *project
     updateRunListVisible();
 }
 
-void MiniProjectTargetSelector::addedTarget(ProjectExplorer::Target *target)
+void MiniProjectTargetSelector::addedTarget(Target *target)
 {
     connect(target, SIGNAL(addedBuildConfiguration(ProjectExplorer::BuildConfiguration*)),
             this, SLOT(slotAddedBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
@@ -1024,7 +1024,7 @@ void MiniProjectTargetSelector::addedTarget(ProjectExplorer::Target *target)
         addedRunConfiguration(rc);
 }
 
-void MiniProjectTargetSelector::slotAddedTarget(ProjectExplorer::Target *target)
+void MiniProjectTargetSelector::slotAddedTarget(Target *target)
 {
     addedTarget(target);
     updateTargetListVisible();
@@ -1033,7 +1033,7 @@ void MiniProjectTargetSelector::slotAddedTarget(ProjectExplorer::Target *target)
     updateRunListVisible();
 }
 
-void MiniProjectTargetSelector::removedTarget(ProjectExplorer::Target *target)
+void MiniProjectTargetSelector::removedTarget(Target *target)
 {
     disconnect(target, SIGNAL(addedBuildConfiguration(ProjectExplorer::BuildConfiguration*)),
                this, SLOT(slotAddedBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
@@ -1061,7 +1061,7 @@ void MiniProjectTargetSelector::removedTarget(ProjectExplorer::Target *target)
         removedRunConfiguration(rc);
 }
 
-void MiniProjectTargetSelector::slotRemovedTarget(ProjectExplorer::Target *target)
+void MiniProjectTargetSelector::slotRemovedTarget(Target *target)
 {
     removedTarget(target);
 
@@ -1072,78 +1072,78 @@ void MiniProjectTargetSelector::slotRemovedTarget(ProjectExplorer::Target *targe
 }
 
 
-void MiniProjectTargetSelector::addedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void MiniProjectTargetSelector::addedBuildConfiguration(BuildConfiguration *bc)
 {
     if (bc->target() == m_target)
         m_listWidgets[BUILD]->addProjectConfiguration(bc);
 }
 
-void MiniProjectTargetSelector::slotAddedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void MiniProjectTargetSelector::slotAddedBuildConfiguration(BuildConfiguration *bc)
 {
     if (bc->target() == m_target)
         m_listWidgets[BUILD]->addProjectConfiguration(bc);
     updateBuildListVisible();
 }
 
-void MiniProjectTargetSelector::removedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void MiniProjectTargetSelector::removedBuildConfiguration(BuildConfiguration *bc)
 {
     if (bc->target() == m_target)
         m_listWidgets[BUILD]->removeProjectConfiguration(bc);
 }
 
-void MiniProjectTargetSelector::slotRemovedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void MiniProjectTargetSelector::slotRemovedBuildConfiguration(BuildConfiguration *bc)
 {
     if (bc->target() == m_target)
         m_listWidgets[BUILD]->removeProjectConfiguration(bc);
     updateBuildListVisible();
 }
 
-void MiniProjectTargetSelector::addedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void MiniProjectTargetSelector::addedDeployConfiguration(DeployConfiguration *dc)
 {
     if (dc->target() == m_target)
         m_listWidgets[DEPLOY]->addProjectConfiguration(dc);
 }
 
-void MiniProjectTargetSelector::slotAddedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void MiniProjectTargetSelector::slotAddedDeployConfiguration(DeployConfiguration *dc)
 {
     if (dc->target() == m_target)
         m_listWidgets[DEPLOY]->addProjectConfiguration(dc);
     updateDeployListVisible();
 }
 
-void MiniProjectTargetSelector::removedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void MiniProjectTargetSelector::removedDeployConfiguration(DeployConfiguration *dc)
 {
     if (dc->target() == m_target)
         m_listWidgets[DEPLOY]->removeProjectConfiguration(dc);
 }
 
-void MiniProjectTargetSelector::slotRemovedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void MiniProjectTargetSelector::slotRemovedDeployConfiguration(DeployConfiguration *dc)
 {
     if (dc->target() == m_target)
         m_listWidgets[DEPLOY]->removeProjectConfiguration(dc);
     updateDeployListVisible();
 }
 
-void MiniProjectTargetSelector::addedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void MiniProjectTargetSelector::addedRunConfiguration(RunConfiguration *rc)
 {
     if (rc->target() == m_target)
         m_listWidgets[RUN]->addProjectConfiguration(rc);
 }
 
-void MiniProjectTargetSelector::slotAddedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void MiniProjectTargetSelector::slotAddedRunConfiguration(RunConfiguration *rc)
 {
     if (rc->target() == m_target)
         m_listWidgets[RUN]->addProjectConfiguration(rc);
     updateRunListVisible();
 }
 
-void MiniProjectTargetSelector::removedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void MiniProjectTargetSelector::removedRunConfiguration(RunConfiguration *rc)
 {
     if (rc->target() == m_target)
         m_listWidgets[RUN]->removeProjectConfiguration(rc);
 }
 
-void MiniProjectTargetSelector::slotRemovedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void MiniProjectTargetSelector::slotRemovedRunConfiguration(RunConfiguration *rc)
 {
     if (rc->target() == m_target)
         m_listWidgets[RUN]->removeProjectConfiguration(rc);
@@ -1217,7 +1217,7 @@ void MiniProjectTargetSelector::updateRunListVisible()
     updateSummary();
 }
 
-void MiniProjectTargetSelector::changeStartupProject(ProjectExplorer::Project *project)
+void MiniProjectTargetSelector::changeStartupProject(Project *project)
 {
     if (m_project) {
         disconnect(m_project, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
@@ -1244,7 +1244,7 @@ void MiniProjectTargetSelector::changeStartupProject(ProjectExplorer::Project *p
     updateActionAndSummary();
 }
 
-void MiniProjectTargetSelector::activeTargetChanged(ProjectExplorer::Target *target)
+void MiniProjectTargetSelector::activeTargetChanged(Target *target)
 {
     if (m_target) {
         disconnect(m_target, SIGNAL(displayNameChanged()),
@@ -1336,7 +1336,7 @@ void MiniProjectTargetSelector::kitChanged(Kit *k)
         updateActionAndSummary();
 }
 
-void MiniProjectTargetSelector::activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration *bc)
+void MiniProjectTargetSelector::activeBuildConfigurationChanged(BuildConfiguration *bc)
 {
     if (m_buildConfiguration)
         disconnect(m_buildConfiguration, SIGNAL(displayNameChanged()),
@@ -1349,7 +1349,7 @@ void MiniProjectTargetSelector::activeBuildConfigurationChanged(ProjectExplorer:
     updateActionAndSummary();
 }
 
-void MiniProjectTargetSelector::activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration *dc)
+void MiniProjectTargetSelector::activeDeployConfigurationChanged(DeployConfiguration *dc)
 {
     if (m_deployConfiguration)
         disconnect(m_deployConfiguration, SIGNAL(displayNameChanged()),
@@ -1362,7 +1362,7 @@ void MiniProjectTargetSelector::activeDeployConfigurationChanged(ProjectExplorer
     updateActionAndSummary();
 }
 
-void MiniProjectTargetSelector::activeRunConfigurationChanged(ProjectExplorer::RunConfiguration *rc)
+void MiniProjectTargetSelector::activeRunConfigurationChanged(RunConfiguration *rc)
 {
     if (m_runConfiguration)
         disconnect(m_runConfiguration, SIGNAL(displayNameChanged()),
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h
index 85459d0e07..5e2c7e3c1a 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.h
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.h
@@ -85,7 +85,7 @@ private slots:
     void setProject(int index);
 private:
     QListWidgetItem *itemForProject(Project *project);
-    QString fullName(ProjectExplorer::Project *project);
+    QString fullName(Project *project);
     bool m_ignoreIndexChange;
 };
 
@@ -118,8 +118,8 @@ signals:
 public:
     void setProjectConfigurations(const QList<ProjectConfiguration *> &list, ProjectConfiguration *active);
     void setActiveProjectConfiguration(ProjectConfiguration *active);
-    void addProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
-    void removeProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
+    void addProjectConfiguration(ProjectConfiguration *pc);
+    void removeProjectConfiguration(ProjectConfiguration *pc);
 private slots:
     void rowChanged(int index);
     void displayNameChanged();
@@ -171,14 +171,14 @@ private slots:
     void updateActionAndSummary();
     void switchToProjectsMode();
 private:
-    void addedTarget(ProjectExplorer::Target *target);
-    void removedTarget(ProjectExplorer::Target *target);
-    void addedBuildConfiguration(ProjectExplorer::BuildConfiguration* bc);
-    void removedBuildConfiguration(ProjectExplorer::BuildConfiguration* bc);
-    void addedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc);
-    void removedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc);
-    void addedRunConfiguration(ProjectExplorer::RunConfiguration *rc);
-    void removedRunConfiguration(ProjectExplorer::RunConfiguration *rc);
+    void addedTarget(Target *target);
+    void removedTarget(Target *target);
+    void addedBuildConfiguration(BuildConfiguration* bc);
+    void removedBuildConfiguration(BuildConfiguration* bc);
+    void addedDeployConfiguration(DeployConfiguration *dc);
+    void removedDeployConfiguration(DeployConfiguration *dc);
+    void addedRunConfiguration(RunConfiguration *rc);
+    void removedRunConfiguration(RunConfiguration *rc);
 
     void updateProjectListVisible();
     void updateTargetListVisible();
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 1b2f92dc90..6a75c948a8 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -109,19 +109,19 @@ static Abi findAbiOfMsvc(MsvcToolChain::Type type, MsvcToolChain::Platform platf
 
     switch (platform)
     {
-    case ProjectExplorer::Internal::MsvcToolChain::x86:
+    case MsvcToolChain::x86:
         wordWidth = 32;
         break;
-    case ProjectExplorer::Internal::MsvcToolChain::ia64:
-    case ProjectExplorer::Internal::MsvcToolChain::x86_ia64:
+    case MsvcToolChain::ia64:
+    case MsvcToolChain::x86_ia64:
         arch = Abi::ItaniumArchitecture;
         break;
-    case ProjectExplorer::Internal::MsvcToolChain::amd64:
-    case ProjectExplorer::Internal::MsvcToolChain::x86_amd64:
+    case MsvcToolChain::amd64:
+    case MsvcToolChain::x86_amd64:
         break;
-    case ProjectExplorer::Internal::MsvcToolChain::arm:
-    case ProjectExplorer::Internal::MsvcToolChain::x86_arm:
-    case ProjectExplorer::Internal::MsvcToolChain::amd64_arm:
+    case MsvcToolChain::arm:
+    case MsvcToolChain::x86_arm:
+    case MsvcToolChain::amd64_arm:
         arch = Abi::ArmArchitecture;
         wordWidth = 32;
         break;
@@ -383,18 +383,18 @@ QString MsvcToolChain::typeDisplayName() const
 QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
 {
     switch (m_abi.osFlavor()) {
-    case ProjectExplorer::Abi::WindowsMsvc2005Flavor:
+    case Abi::WindowsMsvc2005Flavor:
         return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2005");
-    case ProjectExplorer::Abi::WindowsMsvc2008Flavor:
+    case Abi::WindowsMsvc2008Flavor:
         return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2008");
-    case ProjectExplorer::Abi::WindowsMsvc2010Flavor:
+    case Abi::WindowsMsvc2010Flavor:
         return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2010");
-    case ProjectExplorer::Abi::WindowsMsvc2012Flavor:
+    case Abi::WindowsMsvc2012Flavor:
         QList<Utils::FileName>()
             << Utils::FileName::fromLatin1("win32-msvc2012")
             << Utils::FileName::fromLatin1("win32-msvc2010");
         break;
-    case ProjectExplorer::Abi::WindowsMsvc2013Flavor:
+    case Abi::WindowsMsvc2013Flavor:
         QList<Utils::FileName>()
             << Utils::FileName::fromLatin1("win32-msvc2013")
             << Utils::FileName::fromLatin1("win32-msvc2012")
diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp
index 4f823521d8..27a21b9116 100644
--- a/src/plugins/projectexplorer/outputparser_test.cpp
+++ b/src/plugins/projectexplorer/outputparser_test.cpp
@@ -133,7 +133,7 @@ void OutputParserTester::appendOutputParser(IOutputParser *parser)
     IOutputParser::appendOutputParser(parser);
 }
 
-void OutputParserTester::outputAdded(const QString &line, ProjectExplorer::BuildStep::OutputFormat format)
+void OutputParserTester::outputAdded(const QString &line, BuildStep::OutputFormat format)
 {
     Q_UNUSED(format);
     if (!m_receivedOutput.isEmpty())
@@ -141,7 +141,7 @@ void OutputParserTester::outputAdded(const QString &line, ProjectExplorer::Build
     m_receivedOutput.append(line);
 }
 
-void OutputParserTester::taskAdded(const ProjectExplorer::Task &task)
+void OutputParserTester::taskAdded(const Task &task)
 {
     m_receivedTasks.append(task);
 }
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 94f453b6d3..f85a68ae71 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -68,7 +68,7 @@ void ProcessStep::ctor()
     //: Default ProcessStep display name
     setDefaultDisplayName(tr("Custom Process Step"));
     if (m_workingDirectory.isEmpty())
-        m_workingDirectory = QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR);
+        m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR);
 }
 
 ProcessStep::~ProcessStep()
@@ -136,9 +136,9 @@ void ProcessStep::setWorkingDirectory(const QString &workingDirectory)
 {
     if (workingDirectory.isEmpty())
         if (target()->activeBuildConfiguration())
-            m_workingDirectory = QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR);
+            m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR);
         else
-            m_workingDirectory = QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR_ALTERNATE);
+            m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR_ALTERNATE);
     else
         m_workingDirectory = workingDirectory;
 }
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index 2fb280dcfb..050520c620 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -56,7 +56,7 @@ public:
     virtual BuildStep *clone(BuildStepList *parent, BuildStep *product);
 };
 
-class ProcessStep : public ProjectExplorer::AbstractProcessStep
+class ProcessStep : public AbstractProcessStep
 {
     Q_OBJECT
     friend class ProcessStepFactory;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 3f57a90553..bc8eb712ef 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -269,7 +269,7 @@ public:
 
     QString m_lastOpenDirectory;
     QPointer<RunConfiguration> m_delayedRunConfiguration;
-    QList<QPair<RunConfiguration *, ProjectExplorer::RunMode>> m_delayedRunConfigurationForRun;
+    QList<QPair<RunConfiguration *, RunMode>> m_delayedRunConfigurationForRun;
     bool m_shouldHaveRunConfiguration;
     RunMode m_runMode;
     QString m_projectFilterString;
@@ -695,12 +695,12 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // Default open action
     dd->m_openFileAction = new QAction(tr("Open File"), this);
-    cmd = ActionManager::registerAction(dd->m_openFileAction, ProjectExplorer::Constants::OPENFILE,
+    cmd = ActionManager::registerAction(dd->m_openFileAction, Constants::OPENFILE,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
 
     dd->m_searchOnFileSystem = new QAction(FileUtils::msgFindInDirectory(), this);
-    cmd = ActionManager::registerAction(dd->m_searchOnFileSystem, ProjectExplorer::Constants::SEARCHONFILESYSTEM, projecTreeContext);
+    cmd = ActionManager::registerAction(dd->m_searchOnFileSystem, Constants::SEARCHONFILESYSTEM, projecTreeContext);
 
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER);
     mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_CONFIG);
@@ -708,19 +708,19 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST);
 
     dd->m_showInGraphicalShell = new QAction(FileUtils::msgGraphicalShellAction(), this);
-    cmd = ActionManager::registerAction(dd->m_showInGraphicalShell, ProjectExplorer::Constants::SHOWINGRAPHICALSHELL,
+    cmd = ActionManager::registerAction(dd->m_showInGraphicalShell, Constants::SHOWINGRAPHICALSHELL,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
     mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_FILES);
 
     dd->m_openTerminalHere = new QAction(FileUtils::msgTerminalAction(), this);
-    cmd = ActionManager::registerAction(dd->m_openTerminalHere, ProjectExplorer::Constants::OPENTERMIANLHERE,
+    cmd = ActionManager::registerAction(dd->m_openTerminalHere, Constants::OPENTERMIANLHERE,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
     mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_FILES);
 
     // Open With menu
-    mfileContextMenu->addMenu(openWith, ProjectExplorer::Constants::G_FILE_OPEN);
+    mfileContextMenu->addMenu(openWith, Constants::G_FILE_OPEN);
 
     // recent projects menu
     ActionContainer *mrecent =
@@ -905,7 +905,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // add new file action
     dd->m_addNewFileAction = new QAction(tr("Add New..."), this);
-    cmd = ActionManager::registerAction(dd->m_addNewFileAction, ProjectExplorer::Constants::ADDNEWFILE,
+    cmd = ActionManager::registerAction(dd->m_addNewFileAction, Constants::ADDNEWFILE,
                        projecTreeContext);
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
@@ -913,7 +913,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // add existing file action
     dd->m_addExistingFilesAction = new QAction(tr("Add Existing Files..."), this);
-    cmd = ActionManager::registerAction(dd->m_addExistingFilesAction, ProjectExplorer::Constants::ADDEXISTINGFILES,
+    cmd = ActionManager::registerAction(dd->m_addExistingFilesAction, Constants::ADDEXISTINGFILES,
                        projecTreeContext);
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
@@ -922,7 +922,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     // add existing directory action
     dd->m_addExistingDirectoryAction = new QAction(tr("Add Existing Directory..."), this);
     cmd = Core::ActionManager::registerAction(dd->m_addExistingDirectoryAction,
-                                              ProjectExplorer::Constants::ADDEXISTINGDIRECTORY,
+                                              Constants::ADDEXISTINGDIRECTORY,
                                               projecTreeContext);
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
@@ -930,7 +930,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // new subproject action
     dd->m_addNewSubprojectAction = new QAction(tr("New Subproject..."), this);
-    cmd = ActionManager::registerAction(dd->m_addNewSubprojectAction, ProjectExplorer::Constants::ADDNEWSUBPROJECT,
+    cmd = ActionManager::registerAction(dd->m_addNewSubprojectAction, Constants::ADDNEWSUBPROJECT,
                        projecTreeContext);
     mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
@@ -945,27 +945,27 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     // remove file action
     dd->m_removeFileAction = new QAction(tr("Remove File..."), this);
-    cmd = ActionManager::registerAction(dd->m_removeFileAction, ProjectExplorer::Constants::REMOVEFILE,
+    cmd = ActionManager::registerAction(dd->m_removeFileAction, Constants::REMOVEFILE,
                        projecTreeContext);
     cmd->setDefaultKeySequence(QKeySequence::Delete);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER);
 
     //: Remove project from parent profile (Project explorer view); will not physically delete any files.
     dd->m_removeProjectAction = new QAction(tr("Remove Project..."), this);
-    cmd = ActionManager::registerAction(dd->m_removeProjectAction, ProjectExplorer::Constants::REMOVEPROJECT,
+    cmd = ActionManager::registerAction(dd->m_removeProjectAction, Constants::REMOVEPROJECT,
                        projecTreeContext);
     msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
 
     // delete file action
     dd->m_deleteFileAction = new QAction(tr("Delete File..."), this);
-    cmd = ActionManager::registerAction(dd->m_deleteFileAction, ProjectExplorer::Constants::DELETEFILE,
+    cmd = ActionManager::registerAction(dd->m_deleteFileAction, Constants::DELETEFILE,
                              projecTreeContext);
     cmd->setDefaultKeySequence(QKeySequence::Delete);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER);
 
     // renamefile action
     dd->m_renameFileAction = new QAction(tr("Rename..."), this);
-    cmd = ActionManager::registerAction(dd->m_renameFileAction, ProjectExplorer::Constants::RENAMEFILE,
+    cmd = ActionManager::registerAction(dd->m_renameFileAction, Constants::RENAMEFILE,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OTHER);
     // Not yet used by anyone, so hide for now
@@ -977,7 +977,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     dd->m_setStartupProjectAction = new Utils::ParameterAction(tr("Set as Active Project"),
                                                               tr("Set \"%1\" as Active Project"),
                                                               Utils::ParameterAction::AlwaysEnabled, this);
-    cmd = ActionManager::registerAction(dd->m_setStartupProjectAction, ProjectExplorer::Constants::SETSTARTUP,
+    cmd = ActionManager::registerAction(dd->m_setStartupProjectAction, Constants::SETSTARTUP,
                              projecTreeContext);
     cmd->setAttribute(Command::CA_UpdateText);
     cmd->setDescription(dd->m_setStartupProjectAction->text());
@@ -1012,7 +1012,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     dd->m_projectSelectorActionMenu->setEnabled(false);
     dd->m_projectSelectorActionMenu->setText(tr("Open Build and Run Kit Selector..."));
     connect(dd->m_projectSelectorActionMenu, SIGNAL(triggered()), dd->m_targetSelector, SLOT(toggleVisible()));
-    cmd = ActionManager::registerAction(dd->m_projectSelectorActionMenu, ProjectExplorer::Constants::SELECTTARGET,
+    cmd = ActionManager::registerAction(dd->m_projectSelectorActionMenu, Constants::SELECTTARGET,
                        globalcontext);
     mbuild->addAction(cmd, Constants::G_BUILD_RUN);
 
@@ -1020,7 +1020,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     dd->m_projectSelectorActionQuick->setEnabled(false);
     dd->m_projectSelectorActionQuick->setText(tr("Quick Switch Kit Selector"));
     connect(dd->m_projectSelectorActionQuick, SIGNAL(triggered()), dd->m_targetSelector, SLOT(nextOrShow()));
-    cmd = ActionManager::registerAction(dd->m_projectSelectorActionQuick, ProjectExplorer::Constants::SELECTTARGETQUICK, globalcontext);
+    cmd = ActionManager::registerAction(dd->m_projectSelectorActionQuick, Constants::SELECTTARGETQUICK, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+T")));
 
     connect(ICore::instance(), SIGNAL(saveSettingsRequested()),
@@ -1344,7 +1344,7 @@ void ProjectExplorerPlugin::loadCustomWizards()
     static bool firstTime = true;
     if (firstTime) {
         firstTime = false;
-        foreach (IWizardFactory *cpw, ProjectExplorer::CustomWizard::createWizards())
+        foreach (IWizardFactory *cpw, CustomWizard::createWizards())
             addAutoReleasedObject(cpw);
         foreach (IWizardFactory *cpw, JsonWizardFactory::createWizardFactories())
             addAutoReleasedObject(cpw);
@@ -1576,7 +1576,7 @@ QList<Project *> ProjectExplorerPlugin::openProjects(const QStringList &fileName
 
     if (!openedPro.isEmpty()) {
         if (switchToProjectsMode)
-            ModeManager::activateMode(ProjectExplorer::Constants::MODE_SESSION);
+            ModeManager::activateMode(Constants::MODE_SESSION);
         else
             ModeManager::activateMode(Core::Constants::MODE_EDIT);
         ModeManager::setFocusToCurrentMode();
@@ -1632,7 +1632,7 @@ void ProjectExplorerPlugin::updateWelcomePage()
 
 void ProjectExplorerPlugin::currentModeChanged(IMode *mode, IMode *oldMode)
 {
-    if (oldMode && oldMode->id() == ProjectExplorer::Constants::MODE_SESSION)
+    if (oldMode && oldMode->id() == Constants::MODE_SESSION)
         ICore::saveSettings();
     if (mode && mode->id() == Core::Constants::MODE_WELCOME)
         updateWelcomePage();
@@ -1981,7 +1981,7 @@ void ProjectExplorerPluginPrivate::updateContext()
 void ProjectExplorerPlugin::runConfigurationConfigurationFinished()
 {
     RunConfiguration *rc = qobject_cast<RunConfiguration *>(sender());
-    ProjectExplorer::RunMode runMode = ProjectExplorer::NoRunMode;
+    RunMode runMode = NoRunMode;
     for (int i = 0; i < dd->m_delayedRunConfigurationForRun.size(); ++i) {
         if (dd->m_delayedRunConfigurationForRun.at(i).first == rc) {
             runMode = dd->m_delayedRunConfigurationForRun.at(i).second;
@@ -1989,7 +1989,7 @@ void ProjectExplorerPlugin::runConfigurationConfigurationFinished()
             break;
         }
     }
-    if (runMode != ProjectExplorer::NoRunMode && rc->isConfigured())
+    if (runMode != NoRunMode && rc->isConfigured())
         dd->executeRunConfiguration(rc, runMode);
 }
 
@@ -1998,7 +1998,7 @@ static QString pathOrDirectoryFor(Node *node, bool dir)
     QString path = node->path();
     QString location;
     FolderNode *folder = qobject_cast<FolderNode *>(node);
-    if (node->nodeType() == ProjectExplorer::VirtualFolderNodeType && folder) {
+    if (node->nodeType() == VirtualFolderNodeType && folder) {
         // Virtual Folder case
         // If there are files directly below or no subfolders, take the folder path
         if (!folder->fileNodes().isEmpty() || folder->subFolderNodes().isEmpty()) {
@@ -2564,7 +2564,7 @@ void ProjectExplorerPlugin::runControlFinished()
     emit updateRunActions();
 }
 
-void ProjectExplorerPlugin::projectAdded(ProjectExplorer::Project *pro)
+void ProjectExplorerPlugin::projectAdded(Project *pro)
 {
     if (dd->m_projectsMode)
         dd->m_projectsMode->setEnabled(true);
@@ -2573,7 +2573,7 @@ void ProjectExplorerPlugin::projectAdded(ProjectExplorer::Project *pro)
             this, SLOT(updateActions()));
 }
 
-void ProjectExplorerPlugin::projectRemoved(ProjectExplorer::Project * pro)
+void ProjectExplorerPlugin::projectRemoved(Project * pro)
 {
     if (dd->m_projectsMode)
         dd->m_projectsMode->setEnabled(SessionManager::hasProjects());
@@ -2952,8 +2952,7 @@ void ProjectExplorerPluginPrivate::updateContextMenuActions()
     runMenu->menu()->menuAction()->setVisible(false);
 
     if (dd->m_currentNode && dd->m_currentNode->projectNode()) {
-        QList<ProjectExplorer::ProjectAction> actions =
-                dd->m_currentNode->supportedActions(dd->m_currentNode);
+        QList<ProjectAction> actions = dd->m_currentNode->supportedActions(dd->m_currentNode);
 
         if (ProjectNode *pn = qobject_cast<ProjectNode *>(dd->m_currentNode)) {
             if (pn == dd->m_currentProject->rootProjectNode()) {
@@ -2978,44 +2977,44 @@ void ProjectExplorerPluginPrivate::updateContextMenuActions()
         }
         if (qobject_cast<FolderNode*>(dd->m_currentNode)) {
             // Also handles ProjectNode
-            dd->m_addNewFileAction->setEnabled(actions.contains(ProjectExplorer::AddNewFile)
+            dd->m_addNewFileAction->setEnabled(actions.contains(AddNewFile)
                                               && !ICore::isNewItemDialogRunning());
             dd->m_addNewSubprojectAction->setEnabled(dd->m_currentNode->nodeType() == ProjectNodeType
-                                                    && actions.contains(ProjectExplorer::AddSubProject)
+                                                    && actions.contains(AddSubProject)
                                                     && !ICore::isNewItemDialogRunning());
             dd->m_removeProjectAction->setEnabled(dd->m_currentNode->nodeType() == ProjectNodeType
-                                                    && actions.contains(ProjectExplorer::RemoveSubProject));
-            dd->m_addExistingFilesAction->setEnabled(actions.contains(ProjectExplorer::AddExistingFile));
-            dd->m_addExistingDirectoryAction->setEnabled(actions.contains(ProjectExplorer::AddExistingDirectory));
-            dd->m_renameFileAction->setEnabled(actions.contains(ProjectExplorer::Rename));
+                                                    && actions.contains(RemoveSubProject));
+            dd->m_addExistingFilesAction->setEnabled(actions.contains(AddExistingFile));
+            dd->m_addExistingDirectoryAction->setEnabled(actions.contains(AddExistingDirectory));
+            dd->m_renameFileAction->setEnabled(actions.contains(Rename));
         } else if (qobject_cast<FileNode*>(dd->m_currentNode)) {
             // Enable and show remove / delete in magic ways:
             // If both are disabled show Remove
             // If both are enabled show both (can't happen atm)
             // If only removeFile is enabled only show it
             // If only deleteFile is enable only show it
-            bool enableRemove = actions.contains(ProjectExplorer::RemoveFile);
+            bool enableRemove = actions.contains(RemoveFile);
             dd->m_removeFileAction->setEnabled(enableRemove);
-            bool enableDelete = actions.contains(ProjectExplorer::EraseFile);
+            bool enableDelete = actions.contains(EraseFile);
             dd->m_deleteFileAction->setEnabled(enableDelete);
             dd->m_deleteFileAction->setVisible(enableDelete);
 
             dd->m_removeFileAction->setVisible(!enableDelete || enableRemove);
-            dd->m_renameFileAction->setEnabled(actions.contains(ProjectExplorer::Rename));
+            dd->m_renameFileAction->setEnabled(actions.contains(Rename));
         }
 
-        if (actions.contains(ProjectExplorer::HidePathActions)) {
+        if (actions.contains(HidePathActions)) {
             dd->m_openTerminalHere->setVisible(false);
             dd->m_showInGraphicalShell->setVisible(false);
             dd->m_searchOnFileSystem->setVisible(false);
         }
 
-        if (actions.contains(ProjectExplorer::HideFileActions)) {
+        if (actions.contains(HideFileActions)) {
             dd->m_deleteFileAction->setVisible(false);
             dd->m_removeFileAction->setVisible(false);
         }
 
-        if (actions.contains(ProjectExplorer::HideFolderActions)) {
+        if (actions.contains(HideFolderActions)) {
             dd->m_addNewFileAction->setVisible(false);
             dd->m_addNewSubprojectAction->setVisible(false);
             dd->m_removeProjectAction->setVisible(false);
@@ -3049,7 +3048,7 @@ void ProjectExplorerPlugin::addNewSubproject()
 
     if (dd->m_currentNode->nodeType() == ProjectNodeType
             && dd->m_currentNode->supportedActions(
-                dd->m_currentNode).contains(ProjectExplorer::AddSubProject)) {
+                dd->m_currentNode).contains(AddSubProject)) {
         QVariantMap map;
         map.insert(QLatin1String(Constants::PREFERRED_PROJECT_NODE), QVariant::fromValue(dd->m_currentNode));
         if (dd->m_currentProject) {
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index d4e41c2a2a..499bb4bc84 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -134,12 +134,12 @@ void ProjectFileWizardExtension::firstExtensionPageShown(
     m_context->page->setFiles(fileNames);
 
     QStringList filePaths;
-    ProjectExplorer::ProjectAction projectAction;
+    ProjectAction projectAction;
     if (m_context->wizard->kind()== IWizardFactory::ProjectWizard) {
-        projectAction = ProjectExplorer::AddSubProject;
+        projectAction = AddSubProject;
         filePaths << generatedProjectFilePath(files);
     } else {
-        projectAction = ProjectExplorer::AddNewFile;
+        projectAction = AddNewFile;
         filePaths = Utils::transform(files, &GeneratedFile::path);
     }
 
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index 0a4d28539c..63cfa81cad 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -120,7 +120,7 @@ void ProjectImporter::removeProject(Kit *k, const QString &path)
     bool oldIsUpdating = setIsUpdating(true);
 
     if (projects.isEmpty())
-        ProjectExplorer::KitManager::deregisterKit(k);
+        KitManager::deregisterKit(k);
     else
         k->setValueSilently(TEMPORARY_OF_PROJECTS, projects);
 
diff --git a/src/plugins/projectexplorer/projectmacroexpander.cpp b/src/plugins/projectexplorer/projectmacroexpander.cpp
index 04c87e7431..fb97277272 100644
--- a/src/plugins/projectexplorer/projectmacroexpander.cpp
+++ b/src/plugins/projectexplorer/projectmacroexpander.cpp
@@ -46,42 +46,42 @@ bool ProjectMacroExpander::resolveProjectMacro(const QString &name, QString *ret
 {
     QString result;
     bool found = false;
-    if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTPROJECT_NAME)) {
+    if (name == QLatin1String(Constants::VAR_CURRENTPROJECT_NAME)) {
         if (!m_projectName.isEmpty()) {
             result = m_projectName;
             found = true;
         }
-    } else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_NAME)) {
+    } else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_NAME)) {
         result = m_kit->displayName();
         found = true;
-    } else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_FILESYSTEMNAME)) {
+    } else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_FILESYSTEMNAME)) {
         result = m_kit->fileSystemFriendlyName();
         found = true;
-    } else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_ID)) {
+    } else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_ID)) {
         result = m_kit->id().toString();
         found = true;
-    } else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTBUILD_NAME)) {
+    } else if (name == QLatin1String(Constants::VAR_CURRENTBUILD_NAME)) {
         result = m_bcName;
         found = true;
-    } else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_HOSTADDRESS)) {
+    } else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_HOSTADDRESS)) {
         const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
         if (device) {
             result = device->sshParameters().host;
             found = true;
         }
-    } else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_SSHPORT)) {
+    } else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_SSHPORT)) {
         const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
         if (device) {
             result = QString::number(device->sshParameters().port);
             found = true;
         }
-    } else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_USERNAME)) {
+    } else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_USERNAME)) {
         const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
         if (device) {
             result = device->sshParameters().userName;
             found = true;
         }
-    } else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE)) {
+    } else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE)) {
         const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
         if (device) {
             result = device->sshParameters().privateKeyFile;
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 39ff925891..ef2541c425 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -308,11 +308,11 @@ QVariant FlatModel::data(const QModelIndex &index, int role) const
             result = font;
             break;
         }
-        case ProjectExplorer::Project::FilePathRole: {
+        case Project::FilePathRole: {
             result = node->path();
             break;
         }
-        case ProjectExplorer::Project::EnabledRole: {
+        case Project::EnabledRole: {
             result = node->isEnabled();
             break;
         }
@@ -335,7 +335,7 @@ Qt::ItemFlags FlatModel::flags(const QModelIndex &index) const
             return 0; // no flags for session node...
         if (!qobject_cast<ProjectNode *>(node)) {
             // either folder or file node
-            if (node->supportedActions(node).contains(ProjectExplorer::Rename))
+            if (node->supportedActions(node).contains(Rename))
                 f = f | Qt::ItemIsEditable;
             if (qobject_cast<FileNode *>(node))
                 f = f | Qt::ItemIsDragEnabled;
@@ -784,7 +784,7 @@ void FlatModel::removed(FolderNode* parentNode, const QList<Node*> &newNodeList)
     }
 }
 
-void FlatModel::aboutToShowInSimpleTreeChanged(ProjectExplorer::FolderNode* node)
+void FlatModel::aboutToShowInSimpleTreeChanged(FolderNode* node)
 {
     if (!m_filterProjects)
         return;
@@ -799,7 +799,7 @@ void FlatModel::aboutToShowInSimpleTreeChanged(ProjectExplorer::FolderNode* node
             m_childNodes.remove(fn);
 }
 
-void FlatModel::showInSimpleTreeChanged(ProjectExplorer::FolderNode *node)
+void FlatModel::showInSimpleTreeChanged(FolderNode *node)
 {
     if (!m_filterProjects)
         return;
diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h
index e731fec042..5b40e4f804 100644
--- a/src/plugins/projectexplorer/projectmodels.h
+++ b/src/plugins/projectexplorer/projectmodels.h
@@ -71,7 +71,7 @@ public:
 
     void setStartupProject(ProjectNode *projectNode);
 
-    ProjectExplorer::Node *nodeForIndex(const QModelIndex &index) const;
+    Node *nodeForIndex(const QModelIndex &index) const;
     QModelIndex indexForNode(const Node *node);
 
     bool projectFilterEnabled();
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index 233f93069b..36e8d6a3fa 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -250,7 +250,7 @@ public:
     // by default returns false
     virtual bool deploysFolder(const QString &folder) const;
 
-    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurations() const;
+    virtual QList<RunConfiguration *> runConfigurations() const;
 
 
     QList<NodesWatcher*> watchers() const;
@@ -422,8 +422,8 @@ void compareSortedLists(T1 oldList, T2 newList, T1 &removedList, T2 &addedList,
 template <class T1, class T3>
 T1 subtractSortedList(T1 list1, T1 list2, T3 sorter)
 {
-    Q_ASSERT(ProjectExplorer::isSorted(list1, sorter));
-    Q_ASSERT(ProjectExplorer::isSorted(list2, sorter));
+    Q_ASSERT(isSorted(list1, sorter));
+    Q_ASSERT(isSorted(list2, sorter));
 
     typename T1::const_iterator list1It, list1End;
     typename T1::const_iterator list2It, list2End;
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index a1772c9660..489fc9c96d 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -71,7 +71,7 @@ public:
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
     {
         QStyleOptionViewItem opt = option;
-        if (!index.data(ProjectExplorer::Project::EnabledRole).toBool())
+        if (!index.data(Project::EnabledRole).toBool())
             opt.state &= ~QStyle::State_Enabled;
         QStyledItemDelegate::paint(painter, opt, index);
     }
@@ -360,7 +360,7 @@ void ProjectTreeWidget::showContextMenu(const QPoint &pos)
     ProjectExplorerPlugin::showContextMenu(this, m_view->mapToGlobal(pos), node);
 }
 
-void ProjectTreeWidget::handleProjectAdded(ProjectExplorer::Project *project)
+void ProjectTreeWidget::handleProjectAdded(Project *project)
 {
     Node *node = project->rootProjectNode();
     QModelIndex idx = m_model->indexForNode(node);
@@ -369,7 +369,7 @@ void ProjectTreeWidget::handleProjectAdded(ProjectExplorer::Project *project)
     m_view->setCurrentIndex(idx);
 }
 
-void ProjectTreeWidget::startupProjectChanged(ProjectExplorer::Project *project)
+void ProjectTreeWidget::startupProjectChanged(Project *project)
 {
     if (project) {
         ProjectNode *node = project->rootProjectNode();
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index ffa996811f..df6e8f6ff6 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -157,7 +157,7 @@ void ProjectWindow::projectDisplayNameChanged(Project *project)
     m_ignoreChange = false;
 }
 
-void ProjectWindow::registerProject(ProjectExplorer::Project *project)
+void ProjectWindow::registerProject(Project *project)
 {
     if (m_cache.isRegistered(project))
         return;
@@ -172,7 +172,7 @@ void ProjectWindow::registerProject(ProjectExplorer::Project *project)
             this, SLOT(removedTarget(ProjectExplorer::Target*)));
 }
 
-bool ProjectWindow::deregisterProject(ProjectExplorer::Project *project)
+bool ProjectWindow::deregisterProject(Project *project)
 {
     int index = m_cache.indexForProject(project);
     if (index == -1)
@@ -188,7 +188,7 @@ bool ProjectWindow::deregisterProject(ProjectExplorer::Project *project)
     return true;
 }
 
-void ProjectWindow::startupProjectChanged(ProjectExplorer::Project *p)
+void ProjectWindow::startupProjectChanged(Project *p)
 {
     int index = m_cache.indexForProject(p);
     if (index != -1)
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index aa027ae73c..44fced83d4 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -167,8 +167,8 @@ static inline AddNewTree *buildAddProjectTree(ProjectNode *root, const QString &
             children.append(child);
     }
 
-    const QList<ProjectExplorer::ProjectAction> &list = root->supportedActions(root);
-    if (list.contains(ProjectExplorer::AddSubProject) && !list.contains(ProjectExplorer::InheritedFromParent)) {
+    const QList<ProjectAction> &list = root->supportedActions(root);
+    if (list.contains(AddSubProject) && !list.contains(InheritedFromParent)) {
         if (projectPath.isEmpty() || root->canAddSubProject(projectPath)) {
             FolderNode::AddNewInformation info = root->addNewInformation(QStringList() << projectPath, contextNode);
             AddNewTree *item = new AddNewTree(root, children, info);
@@ -203,8 +203,8 @@ static inline AddNewTree *buildAddFilesTree(FolderNode *root, const QStringList
             children.append(child);
     }
 
-    const QList<ProjectExplorer::ProjectAction> &list = root->supportedActions(root);
-    if (list.contains(ProjectExplorer::AddNewFile) && !list.contains(ProjectExplorer::InheritedFromParent)) {
+    const QList<ProjectAction> &list = root->supportedActions(root);
+    if (list.contains(AddNewFile) && !list.contains(InheritedFromParent)) {
         FolderNode::AddNewInformation info = root->addNewInformation(files, contextNode);
         AddNewTree *item = new AddNewTree(root, children, info);
         selector->inspect(item);
@@ -416,7 +416,7 @@ void ProjectWizardPage::initializeProjectTree(Node *context, const QStringList &
     AddNewModel *model = new AddNewModel(tree);
     setModel(model);
     setBestNode(selector.bestChoice());
-    setAddingSubProject(action == ProjectExplorer::AddSubProject);
+    setAddingSubProject(action == AddSubProject);
 }
 
 void ProjectWizardPage::setNoneLabel(const QString &label)
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 89898b70be..cfb752ac3a 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -72,9 +72,9 @@ public:
 
     bool runVersionControl(const QList<Core::GeneratedFile> &files, QString *errorMessage);
 
-    void initializeProjectTree(ProjectExplorer::Node *context, const QStringList &paths,
+    void initializeProjectTree(Node *context, const QStringList &paths,
                                Core::IWizardFactory::WizardKind kind,
-                               ProjectExplorer::ProjectAction action);
+                               ProjectAction action);
 
 signals:
     void projectNodeChanged();
diff --git a/src/plugins/projectexplorer/removetaskhandler.cpp b/src/plugins/projectexplorer/removetaskhandler.cpp
index 2f8ea19bae..d5ed5b44d3 100644
--- a/src/plugins/projectexplorer/removetaskhandler.cpp
+++ b/src/plugins/projectexplorer/removetaskhandler.cpp
@@ -34,9 +34,10 @@
 
 #include <QAction>
 
-using namespace ProjectExplorer::Internal;
+namespace ProjectExplorer {
+namespace Internal {
 
-void RemoveTaskHandler::handle(const ProjectExplorer::Task &task)
+void RemoveTaskHandler::handle(const Task &task)
 {
     TaskHub::removeTask(task);
 }
@@ -49,3 +50,6 @@ QAction *RemoveTaskHandler::createAction(QObject *parent) const
     removeAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     return removeAction;
 }
+
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index a7b84d3090..502072caaa 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -310,7 +310,7 @@ ProjectExplorer::Abi RunConfiguration::abi() const
     BuildConfiguration *bc = target()->activeBuildConfiguration();
     if (!bc)
         return Abi::hostAbi();
-    ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(target()->kit());
+    ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
     if (!tc)
         return Abi::hostAbi();
     return tc->targetAbi();
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index f8f9e990ce..aac8e9cb9f 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -189,7 +189,7 @@ public:
         return 0;
     }
 
-    virtual ProjectExplorer::Abi abi() const;
+    virtual Abi abi() const;
 
     void addExtraAspects();
     void addExtraAspect(IRunConfigurationAspect *aspect);
diff --git a/src/plugins/projectexplorer/runconfigurationmodel.cpp b/src/plugins/projectexplorer/runconfigurationmodel.cpp
index 187c2bf9c8..15d32ddc43 100644
--- a/src/plugins/projectexplorer/runconfigurationmodel.cpp
+++ b/src/plugins/projectexplorer/runconfigurationmodel.cpp
@@ -158,7 +158,7 @@ QModelIndex RunConfigurationModel::indexFor(RunConfiguration *rc)
     return index(idx, 0);
 }
 
-void RunConfigurationModel::addedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void RunConfigurationModel::addedRunConfiguration(RunConfiguration *rc)
 {
     // Find the right place to insert
     RunConfigurationComparer compare;
@@ -177,7 +177,7 @@ void RunConfigurationModel::addedRunConfiguration(ProjectExplorer::RunConfigurat
             this, SLOT(displayNameChanged()));
 }
 
-void RunConfigurationModel::removedRunConfiguration(ProjectExplorer::RunConfiguration *rc)
+void RunConfigurationModel::removedRunConfiguration(RunConfiguration *rc)
 {
     int i = m_runConfigurations.indexOf(rc);
     if (i < 0)
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 65b5a2ecd4..1a53bde3f7 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -67,7 +67,7 @@ struct FactoryAndId
 class DeployFactoryAndId
 {
 public:
-    ProjectExplorer::DeployConfigurationFactory *factory;
+    DeployConfigurationFactory *factory;
     Core::Id id;
 };
 
@@ -535,7 +535,7 @@ QString RunSettingsWidget::uniqueRCName(const QString &name)
 void RunSettingsWidget::addRunControlWidgets()
 {
     foreach (IRunConfigurationAspect *aspect, m_runConfiguration->extraAspects()) {
-        ProjectExplorer::RunConfigWidget *rcw = aspect->createConfigurationWidget();
+        RunConfigWidget *rcw = aspect->createConfigurationWidget();
         if (rcw)
             addSubWidget(rcw);
     }
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index b8b035e65d..a13d6df3d6 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -457,7 +457,7 @@ QString SessionManagerPrivate::windowTitleAddition(const QString &filePath)
     if (SessionManager::isDefaultSession(d->m_sessionName)) {
         if (filePath.isEmpty()) {
             // use single project's name if there is only one loaded.
-            const QList<ProjectExplorer::Project *> projects = ProjectExplorer::SessionManager::projects();
+            const QList<Project *> projects = SessionManager::projects();
             if (projects.size() == 1)
                 return projects.first()->displayName();
             return QString();
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index 058a3ffd3f..0bb6b0e8fd 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -115,7 +115,7 @@ public:
 
     static SessionNode *sessionNode();
 
-    static Project *projectForNode(ProjectExplorer::Node *node);
+    static Project *projectForNode(Node *node);
     static QList<Node *> nodesForFile(const QString &fileName, Project *project = 0);
     static Node *nodeForFile(const QString &fileName, Project *project = 0);
     static Project *projectForFile(const QString &fileName);
diff --git a/src/plugins/projectexplorer/showineditortaskhandler.cpp b/src/plugins/projectexplorer/showineditortaskhandler.cpp
index 352d13aaf0..aa78fca04e 100644
--- a/src/plugins/projectexplorer/showineditortaskhandler.cpp
+++ b/src/plugins/projectexplorer/showineditortaskhandler.cpp
@@ -36,9 +36,10 @@
 #include <QAction>
 #include <QFileInfo>
 
-using namespace ProjectExplorer::Internal;
+namespace ProjectExplorer {
+namespace Internal {
 
-bool ShowInEditorTaskHandler::canHandle(const ProjectExplorer::Task &task) const
+bool ShowInEditorTaskHandler::canHandle(const Task &task) const
 {
     if (task.file.isEmpty())
         return false;
@@ -46,7 +47,7 @@ bool ShowInEditorTaskHandler::canHandle(const ProjectExplorer::Task &task) const
     return fi.exists() && fi.isFile() && fi.isReadable();
 }
 
-void ShowInEditorTaskHandler::handle(const ProjectExplorer::Task &task)
+void ShowInEditorTaskHandler::handle(const Task &task)
 {
     QFileInfo fi(task.file.toFileInfo());
     Core::EditorManager::openEditorAt(fi.filePath(), task.movedLine);
@@ -60,3 +61,6 @@ QAction *ShowInEditorTaskHandler::createAction(QObject *parent) const
     showAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     return showAction;
 }
+
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/showoutputtaskhandler.cpp b/src/plugins/projectexplorer/showoutputtaskhandler.cpp
index 38ba0982f8..ab73c4d1a7 100644
--- a/src/plugins/projectexplorer/showoutputtaskhandler.cpp
+++ b/src/plugins/projectexplorer/showoutputtaskhandler.cpp
@@ -35,7 +35,8 @@
 
 #include <QAction>
 
-using namespace ProjectExplorer::Internal;
+namespace ProjectExplorer {
+namespace Internal {
 
 ShowOutputTaskHandler::ShowOutputTaskHandler(CompileOutputWindow *window) :
     m_window(window)
@@ -43,12 +44,12 @@ ShowOutputTaskHandler::ShowOutputTaskHandler(CompileOutputWindow *window) :
     Q_ASSERT(m_window);
 }
 
-bool ShowOutputTaskHandler::canHandle(const ProjectExplorer::Task &task) const
+bool ShowOutputTaskHandler::canHandle(const Task &task) const
 {
     return m_window->knowsPositionOf(task);
 }
 
-void ShowOutputTaskHandler::handle(const ProjectExplorer::Task &task)
+void ShowOutputTaskHandler::handle(const Task &task)
 {
     Q_ASSERT(canHandle(task));
     // popup first as this does move the visible area!
@@ -64,3 +65,6 @@ QAction *ShowOutputTaskHandler::createAction(QObject *parent) const
     outputAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     return outputAction;
 }
+
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index aeee73c73e..5e5ee84ef2 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -516,7 +516,7 @@ void TargetSettingsPanelWidget::showTargetToolTip(const QPoint &globalPos, int t
     QToolTip::showText(globalPos, target->kit()->toHtml());
 }
 
-void TargetSettingsPanelWidget::targetAdded(ProjectExplorer::Target *target)
+void TargetSettingsPanelWidget::targetAdded(Target *target)
 {
     Q_ASSERT(m_project == target->project());
     Q_ASSERT(m_selector);
@@ -536,7 +536,7 @@ void TargetSettingsPanelWidget::targetAdded(ProjectExplorer::Target *target)
     updateTargetButtons();
 }
 
-void TargetSettingsPanelWidget::removedTarget(ProjectExplorer::Target *target)
+void TargetSettingsPanelWidget::removedTarget(Target *target)
 {
     Q_ASSERT(m_project == target->project());
     Q_ASSERT(m_selector);
@@ -551,7 +551,7 @@ void TargetSettingsPanelWidget::removedTarget(ProjectExplorer::Target *target)
     updateTargetButtons();
 }
 
-void TargetSettingsPanelWidget::activeTargetChanged(ProjectExplorer::Target *target)
+void TargetSettingsPanelWidget::activeTargetChanged(Target *target)
 {
     Q_ASSERT(m_selector);
 
@@ -644,8 +644,7 @@ void TargetSettingsPanelWidget::openTargetPreferences()
 {
     int targetIndex = m_selector->currentIndex();
     if (targetIndex >= 0 && targetIndex < m_targets.size()) {
-        KitOptionsPage *page = ExtensionSystem::PluginManager::getObject<ProjectExplorer::KitOptionsPage>();
-        if (page)
+        if (KitOptionsPage *page = ExtensionSystem::PluginManager::getObject<KitOptionsPage>())
             page->showKit(m_targets.at(targetIndex)->kit());
     }
     ICore::showOptionsDialog(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
index a4dca88cd7..07fbe1ba99 100644
--- a/src/plugins/projectexplorer/targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -224,8 +224,7 @@ void TargetSetupWidget::targetCheckBoxToggled(bool b)
 
 void TargetSetupWidget::manageKit()
 {
-    ProjectExplorer::KitOptionsPage *page =
-            ExtensionSystem::PluginManager::getObject<ProjectExplorer::KitOptionsPage>();
+    KitOptionsPage *page = ExtensionSystem::PluginManager::getObject<KitOptionsPage>();
     if (!page || !m_kit)
         return;
 
diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp
index a6fe346639..2a552d2ecd 100644
--- a/src/plugins/projectexplorer/task.cpp
+++ b/src/plugins/projectexplorer/task.cpp
@@ -77,7 +77,7 @@ Task Task::compilerMissingTask()
                                             "Qt Creator needs a compiler set up to build. "
                                             "Configure a compiler in the kit options."),
                 Utils::FileName(), -1,
-                ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
+                Constants::TASK_CATEGORY_BUILDSYSTEM);
 }
 
 Task Task::buildConfigurationMissingTask()
@@ -87,7 +87,7 @@ Task Task::buildConfigurationMissingTask()
                                             "Qt Creator needs a build configuration set up to build. "
                                             "Configure a build configuration in the project settings."),
                 Utils::FileName(), -1,
-                ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
+                Constants::TASK_CATEGORY_BUILDSYSTEM);
 }
 
 void Task::addMark(TextEditor::TextMark *mark)
@@ -125,13 +125,13 @@ bool operator==(const Task &t1, const Task &t2)
 bool operator<(const Task &a, const Task &b)
 {
     if (a.type != b.type) {
-        if (a.type == ProjectExplorer::Task::Error)
+        if (a.type == Task::Error)
             return true;
-        if (b.type == ProjectExplorer::Task::Error)
+        if (b.type == Task::Error)
             return false;
-        if (a.type == ProjectExplorer::Task::Warning)
+        if (a.type == Task::Warning)
             return true;
-        if (b.type == ProjectExplorer::Task::Warning)
+        if (b.type == Task::Warning)
             return false;
         // Can't happen
         return true;
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index dcd064af6d..8cbccae453 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -730,7 +730,7 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
         int height = 0;
         description.replace(QLatin1Char('\n'), QChar::LineSeparator);
         QTextLayout tl(description);
-        tl.setAdditionalFormats(index.data(TaskModel::Task_t).value<ProjectExplorer::Task>().formats);
+        tl.setAdditionalFormats(index.data(TaskModel::Task_t).value<Task>().formats);
         tl.beginLayout();
         while (true) {
             QTextLine line = tl.createLine();
@@ -830,7 +830,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
         int height = 0;
         description.replace(QLatin1Char('\n'), QChar::LineSeparator);
         QTextLayout tl(description);
-        tl.setAdditionalFormats(index.data(TaskModel::Task_t).value<ProjectExplorer::Task>().formats);
+        tl.setAdditionalFormats(index.data(TaskModel::Task_t).value<Task>().formats);
         tl.beginLayout();
         while (true) {
             QTextLine line = tl.createLine();
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h
index a84a8834a7..79fb64f374 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.h
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.h
@@ -54,9 +54,9 @@ class PROJECTEXPLORER_EXPORT ToolChainConfigWidget : public QWidget
     Q_OBJECT
 
 public:
-    ToolChainConfigWidget(ProjectExplorer::ToolChain *);
+    ToolChainConfigWidget(ToolChain *);
 
-    ProjectExplorer::ToolChain *toolChain() const;
+    ToolChain *toolChain() const;
 
     void apply();
     void discard();
diff --git a/src/plugins/projectexplorer/xcodebuildparser.cpp b/src/plugins/projectexplorer/xcodebuildparser.cpp
index 36040aa5b0..9576fc1b03 100644
--- a/src/plugins/projectexplorer/xcodebuildparser.cpp
+++ b/src/plugins/projectexplorer/xcodebuildparser.cpp
@@ -91,7 +91,7 @@ void XcodebuildParser::stdError(const QString &line)
                                               "Xcodebuild failed."),
                   Utils::FileName(), /* filename */
                   -1, /* line */
-                  ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
+                  Constants::TASK_CATEGORY_COMPILE);
         taskAdded(task);
         return;
     }
@@ -213,14 +213,14 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
                                    "unknownErr")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
-                << ProjectExplorer::Task(
+            << (QList<Task>()
+                << Task(
                     Task::Error,
                     QCoreApplication::translate("ProjectExplorer::XcodebuildParser",
                                                 "Xcodebuild failed."),
                     Utils::FileName(), /* filename */
                     -1, /* line */
-                    ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
+                    Constants::TASK_CATEGORY_COMPILE))
             << QString()
             << XcodebuildParser::UnknownXcodebuildState;
     QTest::newRow("switch out->unknown")
@@ -230,14 +230,14 @@ void ProjectExplorerPlugin::testXcodebuildParserParsing_data()
                                    "unknownErr")
             << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("outErr\n")
-            << (QList<ProjectExplorer::Task>()
-                << ProjectExplorer::Task(
+            << (QList<Task>()
+                << Task(
                     Task::Error,
                     QCoreApplication::translate("ProjectExplorer::XcodebuildParser",
                                                 "Xcodebuild failed."),
                     Utils::FileName(), /* filename */
                     -1, /* line */
-                    ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))
+                    Constants::TASK_CATEGORY_COMPILE))
             << QString()
             << XcodebuildParser::UnknownXcodebuildState;
 }