qbs build: Improve some base items

Clean-up, simplification and modernization.
Also fix the bugs uncovered by this.

Change-Id: Ia3a77557f10faf9a901540a55fd6c07a2e986bf5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/coreplugin/actionmanager/actioncontainer.cpp

@@ -4,8 +4,8 @@
 #include "actioncontainer_p.h"
 #include "actionmanager.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
+#include "../coreconstants.h"
+#include "../icontext.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/actionmanager/actioncontainer_p.h

@@ -5,8 +5,8 @@
 
 #include "actionmanager_p.h"
 
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
+#include "actioncontainer.h"
+#include "command.h"
 
 #include <utils/touchbar/touchbar.h>
 

src/plugins/coreplugin/actionmanager/actionmanager.cpp

@@ -5,8 +5,7 @@
 #include "actionmanager_p.h"
 #include "actioncontainer_p.h"
 #include "command_p.h"
-
-#include <coreplugin/icore.h>
+#include "../icore.h"
 
 #include <utils/algorithm.h>
 #include <utils/fadingindicator.h>

src/plugins/coreplugin/actionmanager/actionmanager_p.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/icontext.h>
+#include "../icontext.h"
 
 #include <QMap>
 #include <QHash>

src/plugins/coreplugin/actionmanager/command.cpp

@@ -4,8 +4,8 @@
 #include "command.h"
 #include "command_p.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
+#include "../coreconstants.h"
+#include "../icontext.h"
 
 #include <utils/hostosinfo.h>
 #include <utils/stringutils.h>

src/plugins/coreplugin/actionmanager/command.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/hostosinfo.h>
 #include <utils/id.h>

src/plugins/coreplugin/actionmanager/command_p.h

@@ -5,7 +5,7 @@
 
 #include "command.h"
 
-#include <coreplugin/icontext.h>
+#include "../icontext.h"
 
 #include <utils/id.h>
 #include <utils/proxyaction.h>

src/plugins/coreplugin/actionmanager/commandbutton.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/actionmanager/commandmappings.cpp

@@ -3,8 +3,8 @@
 
 #include "commandmappings.h"
 
-#include <coreplugin/coreplugintr.h>
-#include <coreplugin/dialogs/shortcutsettings.h>
+#include "../coreplugintr.h"
+#include "../dialogs/shortcutsettings.h"
 
 #include <utils/fancylineedit.h>
 #include <utils/headerviewstretcher.h>

src/plugins/coreplugin/actionmanager/commandmappings.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <QWidget>
 

src/plugins/coreplugin/actionmanager/commandsfile.cpp

@@ -3,8 +3,8 @@
 
 #include "commandsfile.h"
 #include "command.h"
-#include <coreplugin/dialogs/shortcutsettings.h>
-#include <coreplugin/icore.h>
+#include "../dialogs/shortcutsettings.h"
+#include "../icore.h"
 
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>

src/plugins/coreplugin/actionsfilter.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/locator/ilocatorfilter.h>
+#include "locator/ilocatorfilter.h"
 
 #include <QAction>
 #include <QPointer>

src/plugins/coreplugin/basefilewizardfactory.h

@@ -5,8 +5,7 @@
 
 #include "core_global.h"
 #include "generatedfile.h"
-
-#include <coreplugin/iwizardfactory.h>
+#include "iwizardfactory.h"
 
 #include <utils/filepath.h>
 

src/plugins/coreplugin/coreplugin.cpp

@@ -14,14 +14,13 @@
 #include "session.h"
 #include "themechooser.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/documentmanager.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/find/findplugin.h>
-#include <coreplugin/find/searchresultwindow.h>
-#include <coreplugin/locator/locator.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/fileutils.h>
+#include "actionmanager/actionmanager.h"
+#include "documentmanager.h"
+#include "editormanager/editormanager.h"
+#include "find/findplugin.h"
+#include "locator/locator.h"
+#include "coreconstants.h"
+#include "fileutils.h"
 
 #include <extensionsystem/pluginerroroverview.h>
 #include <extensionsystem/pluginmanager.h>

src/plugins/coreplugin/designmode.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/imode.h>
+#include "imode.h"
 
 namespace Core {
 class IEditor;

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/aspects.h>
 #include <utils/id.h>

src/plugins/coreplugin/dialogs/readonlyfilesdialog.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/filepath.h>
 

src/plugins/coreplugin/dialogs/restartdialog.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <QCoreApplication>
 #include <QMessageBox>

src/plugins/coreplugin/dialogs/shortcutsettings.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <coreplugin/actionmanager/commandmappings.h>
-#include <coreplugin/dialogs/ioptionspage.h>
+#include "../actionmanager/commandmappings.h"
+#include "ioptionspage.h"
 
 #include <QGridLayout>
 #include <QKeySequence>

src/plugins/coreplugin/documentmanager.cpp

@@ -3,25 +3,24 @@
 
 #include "documentmanager.h"
 
+#include "actionmanager/actioncontainer.h"
+#include "actionmanager/actionmanager.h"
+#include "actionmanager/command.h"
 #include "coreconstants.h"
 #include "coreplugintr.h"
+#include "diffservice.h"
+#include "dialogs/filepropertiesdialog.h"
+#include "dialogs/readonlyfilesdialog.h"
+#include "dialogs/saveitemsdialog.h"
+#include "editormanager/editormanager.h"
+#include "editormanager/editormanager_p.h"
+#include "editormanager/editorview.h"
+#include "editormanager/ieditor.h"
+#include "editormanager/ieditorfactory.h"
 #include "icore.h"
 #include "idocument.h"
 #include "idocumentfactory.h"
-
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/diffservice.h>
-#include <coreplugin/dialogs/filepropertiesdialog.h>
-#include <coreplugin/dialogs/readonlyfilesdialog.h>
-#include <coreplugin/dialogs/saveitemsdialog.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/editormanager_p.h>
-#include <coreplugin/editormanager/editorview.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editormanager/ieditorfactory.h>
-#include <coreplugin/systemsettings.h>
+#include "systemsettings.h"
 
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/coreplugin/documentmanager.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "core_global.h"
 
 #include <utils/filepath.h>
 #include <utils/id.h>

src/plugins/coreplugin/editmode.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/imode.h>
+#include "imode.h"
 
 QT_BEGIN_NAMESPACE
 class QSplitter;

src/plugins/coreplugin/editormanager/editorarea.cpp

@@ -6,10 +6,11 @@
 #include "editormanager.h"
 #include "ieditor.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/idocument.h>
-#include <coreplugin/icore.h>
+#include "../coreconstants.h"
+#include "../icontext.h"
+#include "../icore.h"
+#include "../idocument.h"
+
 #include <utils/qtcassert.h>
 
 #include <QApplication>

src/plugins/coreplugin/editormanager/editormanager_p.h

@@ -10,7 +10,7 @@
 #include "ieditor.h"
 #include "ieditorfactory.h"
 
-#include <coreplugin/idocument.h>
+#include "../idocument.h"
 
 #include <QList>
 #include <QObject>

src/plugins/coreplugin/editormanager/editorview.cpp

@@ -7,14 +7,13 @@
 #include "editormanager_p.h"
 #include "documentmodel.h"
 #include "documentmodel_p.h"
+#include "../actionmanager/actionmanager.h"
+#include "../editormanager/ieditor.h"
+#include "../editortoolbar.h"
+#include "../findplaceholder.h"
+#include "../icore.h"
+#include "../minisplitter.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editortoolbar.h>
-#include <coreplugin/findplaceholder.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/locator/locatorconstants.h>
-#include <coreplugin/minisplitter.h>
 #include <utils/algorithm.h>
 #include <utils/infobar.h>
 #include <utils/qtcassert.h>

src/plugins/coreplugin/editormanager/editorwindow.cpp

@@ -5,13 +5,13 @@
 
 #include "editorarea.h"
 #include "editormanager_p.h"
+#include "../coreconstants.h"
+#include "../icontext.h"
+#include "../icore.h"
+#include "../locator/locatormanager.h"
+#include "../minisplitter.h"
 
 #include <aggregation/aggregate.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/locator/locatormanager.h>
-#include <coreplugin/minisplitter.h>
 #include <utils/qtcassert.h>
 
 #include <QStatusBar>

src/plugins/coreplugin/editormanager/ieditor.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
-#include <coreplugin/icontext.h>
+#include "../core_global.h"
+#include "../icontext.h"
 
 #include <QMetaType>
 

src/plugins/coreplugin/editormanager/ieditorfactory.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/editormanager/openeditorsview.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/inavigationwidgetfactory.h>
+#include "../inavigationwidgetfactory.h"
 
 namespace Core::Internal {
 

src/plugins/coreplugin/externaltool.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "core_global.h"
 
 #include <utils/environment.h>
 #include <utils/filepath.h>

src/plugins/coreplugin/find/findplugin.cpp

@@ -8,6 +8,7 @@
 #include "findtoolwindow.h"
 #include "ifindfilter.h"
 #include "searchresultwindow.h"
+#include "textfindconstants.h"
 #include "../actionmanager/actioncontainer.h"
 #include "../actionmanager/actionmanager.h"
 #include "../actionmanager/command.h"

src/plugins/coreplugin/find/findplugin.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "textfindconstants.h"
+#include "../core_global.h"
 
 #include <utils/filesearch.h>
 

src/plugins/coreplugin/find/findtoolbar.cpp

@@ -6,11 +6,11 @@
 #include "ifindfilter.h"
 #include "findplugin.h"
 #include "optionspopup.h"
+#include "textfindconstants.h"
 #include "../actionmanager/actioncontainer.h"
 #include "../actionmanager/actionmanager.h"
 #include "../actionmanager/command.h"
 #include "../coreicons.h"
-#include "../coreplugin.h"
 #include "../coreplugintr.h"
 #include "../findplaceholder.h"
 #include "../icontext.h"

src/plugins/coreplugin/find/highlightscrollbarcontroller.h

@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <QHash>
-#include <QPointer>
-#include <QVector>
-
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 #include <utils/theme/theme.h>
 
+#include <QHash>
+#include <QPointer>
+#include <QVector>
+
 QT_BEGIN_NAMESPACE
 class QAbstractScrollArea;
 class QScrollBar;

src/plugins/coreplugin/find/ifindfilter.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "textfindconstants.h"
+#include "../core_global.h"
 
 #include <utils/filesearch.h>
 

src/plugins/coreplugin/find/ifindsupport.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "textfindconstants.h"
+#include "../core_global.h"
 
 #include <utils/filesearch.h>
 

src/plugins/coreplugin/find/itemviewfind.cpp

@@ -3,8 +3,9 @@
 
 #include "itemviewfind.h"
 
+#include "../findplaceholder.h"
+
 #include <aggregation/aggregate.h>
-#include <coreplugin/findplaceholder.h>
 
 #include <QModelIndex>
 #include <QTextCursor>

src/plugins/coreplugin/find/optionspopup.cpp

@@ -3,7 +3,7 @@
 
 #include "optionspopup.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
+#include "../actionmanager/actionmanager.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/find/optionspopup.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/find/searchresultwindow.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/ioutputpane.h>
+#include "../ioutputpane.h"
 
 #include <utils/searchresultitem.h>
 

src/plugins/coreplugin/find/textfindconstants.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
-
 #include <QMetaType>
 #include <QFlags>
 #include <QTextDocument>

src/plugins/coreplugin/foldernavigationwidget.cpp

@@ -7,7 +7,6 @@
 #include "actionmanager/command.h"
 #include "coreicons.h"
 #include "coreplugintr.h"
-#include "diffservice.h"
 #include "documentmanager.h"
 #include "editormanager/editormanager.h"
 #include "editormanager/ieditor.h"
@@ -19,8 +18,6 @@
 
 #include <extensionsystem/pluginmanager.h>
 
-#include <texteditor/textdocument.h>
-
 #include <utils/algorithm.h>
 #include <utils/filecrumblabel.h>
 #include <utils/filepath.h>

src/plugins/coreplugin/generalsettings.cpp

@@ -1,15 +1,14 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "dialogs/restartdialog.h"
+#include "dialogs/ioptionspage.h"
 #include "generalsettings.h"
 #include "coreconstants.h"
 #include "coreplugintr.h"
 #include "icore.h"
 #include "themechooser.h"
 
-#include <coreplugin/dialogs/restartdialog.h>
-#include <coreplugin/dialogs/ioptionspage.h>
-
 #include <extensionsystem/pluginmanager.h>
 
 #include <utils/algorithm.h>

src/plugins/coreplugin/iwizardfactory.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
-#include <coreplugin/featureprovider.h>
+#include "core_global.h"
+#include "featureprovider.h"
 
 #include <QIcon>
 #include <QObject>

src/plugins/coreplugin/locator/commandlocator.cpp

@@ -3,7 +3,7 @@
 
 #include "commandlocator.h"
 
-#include <coreplugin/actionmanager/command.h>
+#include "../actionmanager/command.h"
 
 #include <utils/stringutils.h>
 

src/plugins/coreplugin/locator/directoryfilter.h

@@ -3,10 +3,9 @@
 
 #pragma once
 
+#include "../core_global.h"
 #include "ilocatorfilter.h"
 
-#include <coreplugin/core_global.h>
-
 namespace Core {
 
 class CORE_EXPORT DirectoryFilter : public ILocatorFilter

src/plugins/coreplugin/locator/ilocatorfilter.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <solutions/tasking/tasktree.h>
 

src/plugins/coreplugin/locator/javascriptfilter.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/locator/ilocatorfilter.h>
+#include "ilocatorfilter.h"
 
 class JavaScriptEngine;
 

src/plugins/coreplugin/locator/locator.h

@@ -4,15 +4,13 @@
 #pragma once
 
 #include "ilocatorfilter.h"
+#include "../actionmanager/command.h"
 
-#include <coreplugin/actionmanager/command.h>
 #include <extensionsystem/iplugin.h>
 
 #include <QObject>
 #include <QTimer>
 
-#include <functional>
-
 namespace Tasking { class TaskTree; }
 
 namespace Core {

src/plugins/coreplugin/locator/locator_test.cpp

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "../coreplugin.h"
-
+#include "../testdatadir.h"
 #include "locatorfiltertest.h"
 
-#include <coreplugin/testdatadir.h>
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 

src/plugins/coreplugin/locator/locatormanager.cpp

@@ -6,9 +6,9 @@
 #include "ilocatorfilter.h"
 #include "locator.h"
 #include "locatorwidget.h"
+#include "../icore.h"
 
 #include <aggregation/aggregate.h>
-#include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/locator/locatormanager.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <QObject>
 

src/plugins/coreplugin/locator/locatorsettingspage.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/dialogs/ioptionspage.h>
+#include "../dialogs/ioptionspage.h"
 
 namespace Core::Internal {
 

src/plugins/coreplugin/locator/opendocumentsfilter.cpp

@@ -4,8 +4,7 @@
 #include "opendocumentsfilter.h"
 
 #include "../coreplugintr.h"
-
-#include <coreplugin/editormanager/documentmodel.h>
+#include "../editormanager/documentmodel.h"
 
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/coreplugin/locator/urllocatorfilter.h

@@ -5,7 +5,7 @@
 
 #include "ilocatorfilter.h"
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <QDialog>
 

src/plugins/coreplugin/mimetypesettings.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/dialogs/ioptionspage.h>
+#include "dialogs/ioptionspage.h"
 
 namespace Core::Internal {
 

src/plugins/coreplugin/modemanager.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/navigationwidget.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/minisplitter.h>
+#include "minisplitter.h"
 
 #include <utils/id.h>
 #include <utils/store.h>

src/plugins/coreplugin/progressmanager/futureprogress.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/progressmanager/progressmanager.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <coreplugin/core_global.h>
+#include "../core_global.h"
 
 #include <utils/id.h>
 

src/plugins/coreplugin/progressmanager/progressmanager_win.cpp

@@ -1,6 +1,12 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "progressmanager_p.h"
+
+#include "../icore.h"
+
+#include <utils/utilsicons.h>
+
 #include <QGuiApplication>
 #include <QVariant>
 #include <QMainWindow>
@@ -12,11 +18,6 @@
 #include <QLabel>
 #include <qpa/qplatformnativeinterface.h>
 
-#include <coreplugin/icore.h>
-#include <utils/utilsicons.h>
-
-#include "progressmanager_p.h"
-
 // for windows progress bar
 #ifndef __GNUC__
 #    define CALLBACK WINAPI

src/plugins/coreplugin/rightpane.cpp

@@ -3,8 +3,7 @@
 
 #include "rightpane.h"
 
-#include <coreplugin/imode.h>
-#include <coreplugin/modemanager.h>
+#include "modemanager.h"
 
 #include <utils/qtcsettings.h>
 

src/plugins/coreplugin/session.cpp

@@ -17,8 +17,6 @@
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 
-#include <texteditor/texteditor.h>
-
 #include <utils/algorithm.h>
 #include <utils/filepath.h>
 #include <utils/macroexpander.h>

src/plugins/coreplugin/sessionmodel.cpp

@@ -3,11 +3,10 @@
 
 #include "sessionmodel.h"
 
+#include "actionmanager/actionmanager.h"
 #include "session.h"
 #include "sessiondialog.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/stringutils.h>

src/plugins/coreplugin/textdocument.cpp

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "textdocument.h"
-#include <coreplugin/editormanager/editormanager.h>
+
+#include "editormanager/editormanager.h"
 
 #include <QDebug>
 #include <QTextCodec>

src/plugins/coreplugin/themechooser.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <utils/id.h>
+#include "dialogs/ioptionspage.h"
 
-#include <coreplugin/dialogs/ioptionspage.h>
+#include <utils/id.h>
 
 #include <QWidget>
 

src/plugins/coreplugin/vcsmanager.cpp

@@ -18,8 +18,6 @@
 #include <utils/infobar.h>
 #include <utils/qtcassert.h>
 
-#include <vcsbase/vcsbaseconstants.h>
-
 #include <QList>
 #include <QMap>
 #include <QMessageBox>