Make sure all private headers include at least one other

See script in qtbase/util/includeprivate for the rules.

Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.

Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

57 files changed, 92 insertions, 72 deletions

diff --git a/src/animation/animationlogging_p.h b/src/animation/animationlogging_p.h
index 73e36800b..7531d689f 100644
--- a/src/animation/animationlogging_p.h
+++ b/src/animation/animationlogging_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/backend/bezierevaluator_p.h b/src/animation/backend/bezierevaluator_p.h
index 5291405b3..1f26d7b9b 100644
--- a/src/animation/backend/bezierevaluator_p.h
+++ b/src/animation/backend/bezierevaluator_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/backend/clipblendnodevisitor_p.h b/src/animation/backend/clipblendnodevisitor_p.h
index c7284112d..4c4381e1d 100644
--- a/src/animation/backend/clipblendnodevisitor_p.h
+++ b/src/animation/backend/clipblendnodevisitor_p.h
@@ -54,6 +54,7 @@
 
 #include <functional>
 #include <Qt3DCore/qnodeid.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/backend/functionrangefinder_p.h b/src/animation/backend/functionrangefinder_p.h
index 3648b9ab0..24369ab96 100644
--- a/src/animation/backend/functionrangefinder_p.h
+++ b/src/animation/backend/functionrangefinder_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DANIMATION_ANIMATION_FUNCTIONRANGEFINDER_P_H
 #define QT3DANIMATION_ANIMATION_FUNCTIONRANGEFINDER_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QtCore/qlist.h>
+#include <private/qglobal_p.h>
 
 #include <cmath>
 #include <cstdlib>
diff --git a/src/animation/backend/keyframe_p.h b/src/animation/backend/keyframe_p.h
index cf6694651..0b0159189 100644
--- a/src/animation/backend/keyframe_p.h
+++ b/src/animation/backend/keyframe_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DAnimation/qkeyframe.h>
 #include <QtGui/qvector2d.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/backend/nodefunctor_p.h b/src/animation/backend/nodefunctor_p.h
index 47552b613..6f5ef607e 100644
--- a/src/animation/backend/nodefunctor_p.h
+++ b/src/animation/backend/nodefunctor_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DANIMATION_ANIMATION_NODEFUNCTOR_P_H
 #define QT3DANIMATION_ANIMATION_NODEFUNCTOR_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qbackendnode.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/animation/qt3danimation_global_p.h b/src/animation/qt3danimation_global_p.h
index ce1b99b9c..00884c961 100644
--- a/src/animation/qt3danimation_global_p.h
+++ b/src/animation/qt3danimation_global_p.h
@@ -52,6 +52,7 @@
 //
 
 #include "qt3danimation_global.h"
+#include <private/qglobal_p.h>
 
 #define Q_3DANIMATIONSHARED_PRIVATE_EXPORT Q_3DANIMATIONSHARED_EXPORT
 
diff --git a/src/core/corelogging_p.h b/src/core/corelogging_p.h
index 5ddd6ea73..a10c59f32 100644
--- a/src/core/corelogging_p.h
+++ b/src/core/corelogging_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_CORELOGGING_P_H
 #define QT3DCORE_CORELOGGING_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QtCore/QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/geometry/bufferutils_p.h b/src/core/geometry/bufferutils_p.h
index 1b83d9949..4e81cf9bf 100644
--- a/src/core/geometry/bufferutils_p.h
+++ b/src/core/geometry/bufferutils_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DCore/QAttribute>
 #include <QByteArray>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/geometry/qgeometryfactory_p.h b/src/core/geometry/qgeometryfactory_p.h
index 97114d658..173ef756c 100644
--- a/src/core/geometry/qgeometryfactory_p.h
+++ b/src/core/geometry/qgeometryfactory_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QGEOMETRYFACTORY_P_H
 #define QT3DCORE_QGEOMETRYFACTORY_P_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
 #include <QtCore/QSharedPointer>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h
index 3ddb1c2dc..bf96e9441 100644
--- a/src/core/jobs/qabstractaspectjobmanager_p.h
+++ b/src/core/jobs/qabstractaspectjobmanager_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QABSTRACTASPECTJOBMANAGER_P_H
 #define QABSTRACTASPECTJOBMANAGER_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qaspectjob.h>
 #include <QtCore/QObject>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h
index 8b7e73cd8..d9de4ff51 100644
--- a/src/core/nodes/propertychangehandler_p.h
+++ b/src/core/nodes/propertychangehandler_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
+** Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebChannel module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef SIGNALHANDLER_H
 #define SIGNALHANDLER_H
 
@@ -56,6 +55,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QMetaMethod>
 #include <QtCore/QObject>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/nodes/qnodevisitor_p.h b/src/core/nodes/qnodevisitor_p.h
index c7c75710a..53f92ff62 100644
--- a/src/core/nodes/qnodevisitor_p.h
+++ b/src/core/nodes/qnodevisitor_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QNODEVISITOR_P_H
 #define QT3DCORE_QNODEVISITOR_P_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qabstractfrontendnodemanager_p.h b/src/core/qabstractfrontendnodemanager_p.h
index 60ccaa722..5748d4649 100644
--- a/src/core/qabstractfrontendnodemanager_p.h
+++ b/src/core/qabstractfrontendnodemanager_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnodeid.h>
+#include <private/qglobal_p.h>
 
 #include <QtCore/qlist.h>
 
diff --git a/src/core/qscheduler_p.h b/src/core/qscheduler_p.h
index a781e1cbb..70af41348 100644
--- a/src/core/qscheduler_p.h
+++ b/src/core/qscheduler_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,12 +36,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QSCHEDULER_P_H
 #define QT3DCORE_QSCHEDULER_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/QObject>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/core/qtickclock_p.h b/src/core/qtickclock_p.h
index 2b6686745..e07cf9665 100644
--- a/src/core/qtickclock_p.h
+++ b/src/core/qtickclock_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QTICKCLOCK_P_H
 #define QT3DCORE_QTICKCLOCK_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/QElapsedTimer>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/qurlhelper_p.h b/src/core/qurlhelper_p.h
index b545ece12..b3e90a4d3 100644
--- a/src/core/qurlhelper_p.h
+++ b/src/core/qurlhelper_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QUrl>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/resources/qhandle_p.h b/src/core/resources/qhandle_p.h
index 8914df9d0..01406d3b0 100644
--- a/src/core/resources/qhandle_p.h
+++ b/src/core/resources/qhandle_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QHANDLE_P_H
 #define QT3DCORE_QHANDLE_P_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/QDebug>
 #include <QtCore/qhashfunctions.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/resources/qloadgltf_p.h b/src/core/resources/qloadgltf_p.h
index ce49a2a80..83c4500a2 100644
--- a/src/core/resources/qloadgltf_p.h
+++ b/src/core/resources/qloadgltf_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/qjsonarray.h>
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonobject.h>
+#include <private/qglobal_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/core/services/qservicelocator_p.h b/src/core/services/qservicelocator_p.h
index 5bf71a996..751278534 100644
--- a/src/core/services/qservicelocator_p.h
+++ b/src/core/services/qservicelocator_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_QSERVICELOCATOR_H
 #define QT3DCORE_QSERVICELOCATOR_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qscopedpointer.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/transforms/sqt_p.h b/src/core/transforms/sqt_p.h
index a3aadd01d..24afc1fc6 100644
--- a/src/core/transforms/sqt_p.h
+++ b/src/core/transforms/sqt_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DCORE_SQT_P_H
 #define QT3DCORE_SQT_P_H
 
@@ -55,6 +54,7 @@
 #include <QtGui/qquaternion.h>
 #include <QtGui/qvector3d.h>
 #include <QtCore/qlist.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/text/areaallocator_p.h b/src/extras/text/areaallocator_p.h
index 809c5c698..468c922eb 100644
--- a/src/extras/text/areaallocator_p.h
+++ b/src/extras/text/areaallocator_p.h
@@ -56,6 +56,7 @@
 //
 
 #include <QtCore/qsize.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/text/distancefieldtextrenderer_p.h b/src/extras/text/distancefieldtextrenderer_p.h
index 93a91d4e1..7cb75c56c 100644
--- a/src/extras/text/distancefieldtextrenderer_p.h
+++ b/src/extras/text/distancefieldtextrenderer_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DEXTRAS_DISTANCEFIELDTEXTRENDERER_P_H
 #define QT3DEXTRAS_DISTANCEFIELDTEXTRENDERER_P_H
 
@@ -55,6 +54,7 @@
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DExtras/qt3dextras_global.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/text/qdistancefieldglyphcache_p.h b/src/extras/text/qdistancefieldglyphcache_p.h
index 1cd58d55b..afd1f9223 100644
--- a/src/extras/text/qdistancefieldglyphcache_p.h
+++ b/src/extras/text/qdistancefieldglyphcache_p.h
@@ -54,6 +54,7 @@
 #include <QtCore/QRectF>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DExtras/qt3dextras_global.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/text/qtext2dmaterial_p.h b/src/extras/text/qtext2dmaterial_p.h
index cf967b02b..9c944c034 100644
--- a/src/extras/text/qtext2dmaterial_p.h
+++ b/src/extras/text/qtext2dmaterial_p.h
@@ -54,6 +54,7 @@
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qmaterial.h>
 #include <QColor>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/extras/text/qtextureatlas_p.h b/src/extras/text/qtextureatlas_p.h
index c5dbf1fd4..7d0979eae 100644
--- a/src/extras/text/qtextureatlas_p.h
+++ b/src/extras/text/qtextureatlas_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qabstracttexture.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h
index 0789a8dbc..cc6de1097 100644
--- a/src/input/backend/assignkeyboardfocusjob_p.h
+++ b/src/input/backend/assignkeyboardfocusjob_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DINPUT_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H
 #define QT3DINPUT_INPUT_ASSIGNKEYBOARDFOCUSJOB_P_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DInput/qkeyboarddevice.h>
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/inputbackendnodefunctor_p.h b/src/input/backend/inputbackendnodefunctor_p.h
index 1d18025f0..91c46490e 100644
--- a/src/input/backend/inputbackendnodefunctor_p.h
+++ b/src/input/backend/inputbackendnodefunctor_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DINPUT_INPUT_INPUTBACKENDNODEFUNCTOR_P_H
 #define QT3DINPUT_INPUT_INPUTBACKENDNODEFUNCTOR_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnode.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/loadproxydevicejob_p.h b/src/input/backend/loadproxydevicejob_p.h
index a6d1568f7..97fc4baed 100644
--- a/src/input/backend/loadproxydevicejob_p.h
+++ b/src/input/backend/loadproxydevicejob_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DINPUT_INPUT_LOADPROXYDEVICEJOB_P_H
 #define QT3DINPUT_INPUT_LOADPROXYDEVICEJOB_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/backend/movingaverage_p.h b/src/input/backend/movingaverage_p.h
index f7a89907a..a839595ee 100644
--- a/src/input/backend/movingaverage_p.h
+++ b/src/input/backend/movingaverage_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DINPUT_MOVINGAVERAGE_P_H
 #define QT3DINPUT_MOVINGAVERAGE_P_H
 
@@ -51,7 +50,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtCore/private/qglobal_p.h>
 
 #include <vector>
 
diff --git a/src/input/frontend/qinputdeviceintegrationfactory_p.h b/src/input/frontend/qinputdeviceintegrationfactory_p.h
index 417aa1c47..8962a27a2 100644
--- a/src/input/frontend/qinputdeviceintegrationfactory_p.h
+++ b/src/input/frontend/qinputdeviceintegrationfactory_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DInput/qt3dinput_global.h>
 #include <QtCore/QStringList>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/input/qt3dinput_global_p.h b/src/input/qt3dinput_global_p.h
index 5ea3a8c5a..83c1b7932 100644
--- a/src/input/qt3dinput_global_p.h
+++ b/src/input/qt3dinput_global_p.h
@@ -52,6 +52,7 @@
 //
 
 #include "qt3dinput_global.h"
+#include <private/qglobal_p.h>
 
 #define Q_3DINPUTSHARED_PRIVATE_EXPORT Q_3DINPUTSHARED_EXPORT
 
diff --git a/src/logic/callbackjob_p.h b/src/logic/callbackjob_p.h
index a521df7e2..24bf832c8 100644
--- a/src/logic/callbackjob_p.h
+++ b/src/logic/callbackjob_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DLOGIC_LOGIC_CALLBACKJOB_P_H
 #define QT3DLOGIC_LOGIC_CALLBACKJOB_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <Qt3DCore/qaspectjob.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/logic/executor_p.h b/src/logic/executor_p.h
index 700ca5ccb..5077d1332 100644
--- a/src/logic/executor_p.h
+++ b/src/logic/executor_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DLOGIC_LOGIC_EXECUTOR_P_H
 #define QT3DLOGIC_LOGIC_EXECUTOR_P_H
 
@@ -54,6 +53,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qcoreevent.h>
 #include <Qt3DCore/qnodeid.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index ebb9e5ba7..78ddc7238 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DLOGIC_LOGIC_HANDLER_H
 #define QT3DLOGIC_LOGIC_HANDLER_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qaspectjob.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index 030c87bb0..525118fbf 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef SCENE3DITEM_H
 #define SCENE3DITEM_H
 
@@ -54,6 +53,7 @@
 #include <QtCore/qpointer.h>
 #include <QtQuick/QQuickItem>
 #include <Qt3DCore/qentity.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3dlogging_p.h b/src/quick3d/imports/scene3d/scene3dlogging_p.h
index 91430939f..9ec646c8a 100644
--- a/src/quick3d/imports/scene3d/scene3dlogging_p.h
+++ b/src/quick3d/imports/scene3d/scene3dlogging_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3D_SCENE3DLOGGING_P_H
 #define QT3D_SCENE3DLOGGING_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QtCore/QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
index b4ac7383e..38ab0abd1 100644
--- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
+++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2021 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_SCENE3DSGMATERIALSHADER_P_H
 #define QT3DRENDER_SCENE3DSGMATERIALSHADER_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QtQuick/QSGMaterialShader>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h
index bd313a49c..fbefc0e26 100644
--- a/src/quick3d/quick3d/qt3dquick_global_p.h
+++ b/src/quick3d/quick3d/qt3dquick_global_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DQUICK_GLOBAL_P_H
 #define QT3DQUICK_GLOBAL_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DQuick/qt3dquick_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #include <QColor>
 #include <QMatrix4x4>
diff --git a/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h b/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h
index c57cd55ea..600358570 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h
+++ b/src/quick3d/quick3danimation/qt3dquickanimation_global_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DQuickAnimation/qt3dquickanimation_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #define Q_3DQUICKANIMATIONSHARED_PRIVATE_EXPORT Q_3DQUICKANIMATIONSHARED_EXPORT
 
diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h
index 1c38524fe..a2bcedd0d 100644
--- a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h
+++ b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DEXTRAS_EXTRAS_QUICK_QUICK3DSPRITESHEET_P_H
 #define QT3DEXTRAS_EXTRAS_QUICK_QUICK3DSPRITESHEET_P_H
 
@@ -54,6 +53,7 @@
 #include <Qt3DQuickExtras/qt3dquickextras_global.h>
 #include <Qt3DExtras/qspritesheet.h>
 #include <QtQml/QQmlListProperty>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dextras/qt3dquickextras_global_p.h b/src/quick3d/quick3dextras/qt3dquickextras_global_p.h
index 40c8d8a10..ed446da03 100644
--- a/src/quick3d/quick3dextras/qt3dquickextras_global_p.h
+++ b/src/quick3d/quick3dextras/qt3dquickextras_global_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DQuickExtras/qt3dquickextras_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #define Q_3DQUICKEXTRASSHARED_PRIVATE_EXPORT Q_3DQUICKEXTRASSHARED_EXPORT
 
diff --git a/src/quick3d/quick3dextras/qt3dquickwindowlogging_p.h b/src/quick3d/quick3dextras/qt3dquickwindowlogging_p.h
index 75a774dda..9a4e0c229 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindowlogging_p.h
+++ b/src/quick3d/quick3dextras/qt3dquickwindowlogging_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global_p.h b/src/quick3d/quick3dinput/qt3dquickinput_global_p.h
index 0924fcb62..4113adb39 100644
--- a/src/quick3d/quick3dinput/qt3dquickinput_global_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinput_global_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DQuickInput/qt3dquickinput_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #define Q_3DQUICKINPUTSHARED_PRIVATE_EXPORT Q_3DQUICKINPUTSHARED_EXPORT
 
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
index 11a4f2ff1..7d0fe653e 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2019 The Qt Company Ltd and/or its subsidiary(-ies).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -37,7 +37,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DQUICKRENDER_GLOBAL_P_H
 #define QT3DQUICKRENDER_GLOBAL_P_H
 
@@ -54,6 +53,7 @@
 
 #include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #define Q_3DQUICKRENDERSHARED_PRIVATE_EXPORT Q_3DQUICKRENDERSHARED_EXPORT
 
diff --git a/src/quick3d/quick3dscene2d/items/scene2devent_p.h b/src/quick3d/quick3dscene2d/items/scene2devent_p.h
index 8a724a24c..40b0cd851 100644
--- a/src/quick3d/quick3dscene2d/items/scene2devent_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2devent_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_QUICK3DRENDER_SCENE2DEVENT_P_H
 #define QT3DRENDER_QUICK3DRENDER_SCENE2DEVENT_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <Qt3DQuickScene2D/qt3dquickscene2d_global.h>
+#include <private/qglobal_p.h>
 
 #include <QtCore/QEvent>
 
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h
index c3248ffc7..e0d38395b 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2d_global_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DQUICKSCENE2D_GLOBAL_P_H
 #define QT3DQUICKSCENE2D_GLOBAL_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DQuickScene2D/qt3dquickscene2d_global.h>
 #include <QtQml/qqml.h>
+#include <private/qglobal_p.h>
 
 #define Q_3DQUICKSCENE2DSHARED_PRIVATE_EXPORT Q_3DQUICKSCENE2DSHARED_EXPORT
 
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging_p.h
index a2d60dacb..10ff4b999 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging_p.h
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DQUICKSCENE2D_LOGGING_P_H
 #define QT3DQUICKSCENE2D_LOGGING_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backend/bufferutils_p.h b/src/render/backend/bufferutils_p.h
index 83787b6bc..70ed3b5ac 100644
--- a/src/render/backend/bufferutils_p.h
+++ b/src/render/backend/bufferutils_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DCore/QAttribute>
 #include <QByteArray>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backend/entityvisitor_p.h b/src/render/backend/entityvisitor_p.h
index 2f4f1c813..8f9cb4749 100644
--- a/src/render/backend/entityvisitor_p.h
+++ b/src/render/backend/entityvisitor_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h
index 376d43d1f..4220dec0b 100644
--- a/src/render/backend/parameterpack_p.h
+++ b/src/render/backend/parameterpack_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_RENDER_PARAMETERPACK_H
 #define QT3DRENDER_RENDER_PARAMETERPACK_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DCore/qnodeid.h>
 #include <QList>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backend/visitorutils_p.h b/src/render/backend/visitorutils_p.h
index cea4af2b1..9388f44e4 100644
--- a/src/render/backend/visitorutils_p.h
+++ b/src/render/backend/visitorutils_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QtGlobal>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/qt3drender_global_p.h b/src/render/qt3drender_global_p.h
index badbdf211..d7a4582e7 100644
--- a/src/render/qt3drender_global_p.h
+++ b/src/render/qt3drender_global_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_GLOBAL_P_H
 #define QT3DRENDER_GLOBAL_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include "qt3drender_global.h"
+#include <private/qglobal_p.h>
 
 #define Q_3DRENDERSHARED_PRIVATE_EXPORT Q_3DRENDERSHARED_EXPORT
 
diff --git a/src/render/raycasting/qboundingvolumeprovider_p.h b/src/render/raycasting/qboundingvolumeprovider_p.h
index e9edbf3c6..0869e89e9 100644
--- a/src/render/raycasting/qboundingvolumeprovider_p.h
+++ b/src/render/raycasting/qboundingvolumeprovider_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_QBOUNDINGVOLUMEPROVIDER_P_H
 #define QT3DRENDER_QBOUNDINGVOLUMEPROVIDER_P_H
 
@@ -53,6 +52,7 @@
 
 #include <Qt3DRender/qt3drender_global.h>
 #include <QList>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/renderlogging_p.h b/src/render/renderlogging_p.h
index 54f304327..4a8c3c5c4 100644
--- a/src/render/renderlogging_p.h
+++ b/src/render/renderlogging_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #ifndef QT3DRENDER_RENDER_RENDERLOGGING_P_H
 #define QT3DRENDER_RENDER_RENDERLOGGING_P_H
 
@@ -52,6 +51,7 @@
 //
 
 #include <QLoggingCategory>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/qtexturedataupdate_p.h b/src/render/texture/qtexturedataupdate_p.h
index e6be170e9..cd771ae57 100644
--- a/src/render/texture/qtexturedataupdate_p.h
+++ b/src/render/texture/qtexturedataupdate_p.h
@@ -53,6 +53,7 @@
 
 #include <Qt3DRender/qtextureimagedata.h>
 #include <Qt3DRender/qabstracttexture.h>
+#include <private/qglobal_p.h>
 
 #include <QtCore/qshareddata.h>
 
diff --git a/src/render/texture/qtexturegenerator_p.h b/src/render/texture/qtexturegenerator_p.h
index 933346f2e..d06027d9b 100644
--- a/src/render/texture/qtexturegenerator_p.h
+++ b/src/render/texture/qtexturegenerator_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -36,7 +36,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 //
 //  W A R N I N G
 //  -------------
@@ -55,6 +54,7 @@
 #include <Qt3DRender/qabstracttexture.h>
 #include <Qt3DRender/qtexturewrapmode.h>
 #include <QtCore/QSharedPointer>
+#include <private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE