diff --git a/src/plugins/analyzerbase/AnalyzerBase.json.in b/src/plugins/analyzerbase/AnalyzerBase.json.in
deleted file mode 100644
index ef169a709be28280d4ed3823f714fe7602d8ed7b..0000000000000000000000000000000000000000
--- 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 923f59d398f628129d7066a05784ef899d445c5c..0000000000000000000000000000000000000000
--- 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 50544dc3f824eda7d9e170c594648b816701bf76..0000000000000000000000000000000000000000
--- 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 10c5c8b6dfb229cbb64781afc1781a511f4383c5..0000000000000000000000000000000000000000
--- 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 cb4d7d1c97ee914a03f2b2533bc2b433b49a2dd4..0000000000000000000000000000000000000000
--- 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 af84928c90e9f80b1b1a1b5dd51959faf3d53d73..0000000000000000000000000000000000000000
--- 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 caabb1d1bbf5bd2753532f2b7c6d167e90e05657..4251bd023b8cb059f54e737b6932ec137903f0b9 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 fad0a885abe735f3b28de1789070305b6e6a2892..f471fb4fe9133cfe80074fc34c22e4d6f04fb7e2 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 cbdda00e212eb1562c05cc0cbdc410103070316b..0beade12e4543a8751acfcf341c3b3154955e470 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 8f508fbdec92c8313d42495e40b0bfc5ce32b428..0221fab3ad44782e070dc6950f6d389b2f897ca4 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 ea9cedcd9d1166431d5e794e190ee2a75ee24ed5..4c446f5c63be814011e888ebc583c8968466fe14 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 b0993923732bba98a493380a4e594128552a0e1d..f907aefc61662283eff28226c4171e3ff62fad48 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 6da02dfaa974d4d18b7ff65b8c817077ed52e8fe..ecb5e8e94e48a3bd3cfec7daa04c8f0d724e0b23 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 9c93fb9f7791905ea5f64fe31d309bc2bf1962a1..437e83ce4029ce9e4ff696303cd6629e55932663 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 392294fd86135db33fd34d3211e1c96c50d5a1d2..0d5016fd7c48f3f5c0257064666f34ab0c1df7aa 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 2822e0e6a177aa40659caf5206534089fc65262c..b11727890dcf980d056ceeee2580e25477c1f403 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 061c9c71c56adc4c8b816aa6a1294825750f949d..5d4c1e3194d70b72d75a5a55a21d1085d4e94398 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 b74bfb3032106c58d710a5bb71b62cf7dac94c9f..84ad1ae9fcec41e007eb653b03b28d2d13ed10d6 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 b89ea1cee55c826a8d7d828d4d972a4c8d94c1c9..a179e2fa1fe3a561c2438cb869913a4af9b382d9 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 b1a3a1e9fbeb01f67b77a47e99b9d0f1d1f53d6b..e72f4c7cf6b9ec8acf1b6c532a6476a223d8eb96 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 5c5928101439e75539d5621537d3281eece3a395..5f41c43a9dbe91fa0e52c3abcadb3578b7bb8897 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 12acb811a629bd5d2c854b1ccd168981e9e405d3..1c91d723aa2d2d567f1b7dbb5d50881767e02acc 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 0000000000000000000000000000000000000000..cb38aa4555e61345e04ca046d92530d764222f16
--- /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
similarity index 100%
rename from src/plugins/analyzerbase/analyzerbase.qrc
rename to src/plugins/debugger/analyzer/analyzerbase.qrc
diff --git a/src/plugins/analyzerbase/analyzerbase_global.h b/src/plugins/debugger/analyzer/analyzerbase_global.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerbase_global.h
rename to src/plugins/debugger/analyzer/analyzerbase_global.h
diff --git a/src/plugins/analyzerbase/analyzerconstants.h b/src/plugins/debugger/analyzer/analyzerconstants.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerconstants.h
rename to src/plugins/debugger/analyzer/analyzerconstants.h
diff --git a/src/plugins/analyzerbase/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzericons.h
rename to src/plugins/debugger/analyzer/analyzericons.h
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/debugger/analyzer/analyzermanager.cpp
similarity index 97%
rename from src/plugins/analyzerbase/analyzermanager.cpp
rename to src/plugins/debugger/analyzer/analyzermanager.cpp
index c5e8fb2b2f2357bfee97a28d25f6d9323fcc3e8b..e389af3d75b287bdd1c27306e6f6118d43a12c00 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
similarity index 100%
rename from src/plugins/analyzerbase/analyzermanager.h
rename to src/plugins/debugger/analyzer/analyzermanager.h
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
rename to src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerrunconfigwidget.h
rename to src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/debugger/analyzer/analyzerruncontrol.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerruncontrol.cpp
rename to src/plugins/debugger/analyzer/analyzerruncontrol.cpp
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerruncontrol.h
rename to src/plugins/debugger/analyzer/analyzerruncontrol.h
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/debugger/analyzer/analyzerstartparameters.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerstartparameters.h
rename to src/plugins/debugger/analyzer/analyzerstartparameters.h
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/debugger/analyzer/analyzerutils.cpp
similarity index 100%
rename from src/plugins/analyzerbase/analyzerutils.cpp
rename to src/plugins/debugger/analyzer/analyzerutils.cpp
diff --git a/src/plugins/analyzerbase/analyzerutils.h b/src/plugins/debugger/analyzer/analyzerutils.h
similarity index 100%
rename from src/plugins/analyzerbase/analyzerutils.h
rename to src/plugins/debugger/analyzer/analyzerutils.h
diff --git a/src/plugins/analyzerbase/detailederrorview.cpp b/src/plugins/debugger/analyzer/detailederrorview.cpp
similarity index 100%
rename from src/plugins/analyzerbase/detailederrorview.cpp
rename to src/plugins/debugger/analyzer/detailederrorview.cpp
diff --git a/src/plugins/analyzerbase/detailederrorview.h b/src/plugins/debugger/analyzer/detailederrorview.h
similarity index 100%
rename from src/plugins/analyzerbase/detailederrorview.h
rename to src/plugins/debugger/analyzer/detailederrorview.h
diff --git a/src/plugins/analyzerbase/diagnosticlocation.cpp b/src/plugins/debugger/analyzer/diagnosticlocation.cpp
similarity index 100%
rename from src/plugins/analyzerbase/diagnosticlocation.cpp
rename to src/plugins/debugger/analyzer/diagnosticlocation.cpp
diff --git a/src/plugins/analyzerbase/diagnosticlocation.h b/src/plugins/debugger/analyzer/diagnosticlocation.h
similarity index 100%
rename from src/plugins/analyzerbase/diagnosticlocation.h
rename to src/plugins/debugger/analyzer/diagnosticlocation.h
diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/debugger/analyzer/ianalyzertool.cpp
similarity index 100%
rename from src/plugins/analyzerbase/ianalyzertool.cpp
rename to src/plugins/debugger/analyzer/ianalyzertool.cpp
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/debugger/analyzer/ianalyzertool.h
similarity index 100%
rename from src/plugins/analyzerbase/ianalyzertool.h
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_category.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_overlay_small.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/analyzer_overlay_small@2x.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze@2x.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze_mask.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/images/mode_analyze_mask@2x.png
rename to 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
similarity index 100%
rename from src/plugins/analyzerbase/startremotedialog.cpp
rename to src/plugins/debugger/analyzer/startremotedialog.cpp
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/debugger/analyzer/startremotedialog.h
similarity index 100%
rename from src/plugins/analyzerbase/startremotedialog.h
rename to src/plugins/debugger/analyzer/startremotedialog.h
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index a82da0787c1130939d55185c22cb8b4ffc3bb1db..8b9fb0dc06e8c05875c296188673b0a6980e95a4 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 e97290c8cb2a48c434d8c2eb00572c0ec90a05dc..a74db388beff0e6e426cb5de2141e6eda5928a18 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -195,6 +195,12 @@ QtcPlugin {
         files: ["*.png"]
     }
 
+    Group {
+        name: "Images/analyzer"
+        prefix: "analyzer/images/"
+        files: ["*.png"]
+    }
+
     Group {
         name: "RegistryAccess"
         condition: qbs.targetOS.contains("windows")
@@ -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 f58b3782a295df471d34d839e56a26025e1586a1..28d0950ea8076e02082ce107be1e99cba35b1323 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 95b1a184dfe8ce4675dde6ae90a9ff62fc3cade6..32ef71d1c614613655a7d973fb3f481095f2e709 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 c9e491c3de020acbe2bfe26189c1fccdb27d46cf..0eb70f2f1043e8a02092b8f8ab7ad2c82774180a 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 c41bb270476ca9c2049c6a4247f122a62bd7a4c4..04ec7b6af0f3cfc79439c0ce8d010a312665701b 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 fca1c6c8c725c6642da4447d9ec3a3837f69bbdc..c40fddf7daea9e3692218d09594abebaebe91022 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 17b8393174ea57ae5cf2c602c4ded4edf2f8aaec..bd5a0dbf5637fd1dd751b80bfd3c75aedca2200a 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 569553cb4d963c1b20d2bbab8a58bcdf69353eef..c087ff2669bc20fe12f6efb1c1b323496b56efa2 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 8129547efac91beea21dd529c69f5db2a26db9ad..b86fe38a74a9b3bdefca2d1e7448563c3f3b6314 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 9b4a9359129f535569ea1dc6bfa3e0acaa6af4ac..af55fab4fdf885a8be776b1b671e43940f84c548 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 401f0fa51f3c4507397bea60a2045fee5e0d5f1b..e9a57c90458b62ab882ab3ea155e4ebfa7eb1b1f 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 f15d80249ec7eae1bdd26635e1c387d061955ec3..cb5b797075d3821b10d45e2dd2e032568258a6fd 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 aaffb012b723c7ed8edb377ea9890d7edc3755ad..27260698fe2d5d58bff33055ba9cedfda9e36c80 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 6112c6df5bd0c73e2de0b74d6532ef103cdfd31e..4626072e9673305b9beff60a7c4542b1947ec889 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 18b9d3a0a703c782176adf6cfcef696432493fd0..a7d42d7c34bed92a60986e015a8479fd4481dad7 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 ae225bafe80215f6ca9192dcd4788667d43f4dbf..fa42f54db913eea11869e617e26eff82d445070d 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 2bace1e3461438e21da7e10944f998d3e774d613..12c5445129c6a4e43c19c31648513cfe18bf4bcf 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 e8520a80e4fe52106f08fc638998cc5761300e8e..a36155ff570348f46d865d827f915d2158767593 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 2e807f7fac493ed672adb8c87b15930e6787b50a..26cda6237f389fab112b44f34886cd0a24a19abd 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 75f93ba2478c2518ed9d5bb1af8820f160543ac5..38e3b2ad41b82134eab46284ea35c11192608145 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 3571bfc3b78f4fd5d5cded565621d5df54f09eee..129749274deecf13251012742ea99af7a2de7401 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 39e9b343f3f9fd132f766766540d37e8aa4306cf..759c3b0d41a81deeb0e99eb354ccef55eee6ec44 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 8e94a8dc69d28446937a61fe090cc873efdddb79..fd104bd9f08b8e97bd7df5904c930cb8f0e87e15 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 58bb10462e6646ebd94d4528758636f4a5a9fadc..e25dcd58550d57d44a06d60db78ab3359a0cc1e7 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 d0fe071a737748b4d4b68bc58b89fd13d0879b87..429a3d694078258ea189bc5514e5a79950583efd 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 224c1cfde1f534781e53d612b32c466ca3912bad..5678b8890b7110295a8048568218ad05a0e8a9d3 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 f10e2a91ec13823d734ceedbbba2d4bd960343b1..2e8344d418e8174df44b448d3a83b9b8488b4076 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 7e145a39dfa8dc3b71545c04af4049349a364cb7..0e88bea8736944bb9fe275d3b302a142d4cb3b6e 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 0bd402aa922c981ed13e6a7c426cc734fc77c38c..10b9ee1b71ce555ba31b4aadb5c9f149ee6b9a83 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 88604c8e7fe09ab707dd26fa410c1416b9af8d2f..db1c05df12bde6663d061fb96143240ba2ba15ad 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 202f664ba89ebdbca501dbfe866cc9b213afdfad..c9e4f109811393d120d0294a71ecc1a114fe64a0 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 a210bd66ad4d1a2973c64ba655cbc0269a466a28..0e7e97bda6637185c144586421cd49182571a094 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 0b0f60072d7fd7c14d1c41191e9edaaf30ccffab..38f92fcf46f65b29b7c6f01d209ddf0de99ef392 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 9a089aefdaa83d5e4fc85727f415c263ec7f6b10..e4092c3af627feea5c2efe66d723d79ab31db25a 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 68719f8e05f1c09914788d05c3f718f2e29014a3..2dd1d07b4d9044f32c26860a6b586c3d871fa7d9 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 b208bde9f3ad145d9848b9cec4300c70414e4c5a..de2d53b6998ff3d526010c5ec9ebe1c791d75b56 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 ac93ce7ad0b44eed4d463310974309888f1ea1f3..d962e94d6a39cf9179f00d1dfc25588435c51f0b 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 78da2c58df4e8d203537c7f28b545720271c02e6..12c2215c4075c3a81e2f8fe9c3cc1ba601a57c71 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 029cc4b5c4fe0e1f30e9097632a145867d283b32..302f3a7bdb4699a6222a7f282e2571bbe697cb9b 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 678b24a0906d6e5da41265ff36c0077f5265b069..b770385fc8dc58815c11b67ab89cf2c7212d4c52 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 cbf076c38ed41a2bce7a3526d4e2520951ef309f..f1fea5a79a9376630cdb7f1dc1f99bf09622d8e9 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 f0fe4f9d372d33a731fa9d584d6c8208d0611220..009ec6d63e67ee4fe99fc676835c5438c20c8b41 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 6870c4c08823c9eabca77e16dae426c08f930370..637f436ad09a643b07fda9346d6e23900d359252 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 5f2f5001836e7410bb40bcee1d2d17328173d269..c625a58920a4930633de4b0e4ba6570ad6524889 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 7b7cc189ddee54cdcefa2e936af511afafdf0697..9db79252b3cfdc015001edde7260cee37b3552f4 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 2baf9b8c7fd95ff6a96467925014582938ab418f..7ae782956fa6b75a35d50e030211674e8e75daea 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 095c0e6cc5965a0851d628c7d9a9f8b114b5babd..7e7760bd39674fe2880e8d4c1acb06edac06d4c8 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" }