Change style of #includes of Qt headers

By using q<lowercase>.h headers, we become more bootstrap-friendly, as no
full syncqt is required any more.

In the same go, prefix all includes with the module name. This helps
grep-based analysis of which parts of Qt are used and where. It's also
consistent with Qt's public headers (where syncqt enforces the style).

Testdata and examples are excluded from the change, as they are not
relevant for bootstrapping.

Change-Id: I9539b1d795e87fca6e5fc6c91acbb775b79208d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

34 files changed, 68 insertions, 68 deletions

diff --git a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp
index 6d8b8a5ed..a3407cb09 100644
--- a/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp
+++ b/src/lib/corelib/generators/clangcompilationdb/clangcompilationdbgenerator.cpp
@@ -46,11 +46,11 @@
 #include <tools/installoptions.h>
 #include <tools/shellutils.h>
 
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qjsonarray.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qjsonobject.h>
 
 namespace qbs {
 using namespace Internal;
diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index e167d7820..6459eb1c7 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -42,7 +42,7 @@
 #include <tools/hostosinfo.h>
 #include <tools/installoptions.h>
 #include <tools/qbsassert.h>
-#include <QCoreApplication>
+#include <QtCore/qcoreapplication.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/generator.h b/src/lib/corelib/generators/generator.h
index 366627800..5e62f27aa 100644
--- a/src/lib/corelib/generators/generator.h
+++ b/src/lib/corelib/generators/generator.h
@@ -42,8 +42,8 @@
 #define GENERATORPLUGIN_H
 
 #include "generatordata.h"
-#include <QList>
-#include <QString>
+#include <QtCore/qlist.h>
+#include <QtCore/qstring.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/generatordata.cpp b/src/lib/corelib/generators/generatordata.cpp
index 27341d19e..47178bca3 100644
--- a/src/lib/corelib/generators/generatordata.cpp
+++ b/src/lib/corelib/generators/generatordata.cpp
@@ -40,7 +40,7 @@
 #include "generatordata.h"
 #include <tools/error.h>
 
-#include <QDir>
+#include <QtCore/qdir.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h
index b60e84b0e..1a1371cb3 100644
--- a/src/lib/corelib/generators/generatordata.h
+++ b/src/lib/corelib/generators/generatordata.h
@@ -40,8 +40,8 @@
 #ifndef GENERATORDATA_H
 #define GENERATORDATA_H
 
-#include <QDir>
-#include <QMap>
+#include <QtCore/qdir.h>
+#include <QtCore/qmap.h>
 #include <api/project.h>
 #include <api/projectdata.h>
 
diff --git a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp
index 0ca7c16ed..f912f3a19 100644
--- a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp
+++ b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.cpp
@@ -41,7 +41,7 @@
 #include "../msbuild/msbuildproperty.h"
 #include "../msbuild/msbuildpropertygroup.h"
 
-#include <QXmlStreamWriter>
+#include <QtCore/qxmlstream.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h
index f2a9a9913..c70889971 100644
--- a/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h
+++ b/src/lib/corelib/generators/visualstudio/io/msbuildprojectwriter.h
@@ -31,7 +31,7 @@
 #ifndef MSBUILDPROJECTWRITER_H
 #define MSBUILDPROJECTWRITER_H
 
-#include <QIODevice>
+#include <QtCore/qiodevice.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
index 4e786aa55..0621fe97c 100644
--- a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
+++ b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.cpp
@@ -39,12 +39,12 @@
 #include <tools/pathutils.h>
 #include <tools/visualstudioversioninfo.h>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QUuid>
-#include <QVector>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/quuid.h>
+#include <QtCore/qvector.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h
index 2f3c02085..d5b0107f0 100644
--- a/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h
+++ b/src/lib/corelib/generators/visualstudio/io/visualstudiosolutionwriter.h
@@ -31,8 +31,8 @@
 #ifndef VISUALSTUDIOSOLUTIONWRITER_H
 #define VISUALSTUDIOSOLUTIONWRITER_H
 
-#include <QIODevice>
-#include <QScopedPointer>
+#include <QtCore/qiodevice.h>
+#include <QtCore/qscopedpointer.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h
index 561cd9403..4d2436e52 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h
+++ b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildgroup.h
@@ -31,8 +31,8 @@
 #ifndef IMSBUILDGROUP_H
 #define IMSBUILDGROUP_H
 
-#include <QObject>
-#include <QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h
index 512bedf36..a1a7676e6 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h
+++ b/src/lib/corelib/generators/visualstudio/msbuild/imsbuildproperty.h
@@ -31,9 +31,9 @@
 #ifndef IMSBUILDPROPERTY_H
 #define IMSBUILDPROPERTY_H
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QVariant>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qvariant.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp b/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp
index 0885f710c..3a5d98a98 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuild/items/msbuildfilter.cpp
@@ -31,7 +31,7 @@
 #include "msbuildfilter.h"
 #include "../msbuilditemmetadata.h"
 #include <tools/hostosinfo.h>
-#include <QUuid>
+#include <QtCore/quuid.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h
index 4f86761b0..352616e1b 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h
+++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuildimport.h
@@ -30,7 +30,7 @@
 #ifndef MSBUILDIMPORT_H
 #define MSBUILDIMPORT_H
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
 namespace qbs {
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h
index 1314c15ac..ca411c715 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h
+++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuilditem.h
@@ -31,7 +31,7 @@
 #ifndef MSBUILDITEM_H
 #define MSBUILDITEM_H
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
 namespace qbs {
diff --git a/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h b/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h
index 23b5a682c..fc1a0f1f4 100644
--- a/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h
+++ b/src/lib/corelib/generators/visualstudio/msbuild/msbuildproject.h
@@ -31,7 +31,7 @@
 #ifndef MSBUILDPROJECT_H
 #define MSBUILDPROJECT_H
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include "imsbuildnode.h"
 
 namespace qbs {
diff --git a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
index 1eceb004b..22bc72841 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildfiltersproject.cpp
@@ -37,8 +37,8 @@
 #include "msbuild/items/msbuildfilter.h"
 #include "msbuild/items/msbuildnone.h"
 
-#include <QFileInfo>
-#include <QVector>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qvector.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp
index bdbb0fe73..51c72ecd3 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildqbsgenerateproject.cpp
@@ -36,7 +36,7 @@
 
 #include <tools/hostosinfo.h>
 #include <tools/shellutils.h>
-#include <QUuid>
+#include <QtCore/quuid.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
index d51534159..f65dd8994 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildqbsproductproject.cpp
@@ -50,8 +50,8 @@
 #include <tools/shellutils.h>
 #include <tools/version.h>
 
-#include <QDir>
-#include <QUuid>
+#include <QtCore/qdir.h>
+#include <QtCore/quuid.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
index cbf0d430d..bf7c4fcbf 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
@@ -35,7 +35,7 @@
 #include <tools/pathutils.h>
 #include <tools/shellutils.h>
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp
index 5cc1eb633..49d463ef0 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.cpp
@@ -34,7 +34,7 @@
 
 #include <tools/pathutils.h>
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h
index 6e70ed464..fcbe9f114 100644
--- a/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h
+++ b/src/lib/corelib/generators/visualstudio/msbuildsolutionpropertiesproject.h
@@ -36,7 +36,7 @@
 #include <generators/generatordata.h>
 #include <tools/visualstudioversioninfo.h>
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h b/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h
index c7089e955..17de66e73 100644
--- a/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h
+++ b/src/lib/corelib/generators/visualstudio/solution/ivisualstudiosolutionproject.h
@@ -31,10 +31,10 @@
 #ifndef IVISUALSTUDIOSOLUTIONPROJECT_H
 #define IVISUALSTUDIOSOLUTIONPROJECT_H
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QString>
-#include <QUuid>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstring.h>
+#include <QtCore/quuid.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp
index db2946ed9..a6d572425 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.cpp
@@ -35,7 +35,7 @@
 
 #include <tools/visualstudioversioninfo.h>
 
-#include <QMap>
+#include <QtCore/qmap.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h
index 7769a9d11..16f06f9e9 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolution.h
@@ -31,8 +31,8 @@
 #ifndef VISUALSTUDIOSOLUTION_H
 #define VISUALSTUDIOSOLUTION_H
 
-#include <QObject>
-#include <QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp
index 3be759542..d66f47cf7 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.cpp
@@ -30,7 +30,7 @@
 
 #include "visualstudiosolutionfileproject.h"
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h
index b0dc63eed..fafafa494 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfileproject.h
@@ -31,7 +31,7 @@
 #ifndef VISUALSTUDIOSOLUTIONFILEPROJECT_H
 #define VISUALSTUDIOSOLUTIONFILEPROJECT_H
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include "ivisualstudiosolutionproject.h"
 
 namespace qbs {
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp
index 1ad2dd9b1..d59d1e1ed 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.cpp
@@ -30,7 +30,7 @@
 
 #include "visualstudiosolutionfolderproject.h"
 
-#include <QFileInfo>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h
index 967e5f4dd..a7fd180cc 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionfolderproject.h
@@ -31,7 +31,7 @@
 #ifndef VISUALSTUDIOSOLUTIONFOLDERPROJECT_H
 #define VISUALSTUDIOSOLUTIONFOLDERPROJECT_H
 
-#include <QObject>
+#include <QtCore/qobject.h>
 #include "ivisualstudiosolutionproject.h"
 
 namespace qbs {
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
index 4fc4d07f8..117eadc82 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 
 #include "visualstudiosolutionglobalsection.h"
-#include <QPair>
-#include <QVector>
+#include <QtCore/qpair.h>
+#include <QtCore/qvector.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
index 8795253d1..9c0bf950c 100644
--- a/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
+++ b/src/lib/corelib/generators/visualstudio/solution/visualstudiosolutionglobalsection.h
@@ -31,8 +31,8 @@
 #ifndef VISUALSTUDIOSOLUTIONGLOBALSECTION_H
 #define VISUALSTUDIOSOLUTIONGLOBALSECTION_H
 
-#include <QObject>
-#include <QScopedPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
index dd2f66e05..eb49c9c5b 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
+++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.cpp
@@ -55,11 +55,11 @@
 #include <tools/shellutils.h>
 #include <tools/visualstudioversioninfo.h>
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfileinfo.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
index 1dc13db04..43c6709a7 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
+++ b/src/lib/corelib/generators/visualstudio/visualstudiogenerator.h
@@ -36,9 +36,9 @@
 #include <tools/visualstudioversioninfo.h>
 #include "visualstudioguidpool.h"
 
-#include <QFileInfo>
-#include <QDir>
-#include <QMap>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qmap.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp
index 40e61010b..543d64063 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp
+++ b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.cpp
@@ -30,10 +30,10 @@
 
 #include "visualstudioguidpool.h"
 #include <tools/filesaver.h>
-#include <QFile>
-#include <QJsonDocument>
-#include <QMap>
-#include <QVariant>
+#include <QtCore/qfile.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qvariant.h>
 
 namespace qbs {
 
diff --git a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h
index d5e46790a..a21bb1f94 100644
--- a/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h
+++ b/src/lib/corelib/generators/visualstudio/visualstudioguidpool.h
@@ -31,9 +31,9 @@
 #ifndef VISUALSTUDIOGUIDPOOL_H
 #define VISUALSTUDIOGUIDPOOL_H
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QUuid>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/quuid.h>
 
 namespace qbs {