Move analyzerbase to debugger

This is the first mechanical step to execute on the 'shared pool of
debugger/analyzer views' idea.

Future steps would be providing infrastructure for the view pool,
making all analyzer/debugger views use the pool and then re-extract
a sensible base for a 'analyzer-and/or-debugger' tool plugin interface.

Change-Id: I1bb392e6dd3084fc56937956bee1d6fd9530335d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

99 files changed, 195 insertions, 365 deletions

diff --git a/src/plugins/analyzerbase/AnalyzerBase.json.in b/src/plugins/analyzerbase/AnalyzerBase.json.in
deleted file mode 100644
index ef169a709b..0000000000
--- a/src/plugins/analyzerbase/AnalyzerBase.json.in
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    \"Name\" : \"AnalyzerBase\",
-    \"Version\" : \"$$QTCREATOR_VERSION\",
-    \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
-    \"Vendor\" : \"The Qt Company Ltd\",
-    \"Copyright\" : \"(C) 2016 The Qt Company Ltd\",
-    \"License\" : [ \"Commercial Usage\",
-                  \"\",
-                  \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\",
-                  \"\",
-                  \"GNU General Public License Usage\",
-                  \"\",
-                  \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
-    ],
-    \"Category\" : \"Code Analyzer\",
-    \"Description\" : \"Code Analyzer Base Plugin.\",
-    \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
-}
diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro
deleted file mode 100644
index 923f59d398..0000000000
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ /dev/null
@@ -1,36 +0,0 @@
-DEFINES += ANALYZERBASE_LIBRARY
-
-include(../../qtcreatorplugin.pri)
-
-QT += network
-
-# AnalyzerBase files
-
-SOURCES += \
-    ianalyzertool.cpp \
-    analyzerplugin.cpp \
-    analyzerruncontrol.cpp \
-    analyzermanager.cpp \
-    analyzerrunconfigwidget.cpp \
-    analyzerutils.cpp \
-    detailederrorview.cpp \
-    diagnosticlocation.cpp \
-    startremotedialog.cpp
-
-HEADERS += \
-    ianalyzertool.h \
-    analyzerbase_global.h \
-    analyzerconstants.h \
-    analyzerplugin.h \
-    analyzerruncontrol.h \
-    analyzermanager.h \
-    analyzerstartparameters.h \
-    analyzerrunconfigwidget.h \
-    analyzerutils.h \
-    detailederrorview.h \
-    diagnosticlocation.h \
-    startremotedialog.h \
-    analyzericons.h
-
-RESOURCES += \
-    analyzerbase.qrc
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
deleted file mode 100644
index 50544dc3f8..0000000000
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ /dev/null
@@ -1,50 +0,0 @@
-import qbs 1.0
-
-QtcPlugin {
-    name: "AnalyzerBase"
-
-    Depends { name: "Qt.widgets" }
-    Depends { name: "Utils" }
-    Depends { name: "QtcSsh" }
-
-    Depends { name: "Core" }
-    Depends { name: "CppTools" }
-    Depends { name: "ProjectExplorer" }
-    Depends { name: "TextEditor" }
-
-    files: [
-        "analyzerbase.qrc",
-        "analyzerbase_global.h",
-        "analyzerconstants.h",
-        "analyzericons.h",
-        "analyzermanager.cpp",
-        "analyzermanager.h",
-        "analyzerplugin.cpp",
-        "analyzerplugin.h",
-        "analyzerrunconfigwidget.cpp",
-        "analyzerrunconfigwidget.h",
-        "analyzerruncontrol.cpp",
-        "analyzerruncontrol.h",
-        "analyzerstartparameters.h",
-        "analyzerutils.cpp",
-        "analyzerutils.h",
-        "detailederrorview.cpp",
-        "detailederrorview.h",
-        "diagnosticlocation.cpp",
-        "diagnosticlocation.h",
-        "ianalyzertool.cpp",
-        "ianalyzertool.h",
-        "startremotedialog.cpp",
-        "startremotedialog.h",
-    ]
-
-    Group {
-        name: "Images"
-        prefix: "images/"
-        files: ["*.png"]
-    }
-
-    Export {
-        Depends { name: "CPlusPlus" }
-    }
-}
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
deleted file mode 100644
index 10c5c8b6df..0000000000
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-QTC_PLUGIN_NAME = AnalyzerBase
-QTC_LIB_DEPENDS += \
-    cplusplus \
-    extensionsystem \
-    ssh \
-    utils
-QTC_PLUGIN_DEPENDS += \
-    coreplugin \
-    projectexplorer \
-    texteditor \
-    cpptools
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
deleted file mode 100644
index cb4d7d1c97..0000000000
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "analyzerplugin.h"
-#include "analyzerconstants.h"
-#include "analyzermanager.h"
-
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/taskhub.h>
-
-#include <QtPlugin>
-
-using namespace Analyzer;
-using namespace Analyzer::Internal;
-
-static AnalyzerPlugin *m_instance = 0;
-
-////////////////////////////////////////////////////////////////////////
-//
-// AnalyzerPlugin
-//
-////////////////////////////////////////////////////////////////////////
-
-AnalyzerPlugin::AnalyzerPlugin()
-{
-    m_instance = this;
-}
-
-AnalyzerPlugin::~AnalyzerPlugin()
-{
-    m_instance = 0;
-}
-
-bool AnalyzerPlugin::initialize(const QStringList &arguments, QString *errorString)
-{
-    Q_UNUSED(arguments)
-    Q_UNUSED(errorString)
-
-    (void) new AnalyzerManager(this);
-
-    // Task integration.
-    //: Category under which Analyzer tasks are listed in Issues view
-    ProjectExplorer::TaskHub::addCategory(Constants::ANALYZERTASK_ID, tr("Analyzer"));
-
-    return true;
-}
-
-ExtensionSystem::IPlugin::ShutdownFlag AnalyzerPlugin::aboutToShutdown()
-{
-    AnalyzerManager::shutdown();
-    return SynchronousShutdown;
-}
-
-AnalyzerPlugin *AnalyzerPlugin::instance()
-{
-    return m_instance;
-}
diff --git a/src/plugins/analyzerbase/analyzerplugin.h b/src/plugins/analyzerbase/analyzerplugin.h
deleted file mode 100644
index af84928c90..0000000000
--- a/src/plugins/analyzerbase/analyzerplugin.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Author: Nicolas Arnaud-Cormos, KDAB (nicolas.arnaud-cormos@kdab.com)
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#ifndef ANALYZERPLUGIN_H
-#define ANALYZERPLUGIN_H
-
-#include <extensionsystem/iplugin.h>
-
-namespace Analyzer {
-namespace Internal {
-
-class AnalyzerPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "AnalyzerBase.json")
-
-public:
-    static AnalyzerPlugin *instance();
-
-    AnalyzerPlugin();
-    virtual ~AnalyzerPlugin();
-
-    bool initialize(const QStringList &arguments, QString *errorString);
-    void extensionsInitialized() {}
-
-    ShutdownFlag aboutToShutdown();
-};
-
-} // namespace Internal
-} // namespace Analyzer
-
-#endif // ANALYZERPLUGIN_H
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index caabb1d1bb..4251bd023b 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -4,7 +4,6 @@ QtcPlugin {
     name: "Android"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
-    Depends { name: "AnalyzerBase" }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri
index fad0a885ab..f471fb4fe9 100644
--- a/src/plugins/android/android_dependencies.pri
+++ b/src/plugins/android/android_dependencies.pri
@@ -4,8 +4,7 @@ QTC_PLUGIN_DEPENDS += \
     debugger \
     projectexplorer \
     qtsupport \
-    texteditor \
-    analyzerbase
+    texteditor
 
 QTC_LIB_DEPENDS += \
     extensionsystem \
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp
index cbdda00e21..0beade12e4 100644
--- a/src/plugins/android/androidanalyzesupport.cpp
+++ b/src/plugins/android/androidanalyzesupport.cpp
@@ -28,10 +28,10 @@
 #include "androidrunner.h"
 #include "androidmanager.h"
 
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <projectexplorer/target.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
index 8f508fbdec..0221fab3ad 100644
--- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp
+++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp
@@ -40,9 +40,9 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <utils/portlist.h>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
index ea9cedcd9d..4c446f5c63 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
@@ -3,7 +3,7 @@ import qbs
 QtcPlugin {
     name: "ClangStaticAnalyzer"
 
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
     Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "ExtensionSystem" }
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
index b099392373..f907aefc61 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
@@ -3,7 +3,7 @@ QTC_LIB_DEPENDS += \
     extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
+    debugger \
     cpptools
 QTC_TEST_DEPENDS += \
     qbsprojectmanager \
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
index 6da02dfaa9..ecb5e8e94e 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALZYERDIAGNOSTIC_H
 #define CLANGSTATICANALZYERDIAGNOSTIC_H
 
-#include <analyzerbase/diagnosticlocation.h>
+#include <debugger/analyzer/diagnosticlocation.h>
 
 #include <QList>
 #include <QMetaType>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
index 9c93fb9f77..437e83ce40 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
@@ -29,7 +29,7 @@
 #include "clangstaticanalyzerdiagnostic.h"
 #include "clangstaticanalyzerprojectsettings.h"
 
-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 #include <utils/fileutils.h>
 #include <utils/treemodel.h>
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
index 392294fd86..0d5016fd7c 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERDIAGNOSTICVIEW_H
 #define CLANGSTATICANALYZERDIAGNOSTICVIEW_H
 
-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 
 namespace ClangStaticAnalyzer {
 namespace Internal {
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
index 2822e0e6a1..b11727890d 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
@@ -35,7 +35,7 @@
 #include "clangstaticanalyzerunittests.h"
 #endif
 
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actionmanager.h>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 061c9c71c5..5d4c1e3194 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -30,8 +30,8 @@
 #include "clangstaticanalyzersettings.h"
 #include "clangstaticanalyzerutils.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
 
 #include <clangcodemodel/clangutils.h>
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
index b74bfb3032..84ad1ae9fc 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERRUNCONTROL_H
 #define CLANGSTATICANALYZERRUNCONTROL_H
 
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <cpptools/projectinfo.h>
 #include <utils/environment.h>
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index b89ea1cee5..a179e2fa1f 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
@@ -27,9 +27,9 @@
 
 #include "clangstaticanalyzerconstants.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <coreplugin/icontext.h>
 
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index b1a3a1e9fb..e72f4c7cf6 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
@@ -31,7 +31,7 @@
 #include "clangstaticanalyzerdiagnosticview.h"
 #include "clangstaticanalyzerruncontrol.h"
 
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
index 5c59281014..5f41c43a9d 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
@@ -26,7 +26,7 @@
 #ifndef CLANGSTATICANALYZERTOOL_H
 #define CLANGSTATICANALYZERTOOL_H
 
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <cpptools/projectinfo.h>
 
 #include <QHash>
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
index 12acb811a6..1c91d723aa 100644
--- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
+++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp
@@ -29,7 +29,7 @@
 #include "clangstaticanalyzertool.h"
 #include "clangstaticanalyzerutils.h"
 
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cpptoolstestcase.h>
 #include <projectexplorer/kitinformation.h>
diff --git a/src/plugins/debugger/analyzer/analyzer.pri b/src/plugins/debugger/analyzer/analyzer.pri
new file mode 100644
index 0000000000..cb38aa4555
--- /dev/null
+++ b/src/plugins/debugger/analyzer/analyzer.pri
@@ -0,0 +1,31 @@
+
+QT += network
+
+# AnalyzerBase files
+
+SOURCES += \
+    $$PWD/ianalyzertool.cpp \
+    $$PWD/analyzerruncontrol.cpp \
+    $$PWD/analyzermanager.cpp \
+    $$PWD/analyzerrunconfigwidget.cpp \
+    $$PWD/analyzerutils.cpp \
+    $$PWD/detailederrorview.cpp \
+    $$PWD/diagnosticlocation.cpp \
+    $$PWD/startremotedialog.cpp
+
+HEADERS += \
+    $$PWD/ianalyzertool.h \
+    $$PWD/analyzerbase_global.h \
+    $$PWD/analyzerconstants.h \
+    $$PWD/analyzerruncontrol.h \
+    $$PWD/analyzermanager.h \
+    $$PWD/analyzerstartparameters.h \
+    $$PWD/analyzerrunconfigwidget.h \
+    $$PWD/analyzerutils.h \
+    $$PWD/detailederrorview.h \
+    $$PWD/diagnosticlocation.h \
+    $$PWD/startremotedialog.h \
+    $$PWD/analyzericons.h
+
+RESOURCES += \
+    $$PWD/analyzerbase.qrc
diff --git a/src/plugins/analyzerbase/analyzerbase.qrc b/src/plugins/debugger/analyzer/analyzerbase.qrc
index 10c518cfb2..10c518cfb2 100644
--- a/src/plugins/analyzerbase/analyzerbase.qrc
+++ b/src/plugins/debugger/analyzer/analyzerbase.qrc
diff --git a/src/plugins/analyzerbase/analyzerbase_global.h b/src/plugins/debugger/analyzer/analyzerbase_global.h
index 74ad2bb98d..74ad2bb98d 100644
--- a/src/plugins/analyzerbase/analyzerbase_global.h
+++ b/src/plugins/debugger/analyzer/analyzerbase_global.h
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/debugger/analyzer/analyzerconstants.h
index 8f6da351e8..8f6da351e8 100644
--- a/src/plugins/analyzerbase/analyzerconstants.h
+++ b/src/plugins/debugger/analyzer/analyzerconstants.h
diff --git a/src/plugins/analyzerbase/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h
index fa8d6a8bef..fa8d6a8bef 100644
--- a/src/plugins/analyzerbase/analyzericons.h
+++ b/src/plugins/debugger/analyzer/analyzericons.h
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/debugger/analyzer/analyzermanager.cpp
index c5e8fb2b2f..e389af3d75 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/debugger/analyzer/analyzermanager.cpp
@@ -27,10 +27,11 @@
 #include "analyzermanager.h"
 
 #include "analyzericons.h"
-#include "analyzerplugin.h"
 #include "analyzerstartparameters.h"
 #include "ianalyzertool.h"
 
+#include "../debuggerplugin.h"
+
 #include <coreplugin/coreicons.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
@@ -77,7 +78,6 @@
 using namespace Core;
 using namespace Utils;
 using namespace Core::Constants;
-using namespace Analyzer::Internal;
 using namespace Analyzer::Constants;
 using namespace ProjectExplorer;
 
@@ -161,7 +161,7 @@ public:
 
 public:
     AnalyzerManager *q;
-    AnalyzerMode *m_mode;
+    Internal::AnalyzerMode *m_mode;
     bool m_isRunning;
     FancyMainWindow *m_mainWindow;
     AnalyzerAction *m_currentAction;
@@ -259,7 +259,7 @@ void AnalyzerManagerPrivate::delayedInit()
     if (m_mode)
         return;
 
-    m_mode = new AnalyzerMode(q);
+    m_mode = new Internal::AnalyzerMode(q);
     createModeMainWindow();
 
     connect(ModeManager::instance(), &ModeManager::currentModeChanged,
@@ -286,7 +286,7 @@ void AnalyzerManagerPrivate::delayedInit()
     ICore::addContextObject(modeContextObject);
     m_mode->setWidget(splitter);
 
-    AnalyzerPlugin::instance()->addAutoReleasedObject(m_mode);
+    Debugger::Internal::DebuggerPlugin::instance()->addAutoReleasedObject(m_mode);
 
     // Populate Windows->Views menu with standard actions.
     Context analyzerContext(C_ANALYZEMODE);
@@ -444,8 +444,8 @@ void AnalyzerManagerPrivate::selectSavedTool()
 {
     const QSettings *settings = ICore::settings();
 
-    if (settings->contains(QLatin1String(LAST_ACTIVE_TOOL))) {
-        const Id lastAction = Id::fromSetting(settings->value(QLatin1String(LAST_ACTIVE_TOOL)));
+    if (settings->contains(QLatin1String(Internal::LAST_ACTIVE_TOOL))) {
+        const Id lastAction = Id::fromSetting(settings->value(QLatin1String(Internal::LAST_ACTIVE_TOOL)));
         foreach (AnalyzerAction *action, m_actions) {
             if (action->toolId() == lastAction) {
                 selectAction(action);
@@ -497,7 +497,7 @@ void AnalyzerManagerPrivate::selectAction(AnalyzerAction *action)
         m_statusLabelsStackWidget->addWidget(toolStatusLabel);
     }
     foreach (QDockWidget *widget, m_toolWidgets.value(toolId))
-        activateDock(Qt::DockWidgetArea(widget->property(INITIAL_DOCK_AREA).toInt()), widget);
+        activateDock(Qt::DockWidgetArea(widget->property(Internal::INITIAL_DOCK_AREA).toInt()), widget);
 
     loadToolSettings(action->toolId());
 
@@ -581,7 +581,7 @@ void AnalyzerManagerPrivate::saveToolSettings(Id toolId)
     m_mainWindow->saveSettings(settings);
     settings->setValue(QLatin1String("ToolSettingsSaved"), true);
     settings->endGroup();
-    settings->setValue(QLatin1String(LAST_ACTIVE_TOOL), toolId.toString());
+    settings->setValue(QLatin1String(Internal::LAST_ACTIVE_TOOL), toolId.toString());
 }
 
 void AnalyzerManagerPrivate::updateRunActions()
@@ -644,7 +644,7 @@ QDockWidget *AnalyzerManager::createDockWidget(Core::Id toolId,
 {
     QTC_ASSERT(!widget->objectName().isEmpty(), return 0);
     QDockWidget *dockWidget = d->m_mainWindow->addDockForWidget(widget);
-    dockWidget->setProperty(INITIAL_DOCK_AREA, int(area));
+    dockWidget->setProperty(Internal::INITIAL_DOCK_AREA, int(area));
     d->m_dockWidgets.append(AnalyzerManagerPrivate::DockPtr(dockWidget));
     d->m_toolWidgets[toolId].push_back(dockWidget);
     return dockWidget;
diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/debugger/analyzer/analyzermanager.h
index 1c4d77ec61..1c4d77ec61 100644
--- a/src/plugins/analyzerbase/analyzermanager.h
+++ b/src/plugins/debugger/analyzer/analyzermanager.h
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
index 9504ebce9f..9504ebce9f 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
index aa18b74156..aa18b74156 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.h
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
index 61e71a335e..61e71a335e 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h
index d13adc98b7..d13adc98b7 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/debugger/analyzer/analyzerruncontrol.h
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/debugger/analyzer/analyzerstartparameters.h
index 1b4a3a6bdf..1b4a3a6bdf 100644
--- a/src/plugins/analyzerbase/analyzerstartparameters.h
+++ b/src/plugins/debugger/analyzer/analyzerstartparameters.h
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/debugger/analyzer/analyzerutils.cpp
index cafafa1f11..cafafa1f11 100644
--- a/src/plugins/analyzerbase/analyzerutils.cpp
+++ b/src/plugins/debugger/analyzer/analyzerutils.cpp
diff --git a/src/plugins/analyzerbase/analyzerutils.h b/src/plugins/debugger/analyzer/analyzerutils.h
index e173c58d1e..e173c58d1e 100644
--- a/src/plugins/analyzerbase/analyzerutils.h
+++ b/src/plugins/debugger/analyzer/analyzerutils.h
diff --git a/src/plugins/analyzerbase/detailederrorview.cpp b/src/plugins/debugger/analyzer/detailederrorview.cpp
index c539102c4f..c539102c4f 100644
--- a/src/plugins/analyzerbase/detailederrorview.cpp
+++ b/src/plugins/debugger/analyzer/detailederrorview.cpp
diff --git a/src/plugins/analyzerbase/detailederrorview.h b/src/plugins/debugger/analyzer/detailederrorview.h
index 485e082e08..485e082e08 100644
--- a/src/plugins/analyzerbase/detailederrorview.h
+++ b/src/plugins/debugger/analyzer/detailederrorview.h
diff --git a/src/plugins/analyzerbase/diagnosticlocation.cpp b/src/plugins/debugger/analyzer/diagnosticlocation.cpp
index 7fa15f83c8..7fa15f83c8 100644
--- a/src/plugins/analyzerbase/diagnosticlocation.cpp
+++ b/src/plugins/debugger/analyzer/diagnosticlocation.cpp
diff --git a/src/plugins/analyzerbase/diagnosticlocation.h b/src/plugins/debugger/analyzer/diagnosticlocation.h
index 497698413d..497698413d 100644
--- a/src/plugins/analyzerbase/diagnosticlocation.h
+++ b/src/plugins/debugger/analyzer/diagnosticlocation.h
diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/debugger/analyzer/ianalyzertool.cpp
index 6580fc80c8..6580fc80c8 100644
--- a/src/plugins/analyzerbase/ianalyzertool.cpp
+++ b/src/plugins/debugger/analyzer/ianalyzertool.cpp
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/debugger/analyzer/ianalyzertool.h
index c9e1168fe4..c9e1168fe4 100644
--- a/src/plugins/analyzerbase/ianalyzertool.h
+++ b/src/plugins/debugger/analyzer/ianalyzertool.h
diff --git a/src/plugins/analyzerbase/images/analyzer_category.png b/src/plugins/debugger/analyzer/images/analyzer_category.png
index fdfe8ed231..fdfe8ed231 100644
--- a/src/plugins/analyzerbase/images/analyzer_category.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_category.png
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
index 138391ddd0..138391ddd0 100644
--- a/src/plugins/analyzerbase/images/analyzer_overlay_small.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_overlay_small.png
diff --git a/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png b/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
index 7fb5ea48b7..7fb5ea48b7 100644
--- a/src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png
+++ b/src/plugins/debugger/analyzer/images/analyzer_overlay_small@2x.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze.png b/src/plugins/debugger/analyzer/images/mode_analyze.png
index 304b942a9f..304b942a9f 100644
--- a/src/plugins/analyzerbase/images/mode_analyze.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze@2x.png b/src/plugins/debugger/analyzer/images/mode_analyze@2x.png
index af8b8dea8c..af8b8dea8c 100644
--- a/src/plugins/analyzerbase/images/mode_analyze@2x.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze@2x.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask.png b/src/plugins/debugger/analyzer/images/mode_analyze_mask.png
index b90619a3a1..b90619a3a1 100644
--- a/src/plugins/analyzerbase/images/mode_analyze_mask.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze_mask.png
diff --git a/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png b/src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
index a0618846da..a0618846da 100644
--- a/src/plugins/analyzerbase/images/mode_analyze_mask@2x.png
+++ b/src/plugins/debugger/analyzer/images/mode_analyze_mask@2x.png
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index 79c37c390f..79c37c390f 100644
--- a/src/plugins/analyzerbase/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/debugger/analyzer/startremotedialog.h
index f6694d08ef..f6694d08ef 100644
--- a/src/plugins/analyzerbase/startremotedialog.h
+++ b/src/plugins/debugger/analyzer/startremotedialog.h
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index a82da0787c..8b9fb0dc06 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -148,5 +148,6 @@ include(lldb/lldb.pri)
 include(qml/qml.pri)
 include(namedemangler/namedemangler.pri)
 include(console/console.pri)
+include(analyzer/analyzer.pri)
 
 include(shared/shared.pri)
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index e97290c8cb..a74db388be 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -196,6 +196,12 @@ QtcPlugin {
     }
 
     Group {
+        name: "Images/analyzer"
+        prefix: "analyzer/images/"
+        files: ["*.png"]
+    }
+
+    Group {
         name: "RegistryAccess"
         condition: qbs.targetOS.contains("windows")
         prefix: project.sharedSourcesDir + "/registryaccess/"
@@ -223,7 +229,36 @@ QtcPlugin {
         ]
     }
 
+    Group {
+        name: "Analyzer"
+
+        files: [
+            "analyzer/analyzerbase.qrc",
+            "analyzer/analyzerbase_global.h",
+            "analyzer/analyzerconstants.h",
+            "analyzer/analyzericons.h",
+            "analyzer/analyzermanager.cpp",
+            "analyzer/analyzermanager.h",
+            "analyzer/analyzerrunconfigwidget.cpp",
+            "analyzer/analyzerrunconfigwidget.h",
+            "analyzer/analyzerruncontrol.cpp",
+            "analyzer/analyzerruncontrol.h",
+            "analyzer/analyzerstartparameters.h",
+            "analyzer/analyzerutils.cpp",
+            "analyzer/analyzerutils.h",
+            "analyzer/detailederrorview.cpp",
+            "analyzer/detailederrorview.h",
+            "analyzer/diagnosticlocation.cpp",
+            "analyzer/diagnosticlocation.h",
+            "analyzer/ianalyzertool.cpp",
+            "analyzer/ianalyzertool.h",
+            "analyzer/startremotedialog.cpp",
+            "analyzer/startremotedialog.h",
+        ]
+    }
+
     Export {
         Depends { name: "QtcSsh" }
+        Depends { name: "CPlusPlus" }
     }
 }
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f58b3782a2..28d0950ea8 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -69,6 +69,9 @@
 #include "commonoptionspage.h"
 #include "gdb/startgdbserverdialog.h"
 
+#include "analyzer/analyzerconstants.h"
+#include "analyzer/analyzermanager.h"
+
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
@@ -99,6 +102,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/runnables.h>
 #include <projectexplorer/session.h>
+#include <projectexplorer/taskhub.h>
 #include <projectexplorer/target.h>
 
 #include <texteditor/texteditor.h>
@@ -386,6 +390,9 @@ using namespace ProjectExplorer;
 using namespace TextEditor;
 using namespace Utils;
 
+using namespace Analyzer;
+//using namespace Analyzer::Internal;
+
 namespace CC = Core::Constants;
 namespace PE = ProjectExplorer::Constants;
 
@@ -3168,16 +3175,25 @@ QSharedPointer<Internal::GlobalDebuggerOptions> globalDebuggerOptions()
     is DebuggerCore, implemented in DebuggerPluginPrivate.
 */
 
+static DebuggerPlugin *m_instance = 0;
+
 DebuggerPlugin::DebuggerPlugin()
 {
     setObjectName(QLatin1String("DebuggerPlugin"));
     dd = new DebuggerPluginPrivate(this);
+    m_instance = this;
 }
 
 DebuggerPlugin::~DebuggerPlugin()
 {
     delete dd;
     dd = 0;
+    m_instance = 0;
+}
+
+DebuggerPlugin *DebuggerPlugin::instance()
+{
+    return m_instance;
 }
 
 bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -3198,6 +3214,13 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
 
     KitManager::registerKitInformation(new DebuggerKitInformation);
 
+    // Ex-Analyzer stuff
+    (void) new AnalyzerManager(this);
+
+    // Task integration.
+    //: Category under which Analyzer tasks are listed in Issues view
+    ProjectExplorer::TaskHub::addCategory(Analyzer::Constants::ANALYZERTASK_ID, tr("Analyzer"));
+
     return dd->initialize(arguments, errorMessage);
 }
 
@@ -3205,6 +3228,7 @@ IPlugin::ShutdownFlag DebuggerPlugin::aboutToShutdown()
 {
     removeObject(this);
     dd->aboutToShutdown();
+    AnalyzerManager::shutdown();
     return SynchronousShutdown;
 }
 
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 95b1a184df..32ef71d1c6 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -43,14 +43,16 @@ public:
     DebuggerPlugin();
     ~DebuggerPlugin();
 
+    static DebuggerPlugin *instance();
+
 private:
     // IPlugin implementation.
-    bool initialize(const QStringList &arguments, QString *errorMessage);
+    bool initialize(const QStringList &arguments, QString *errorMessage) override;
     QObject *remoteCommand(const QStringList &options,
                            const QString &workingDirectory,
-                           const QStringList &arguments);
-    ShutdownFlag aboutToShutdown();
-    void extensionsInitialized();
+                           const QStringList &arguments) override;
+    ShutdownFlag aboutToShutdown() override;
+    void extensionsInitialized() override;
 
     // Called from AppOutputPane::attachToRunControl().
     Q_SLOT void attachExternalApplication(ProjectExplorer::RunControl *rc);
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index c9e491c3de..0eb70f2f10 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
     Depends { name: "QmakeProjectManager" }
     Depends { name: "Debugger" }
     Depends { name: "QtSupport" }
-    Depends { name: "AnalyzerBase" }
     Depends { name: "QmlDebug" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
diff --git a/src/plugins/ios/ios_dependencies.pri b/src/plugins/ios/ios_dependencies.pri
index c41bb27047..04ec7b6af0 100644
--- a/src/plugins/ios/ios_dependencies.pri
+++ b/src/plugins/ios/ios_dependencies.pri
@@ -6,5 +6,4 @@ QTC_PLUGIN_DEPENDS += \
     coreplugin \
     debugger \
     projectexplorer \
-    qmakeprojectmanager \
-    analyzerbase
+    qmakeprojectmanager
diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp
index fca1c6c8c7..c40fddf7da 100644
--- a/src/plugins/ios/iosanalyzesupport.cpp
+++ b/src/plugins/ios/iosanalyzesupport.cpp
@@ -34,14 +34,14 @@
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 #include <qtsupport/qtkitinformation.h>
 #include <utils/fileutils.h>
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
 #include <utils/outputformat.h>
 #include <utils/qtcprocess.h>
 
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 17b8393174..bd5a0dbf56 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -32,9 +32,9 @@
 #include "iosmanager.h"
 #include "iosanalyzesupport.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 569553cb4d..c087ff2669 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -40,7 +40,6 @@ SUBDIRS   = \
     bazaar \
     classview \
     tasklist \
-    analyzerbase \
     qmljstools \
     macros \
     remotelinux \
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 8129547efa..b86fe38a74 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -4,7 +4,6 @@ Project {
     name: "Plugins"
 
     references: [
-        "analyzerbase/analyzerbase.qbs",
         "android/android.qbs",
         "autotest/autotest.qbs",
         "autotoolsprojectmanager/autotoolsprojectmanager.qbs",
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 9b4a935912..af55fab4fd 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "Timeline" }
 
     Depends { name: "Core" }
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
index 401f0fa51f..e9a57c9045 100644
--- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
@@ -7,7 +7,7 @@ QTC_LIB_DEPENDS += \
     timeline \
     utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
+    debugger \
     coreplugin \
     projectexplorer \
     qtsupport \
diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
index f15d80249e..cb5b797075 100644
--- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp
@@ -29,7 +29,7 @@
 #include "qmlprofilertool.h"
 #include "qmlprofilertimelinemodel.h"
 
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
index aaffb012b7..27260698fe 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.cpp
@@ -28,7 +28,7 @@
 #include "qmlprofilerplugin.h"
 #include "qmlprofilerconstants.h"
 
-#include <analyzerbase/analyzerrunconfigwidget.h>
+#include <debugger/analyzer/analyzerrunconfigwidget.h>
 
 namespace QmlProfiler {
 namespace Internal {
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
index 6112c6df5b..4626072e96 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
@@ -28,8 +28,8 @@
 #include "localqmlprofilerrunner.h"
 #include "qmlprofilertool.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
index 18b9d3a0a7..a7d42d7c34 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h
@@ -28,7 +28,7 @@
 
 #include "qmlprofilerstatemanager.h"
 
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <utils/outputformat.h>
 
 namespace QmlProfiler {
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
index ae225bafe8..fa42f54db9 100644
--- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
@@ -28,10 +28,10 @@
 #include "qmlprofilerruncontrol.h"
 #include "qmlprofilerrunconfigurationaspect.h"
 
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
 
 #include <debugger/debuggerrunconfigurationaspect.h>
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
index 2bace1e346..12c5445129 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
+++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h
@@ -32,7 +32,7 @@
 #include "qmlprofilereventsview.h"
 
 #include <qmldebug/qmlprofilereventtypes.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <utils/itemviews.h>
 
 #include <QStandardItemModel>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index e8520a80e4..a36155ff57 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -37,9 +37,9 @@
 #include "qmlprofilersettings.h"
 #include "qmlprofilerplugin.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <utils/fancymainwindow.h>
 #include <utils/fileinprojectfinder.h>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index 2e807f7fac..26cda6237f 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -30,8 +30,8 @@
 #include "qmlprofilerconstants.h"
 #include "qmldebug/qmlprofilereventtypes.h"
 
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 
 QT_BEGIN_NAMESPACE
 class QMessageBox;
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 75f93ba247..38e3b2ad41 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -42,7 +42,7 @@
 
 #include <aggregation/aggregate.h>
 // Needed for the load&save actions in the context menu
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <coreplugin/findplaceholder.h>
 #include <utils/styledbar.h>
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
index 3571bfc3b7..129749274d 100644
--- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
@@ -35,7 +35,7 @@
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 #include <utils/fancymainwindow.h>
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <QDockWidget>
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 39e9b343f3..759c3b0d41 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "Utils" }
 
-    Depends { name: "AnalyzerBase" }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri
index 8e94a8dc69..fd104bd9f0 100644
--- a/src/plugins/qnx/qnx_dependencies.pri
+++ b/src/plugins/qnx/qnx_dependencies.pri
@@ -5,7 +5,6 @@ QTC_LIB_DEPENDS += \
     qmldebug \
     utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
     coreplugin \
     debugger \
     projectexplorer \
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index 58bb10462e..e25dcd5855 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -29,7 +29,7 @@
 #include "qnxrunconfiguration.h"
 #include "slog2inforunner.h"
 
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index d0fe071a73..429a3d6940 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -37,10 +37,10 @@
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 224c1cfde1..5678b8890b 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -8,7 +8,6 @@ QtcPlugin {
     Depends { name: "QmlDebug" }
     Depends { name: "Utils" }
 
-    Depends { name: "AnalyzerBase" }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
@@ -114,7 +113,7 @@ QtcPlugin {
     ]
 
     Export {
-        Depends { name: "AnalyzerBase" }
+        Depends { name: "Debugger" }
         Depends { name: "Core" }
         Depends { name: "QtcSsh" }
     }
diff --git a/src/plugins/remotelinux/remotelinux_dependencies.pri b/src/plugins/remotelinux/remotelinux_dependencies.pri
index f10e2a91ec..2e8344d418 100644
--- a/src/plugins/remotelinux/remotelinux_dependencies.pri
+++ b/src/plugins/remotelinux/remotelinux_dependencies.pri
@@ -8,5 +8,4 @@ QTC_PLUGIN_DEPENDS += \
     coreplugin \
     debugger \
     projectexplorer \
-    qtsupport \
-    analyzerbase
+    qtsupport
diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
index 7e145a39df..0e88bea873 100644
--- a/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.cpp
@@ -27,7 +27,7 @@
 
 #include "remotelinuxrunconfiguration.h"
 
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 0bd402aa92..10b9ee1b71 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -31,10 +31,10 @@
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxruncontrol.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/ianalyzertool.h>
 
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 88604c8e7f..db1c05df12 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -31,7 +31,7 @@
 #include <valgrind/callgrind/callgrindcontroller.h>
 #include <valgrind/callgrind/callgrindparser.h>
 
-#include <analyzerbase/analyzermanager.h>
+#include <debugger/analyzer/analyzermanager.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 202f664ba8..c9e4f10981 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -43,9 +43,9 @@
 #include <valgrind/valgrindplugin.h>
 #include <valgrind/valgrindsettings.h>
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
+#include <debugger/analyzer/analyzerconstants.h>
 
 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h
index a210bd66ad..0e7e97bda6 100644
--- a/src/plugins/valgrind/callgrindtool.h
+++ b/src/plugins/valgrind/callgrindtool.h
@@ -26,7 +26,7 @@
 #ifndef CALLGRINDTOOL_H
 #define CALLGRINDTOOL_H
 
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 
 namespace Valgrind {
 namespace Internal {
diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h
index 0b0f60072d..38f92fcf46 100644
--- a/src/plugins/valgrind/memcheckerrorview.h
+++ b/src/plugins/valgrind/memcheckerrorview.h
@@ -27,7 +27,7 @@
 #ifndef MEMCHECKERRORVIEW_H
 #define MEMCHECKERRORVIEW_H
 
-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 
 #include <QListView>
 
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 9a089aefda..e4092c3af6 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -30,9 +30,9 @@
 #include "valgrindsettings.h"
 #include "valgrindplugin.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerutils.h>
-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
+#include <debugger/analyzer/analyzerconstants.h>
 
 #include <valgrind/valgrindsettings.h>
 #include <valgrind/xmlprotocol/errorlistmodel.h>
diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h
index 68719f8e05..2dd1d07b4d 100644
--- a/src/plugins/valgrind/memchecktool.h
+++ b/src/plugins/valgrind/memchecktool.h
@@ -27,7 +27,7 @@
 #ifndef MEMCHECKTOOL_H
 #define MEMCHECKTOOL_H
 
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 
 #include <QSortFilterProxyModel>
 
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index b208bde9f3..de2d53b699 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "Utils" }
 
     Depends { name: "Core" }
-    Depends { name: "AnalyzerBase" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri
index ac93ce7ad0..d962e94d6a 100644
--- a/src/plugins/valgrind/valgrind_dependencies.pri
+++ b/src/plugins/valgrind/valgrind_dependencies.pri
@@ -5,7 +5,6 @@ QTC_LIB_DEPENDS += \
     ssh \
     utils
 QTC_PLUGIN_DEPENDS += \
-    analyzerbase \
     coreplugin \
     debugger \
     projectexplorer \
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 78da2c58df..12c2215c40 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -28,8 +28,8 @@
 #include "valgrindsettings.h"
 #include "valgrindplugin.h"
 
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerstartparameters.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/ioutputpane.h>
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index 029cc4b5c4..302f3a7bdb 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -27,7 +27,7 @@
 #ifndef VALGRINDENGINE_H
 #define VALGRINDENGINE_H
 
-#include <analyzerbase/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
 #include <utils/environment.h>
 #include <valgrind/valgrindrunner.h>
 #include <valgrind/valgrindsettings.h>
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index 678b24a090..b770385fc8 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -33,11 +33,11 @@
 #include "valgrindsettings.h"
 #include "valgrindconfigwidget.h"
 
-#include <analyzerbase/analyzericons.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerruncontrol.h>
-#include <analyzerbase/analyzerstartparameters.h>
-#include <analyzerbase/startremotedialog.h>
+#include <debugger/analyzer/analyzericons.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerruncontrol.h>
+#include <debugger/analyzer/analyzerstartparameters.h>
+#include <debugger/analyzer/startremotedialog.h>
 
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h
index cbf076c38e..f1fea5a79a 100644
--- a/src/plugins/valgrind/valgrindplugin.h
+++ b/src/plugins/valgrind/valgrindplugin.h
@@ -28,7 +28,7 @@
 #define VALGRINDPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
-#include <analyzerbase/ianalyzertool.h>
+#include <debugger/analyzer/ianalyzertool.h>
 #include <projectexplorer/projectexplorer.h>
 
 namespace Valgrind {
diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
index f0fe4f9d37..009ec6d63e 100644
--- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp
+++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
@@ -31,9 +31,9 @@
 #include "callgrindtool.h"
 #include "memchecktool.h"
 
-#include <analyzerbase/ianalyzertool.h>
-#include <analyzerbase/analyzermanager.h>
-#include <analyzerbase/analyzerrunconfigwidget.h>
+#include <debugger/analyzer/ianalyzertool.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerrunconfigwidget.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index 6870c4c088..637f436ad0 100644
--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -27,7 +27,7 @@
 #ifndef VALGRIND_RUNNER_H
 #define VALGRIND_RUNNER_H
 
-#include <analyzerbase/analyzerconstants.h>
+#include <debugger/analyzer/analyzerconstants.h>
 
 #include <projectexplorer/runnables.h>
 
diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
index 5f2f500183..c625a58920 100644
--- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
@@ -30,7 +30,7 @@
 #include "stack.h"
 #include "modelhelpers.h"
 
-#include <analyzerbase/diagnosticlocation.h>
+#include <debugger/analyzer/diagnosticlocation.h>
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>
diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
index 7b7cc189dd..9db79252b3 100644
--- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
@@ -27,7 +27,7 @@
 #ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H
 #define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H
 
-#include <analyzerbase/detailederrorview.h>
+#include <debugger/analyzer/detailederrorview.h>
 #include <utils/treemodel.h>
 
 #include <QSharedPointer>
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
index 2baf9b8c7f..7ae782956f 100644
--- a/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
@@ -2,7 +2,7 @@ import qbs
 
 QtcAutotest {
     Depends { name: "Qt.widgets" }
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
     Depends { name: "Utils" }
 
     property path pluginDir: project.ide_source_tree + "/src/plugins/clangstaticanalyzer"
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 095c0e6cc5..7e7760bd39 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -1,7 +1,7 @@
 import qbs
 
 QtcAutotest {
-    Depends { name: "AnalyzerBase" }
+    Depends { name: "Debugger" }
     Depends { name: "Core" }
     Depends { name: "QtcSsh" }
     Depends { name: "Utils" }