summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2016-01-12 12:51:33 +0100
committerMarco Bubke <marco.bubke@theqtcompany.com>2016-01-13 14:47:27 +0000
commitddd1d4c9ccddcad708bb33dcaa8198fee742af45 (patch)
tree03b582ff9043df0cd510e586bb2118805ea51ee8 /src
parent68bd9a881f731b0879961eaad06227f5642d0b5a (diff)
downloadqt-creator-ddd1d4c9ccddcad708bb33dcaa8198fee742af45.tar.gz
CppTools: Remove cpptools/cppprojects.[h|cpp]
Change-Id: Ida0e8552d371972c141cf561b28667f4428c6fff Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsproject.cpp2
-rw-r--r--src/plugins/clangcodemodel/clangbackendipcintegration.cpp1
-rw-r--r--src/plugins/clangcodemodel/clangbackendipcintegration.h2
-rw-r--r--src/plugins/clangcodemodel/clangcompletionassistprovider.cpp2
-rw-r--r--src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp2
-rw-r--r--src/plugins/clangcodemodel/clangmodelmanagersupport.cpp3
-rw-r--r--src/plugins/clangcodemodel/clangutils.cpp3
-rw-r--r--src/plugins/clangcodemodel/clangutils.h2
-rw-r--r--src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp1
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.cpp2
-rw-r--r--src/plugins/cppeditor/cppquickfix_test.h2
-rw-r--r--src/plugins/cppeditor/fileandtokenactions_test.cpp1
-rw-r--r--src/plugins/cpptools/baseeditordocumentparser.h2
-rw-r--r--src/plugins/cpptools/cppcodemodelinspectordumper.h3
-rw-r--r--src/plugins/cpptools/cppmodelmanager.h4
-rw-r--r--src/plugins/cpptools/cppmodelmanager_test.cpp1
-rw-r--r--src/plugins/cpptools/cppprojects.cpp50
-rw-r--r--src/plugins/cpptools/cppprojects.h61
-rw-r--r--src/plugins/cpptools/cpptools.pro2
-rw-r--r--src/plugins/cpptools/cpptools.qbs1
-rw-r--r--src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp2
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp1
-rw-r--r--src/plugins/cpptools/cpptoolstestcase.cpp1
-rw-r--r--src/plugins/cpptools/modelmanagertesthelper.cpp1
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp2
-rw-r--r--src/plugins/genericprojectmanager/genericprojectplugin_test.cpp1
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.cpp1
-rw-r--r--src/plugins/qbsprojectmanager/qbsproject.h2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeproject.cpp1
-rw-r--r--src/plugins/todo/cpptodoitemsscanner.cpp3
30 files changed, 37 insertions, 125 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index cac3b255ac..55cd93662b 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -51,6 +51,8 @@
#include <projectexplorer/headerpath.h>
#include <extensionsystem/pluginmanager.h>
#include <cpptools/cppmodelmanager.h>
+#include <cpptools/projectinfo.h>
+#include <cpptools/projectpartbuilder.h>
#include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <qtsupport/baseqtversion.h>
diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
index 81b39455e7..cf4a5e1bb7 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
@@ -42,6 +42,7 @@
#include <cpptools/baseeditordocumentprocessor.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/editordocumenthandle.h>
+#include <cpptools/projectinfo.h>
#include <texteditor/codeassist/functionhintproposal.h>
#include <texteditor/codeassist/iassistprocessor.h>
diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h
index 3d6a299c51..95c23ab28a 100644
--- a/src/plugins/clangcodemodel/clangbackendipcintegration.h
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h
@@ -31,7 +31,7 @@
#ifndef CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H
#define CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpart.h>
#include <clangbackendipc/connectionclient.h>
#include <clangbackendipc/filecontainer.h>
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprovider.cpp b/src/plugins/clangcodemodel/clangcompletionassistprovider.cpp
index d9e6b57771..e4d8c3b2ea 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprovider.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistprovider.cpp
@@ -36,7 +36,7 @@
#include <cplusplus/Token.h>
#include <cpptools/cppcompletionassistprocessor.h>
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpart.h>
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/iassistprocessor.h>
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 252dc9ed5d..db2e56871e 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -39,9 +39,9 @@
#include <diagnosticcontainer.h>
#include <sourcelocationcontainer.h>
+#include <cpptools/compileroptionsbuilder.h>
#include <cpptools/cppcodemodelsettings.h>
#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cppprojects.h>
#include <cpptools/cpptoolsbridge.h>
#include <cpptools/cpptoolsreuse.h>
#include <cpptools/cppworkingcopy.h>
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 4025f6b92a..b2caadaf9f 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -37,7 +37,10 @@
#include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/editordocumenthandle.h>
+#include <cpptools/projectinfo.h>
+
#include <texteditor/quickfix.h>
+
#include <projectexplorer/project.h>
#include <clangbackendipc/cmbregisterprojectsforeditormessage.h>
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 9975d09346..18c99d4caa 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -35,8 +35,9 @@
#include <coreplugin/icore.h>
#include <coreplugin/idocument.h>
#include <cpptools/baseeditordocumentparser.h>
+#include <cpptools/compileroptionsbuilder.h>
#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpart.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
diff --git a/src/plugins/clangcodemodel/clangutils.h b/src/plugins/clangcodemodel/clangutils.h
index 97d7414f96..77ad3abc81 100644
--- a/src/plugins/clangcodemodel/clangutils.h
+++ b/src/plugins/clangcodemodel/clangutils.h
@@ -31,7 +31,7 @@
#ifndef CPPTOOLS_CLANGUTILS_H
#define CPPTOOLS_CLANGUTILS_H
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpart.h>
namespace ClangCodeModel {
namespace Utils {
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 7301607cad..e1dd36ccbb 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -42,6 +42,7 @@
#include <cpptools/cpptoolsreuse.h>
#include <cpptools/cpptoolstestcase.h>
#include <cpptools/modelmanagertesthelper.h>
+#include <cpptools/projectinfo.h>
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/assistproposalitem.h>
#include <texteditor/codeassist/completionassistprovider.h>
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index ea60676f95..47efd0de58 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -57,6 +57,8 @@
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/uicodemodelsupport.h>
#include <cpptools/cppmodelmanager.h>
+#include <cpptools/projectinfo.h>
+#include <cpptools/projectpartbuilder.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/cppquickfix_test.h
index 24bf540836..0e2550d2f6 100644
--- a/src/plugins/cppeditor/cppquickfix_test.h
+++ b/src/plugins/cppeditor/cppquickfix_test.h
@@ -30,7 +30,7 @@
#include "cppeditortestcase.h"
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpartheaderpath.h>
#include <QByteArray>
#include <QList>
diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp
index 63ab5cc688..ce19290489 100644
--- a/src/plugins/cppeditor/fileandtokenactions_test.cpp
+++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp
@@ -40,6 +40,7 @@
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolsreuse.h>
#include <cpptools/cppworkingcopy.h>
+#include <cpptools/projectinfo.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <texteditor/textdocument.h>
diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h
index 4afa974346..169830e438 100644
--- a/src/plugins/cpptools/baseeditordocumentparser.h
+++ b/src/plugins/cpptools/baseeditordocumentparser.h
@@ -32,8 +32,8 @@
#define BASEEDITORDOCUMENTPARSER_H
#include "cpptools_global.h"
-#include "cppprojects.h"
#include "cppworkingcopy.h"
+#include "projectpart.h"
#include <QObject>
#include <QMutex>
diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.h b/src/plugins/cpptools/cppcodemodelinspectordumper.h
index 79b342a512..e18378bd03 100644
--- a/src/plugins/cpptools/cppcodemodelinspectordumper.h
+++ b/src/plugins/cpptools/cppcodemodelinspectordumper.h
@@ -33,7 +33,8 @@
#include "cpptools_global.h"
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectpart.h>
+#include <cpptools/projectinfo.h>
#include <cplusplus/CppDocument.h>
#include <QFile>
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 84bf1c869f..8f8d347edd 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -34,7 +34,8 @@
#include "cpptools_global.h"
#include "cppmodelmanagersupport.h"
-#include "cppprojects.h"
+#include "projectpart.h"
+#include "projectpartheaderpath.h"
#include <cplusplus/cppmodelmanagerbase.h>
@@ -60,6 +61,7 @@ class CppEditorDocumentHandle;
class CppIndexingSupport;
class SymbolFinder;
class WorkingCopy;
+class ProjectInfo;
namespace Internal {
class CppSourceProcessor;
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index e07b7b8c84..30fcd3663b 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -35,6 +35,7 @@
#include "cpptoolstestcase.h"
#include "editordocumenthandle.h"
#include "modelmanagertesthelper.h"
+#include "projectinfo.h"
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h>
diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp
deleted file mode 100644
index 8a8c176537..0000000000
--- a/src/plugins/cpptools/cppprojects.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://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 http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "cppprojects.h"
-
-#include <projectexplorer/headerpath.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/kitmanager.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-
-#include <utils/fileutils.h>
-#include <utils/qtcassert.h>
-
-#include <QDir>
-#include <QSet>
-#include <QTextStream>
-
-using namespace CppTools;
-using namespace ProjectExplorer;
-
diff --git a/src/plugins/cpptools/cppprojects.h b/src/plugins/cpptools/cppprojects.h
deleted file mode 100644
index 6801d3d378..0000000000
--- a/src/plugins/cpptools/cppprojects.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://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 http://www.qt.io/terms-conditions. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef CPPPROJECTPART_H
-#define CPPPROJECTPART_H
-
-#include "cpptools_global.h"
-
-#include "cppprojectfile.h"
-#include "projectpartbuilder.h"
-#include "projectinfo.h"
-#include "projectpart.h"
-#include "compileroptionsbuilder.h"
-
-#include <projectexplorer/toolchain.h>
-
-#include <cplusplus/Token.h>
-
-#include <QPointer>
-#include <QSet>
-
-#include <functional>
-
-namespace ProjectExplorer { class Project; }
-
-namespace Utils { class FileName; }
-
-namespace CppTools {
-
-
-
-} // namespace CppTools
-
-#endif // CPPPROJECTPART_H
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 5adfa2554f..a62ec16880 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -41,7 +41,6 @@ HEADERS += \
cppmodelmanagersupportinternal.h \
cpppointerdeclarationformatter.h \
cppprojectfile.h \
- cppprojects.h \
cppqtstyleindenter.h \
cpprefactoringchanges.h \
cppsemanticinfo.h \
@@ -115,7 +114,6 @@ SOURCES += \
cppmodelmanagersupportinternal.cpp \
cpppointerdeclarationformatter.cpp \
cppprojectfile.cpp \
- cppprojects.cpp \
cppqtstyleindenter.cpp \
cpprefactoringchanges.cpp \
cppsemanticinfo.cpp \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 86d1ce66bb..47f804afc4 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -64,7 +64,6 @@ QtcPlugin {
"cppmodelmanagersupportinternal.cpp", "cppmodelmanagersupportinternal.h",
"cpppointerdeclarationformatter.cpp", "cpppointerdeclarationformatter.h",
"cppprojectfile.cpp", "cppprojectfile.h",
- "cppprojects.cpp", "cppprojects.h",
"cppqtstyleindenter.cpp", "cppqtstyleindenter.h",
"cpprefactoringchanges.cpp", "cpprefactoringchanges.h",
"cppsemanticinfo.cpp", "cppsemanticinfo.h",
diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
index 9edfcfddf5..df79bd3160 100644
--- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
+++ b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.cpp
@@ -32,7 +32,7 @@
#include "baseeditordocumentparser.h"
#include "cppmodelmanager.h"
-#include "cppprojects.h"
+#include "projectpart.h"
#include "editordocumenthandle.h"
namespace CppTools {
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 6298f7a391..a0482a9cfa 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -46,6 +46,7 @@
#include "cpplocatordata.h"
#include "cppincludesfilter.h"
#include "cpptoolsbridge.h"
+#include "projectinfo.h"
#include "cpptoolsbridgeqtcreatorimplementation.h"
#include <coreplugin/actionmanager/actioncontainer.h>
diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 62cce7d854..1a0ef63803 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -35,6 +35,7 @@
#include "editordocumenthandle.h"
#include "cppmodelmanager.h"
#include "cppworkingcopy.h"
+#include "projectinfo.h"
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/project.h>
diff --git a/src/plugins/cpptools/modelmanagertesthelper.cpp b/src/plugins/cpptools/modelmanagertesthelper.cpp
index 2e50a6ffef..bd153ded55 100644
--- a/src/plugins/cpptools/modelmanagertesthelper.cpp
+++ b/src/plugins/cpptools/modelmanagertesthelper.cpp
@@ -32,6 +32,7 @@
#include "cpptoolstestcase.h"
#include "cppworkingcopy.h"
+#include "projectinfo.h"
#include <QtTest>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index b527b36f87..eee0f90881 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -39,6 +39,8 @@
#include <coreplugin/icore.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cppmodelmanager.h>
+#include <cpptools/projectinfo.h>
+#include <cpptools/projectpartbuilder.h>
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/abi.h>
#include <projectexplorer/buildsteplist.h>
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
index f6694fef78..ef50a1e5ef 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp
@@ -36,6 +36,7 @@
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolstestcase.h>
+#include <cpptools/projectinfo.h>
#include <QFileInfo>
#include <QTest>
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index e5ed08847f..d312c41a0b 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -47,6 +47,7 @@
#include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <cpptools/cppmodelmanager.h>
+#include <cpptools/projectpartbuilder.h>
#include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildtargetinfo.h>
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index 5380cc8861..a1054cd416 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -35,7 +35,7 @@
#include "qbsnodes.h"
-#include <cpptools/cppprojects.h>
+#include <cpptools/projectinfo.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 539e06794f..00740206e4 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -44,6 +44,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <cpptools/cppmodelmanager.h>
+#include <cpptools/projectinfo.h>
#include <cpptools/projectpartheaderpath.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <projectexplorer/buildmanager.h>
diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index 85612bd8b2..247a41a404 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -31,7 +31,10 @@
#include "cpptodoitemsscanner.h"
+#include <cpptools/projectinfo.h>
+
#include <projectexplorer/project.h>
+
#include <cplusplus/TranslationUnit.h>
#include <cctype>