Header naming fixed for quick3d parts

Change-Id: Ifd7823af9ffe5761b4863d559c9321207fb62998
Task-number: QTBUG-49138
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

59 files changed, 544 insertions, 361 deletions

diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 547b7e838..ef724b3eb 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -43,10 +43,10 @@
 #include <Qt3DCore/qtranslatetransform.h>
 #include <Qt3DCore/qrotatetransform.h>
 #include <Qt3DCore/qabstractattribute.h>
-#include <Qt3DQuick/quick3dentity.h>
-#include <Qt3DQuick/quick3dentityloader.h>
-#include <Qt3DQuick/quick3dtransform.h>
-#include <Qt3DQuick/quick3dconfiguration.h>
+#include <private/quick3dentity_p.h>
+#include <private/quick3dentityloader_p.h>
+#include <private/quick3dtransform_p.h>
+#include <private/quick3dconfiguration_p.h>
 #include <private/quick3dnodeinstantiator_p.h>
 #include <private/qt3dquick_global_p.h>
 
diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro
index 4326356d4..fa6116285 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -2,7 +2,7 @@ CXX_MODULE = qml
 TARGET = quick3drenderplugin
 TARGETPATH = Qt3D/Render
 
-QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquickrender-private
+QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dquickrender-private
 
 HEADERS += \
     qt3dquick3drenderplugin.h
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index ccefd3769..be122e17a 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -99,24 +99,24 @@
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qcylindergeometry.h>
 #include <Qt3DRender/qobjectpicker.h>
-#include <Qt3DQuickRender/quick3dtechnique.h>
-#include <Qt3DQuickRender/quick3dmaterial.h>
-#include <Qt3DQuickRender/quick3dtechniquefilter.h>
-#include <Qt3DQuickRender/quick3dviewport.h>
-#include <Qt3DQuickRender/quick3drenderpassfilter.h>
-#include <Qt3DQuickRender/quick3drendertarget.h>
-#include <Qt3DQuickRender/quick3deffect.h>
-#include <Qt3DQuickRender/quick3dscene.h>
-#include <Qt3DQuickRender/quick3dtexture.h>
-#include <Qt3DQuickRender/quick3drenderpass.h>
-#include <Qt3DQuickRender/quick3dsortmethod.h>
-#include <Qt3DQuickRender/quick3dparameter.h>
-#include <Qt3DQuickRender/quick3dshaderdata.h>
-#include <Qt3DQuickRender/quick3dshaderdataarray.h>
-#include <Qt3DQuickRender/quick3dstateset.h>
-#include <Qt3DQuickRender/quick3drendertargetselector.h>
-#include <Qt3DQuickRender/quick3dgeometry.h>
-#include <Qt3DQuickRender/quick3dbuffer.h>
+#include <Qt3DQuickRender/private/quick3dtechnique_p.h>
+#include <Qt3DQuickRender/private/quick3dmaterial_p.h>
+#include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h>
+#include <Qt3DQuickRender/private/quick3dviewport_p.h>
+#include <Qt3DQuickRender/private/quick3drenderpassfilter_p.h>
+#include <Qt3DQuickRender/private/quick3drendertarget_p.h>
+#include <Qt3DQuickRender/private/quick3deffect_p.h>
+#include <Qt3DQuickRender/private/quick3dscene_p.h>
+#include <Qt3DQuickRender/private/quick3dtexture_p.h>
+#include <Qt3DQuickRender/private/quick3drenderpass_p.h>
+#include <Qt3DQuickRender/private/quick3dsortmethod_p.h>
+#include <Qt3DQuickRender/private/quick3dparameter_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdata_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h>
+#include <Qt3DQuickRender/private/quick3dstateset_p.h>
+#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h>
+#include <Qt3DQuickRender/private/quick3dgeometry_p.h>
+#include <Qt3DQuickRender/private/quick3dbuffer_p.h>
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 static void initResources()
diff --git a/src/quick3d/quick3d/items/items.pri b/src/quick3d/quick3d/items/items.pri
index 0c01fe46f..6891b1e6a 100644
--- a/src/quick3d/quick3d/items/items.pri
+++ b/src/quick3d/quick3d/items/items.pri
@@ -1,12 +1,11 @@
 HEADERS += \
-    $$PWD/quick3dnode.h \
-    $$PWD/quick3dentity.h \
-    $$PWD/quick3dentityloader.h \
+    $$PWD/quick3dnodeinstantiator_p.h \
+    $$PWD/quick3dtransform_p.h \
+    $$PWD/quick3dconfiguration_p.h \
+    $$PWD/quick3dentity_p.h \
+    $$PWD/quick3dentityloader_p_p.h \
     $$PWD/quick3dentityloader_p.h \
-    $$PWD/quick3dtransform.h \
-    $$PWD/quick3dconfiguration.h \
-    $$PWD/quick3dnodeinstantiator_p_p.h \
-    $$PWD/quick3dnodeinstantiator_p.h
+    $$PWD/quick3dnode_p.h
 
 SOURCES += \
     $$PWD/quick3dnode.cpp \
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp
index 433e5e0d2..70546eb5f 100644
--- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp
+++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dconfiguration.h"
+#include "quick3dconfiguration_p.h"
 #include <QDebug>
 
 #include <Qt3DCore/QAspectEngine>
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.h b/src/quick3d/quick3d/items/quick3dconfiguration_p.h
index 99606698b..3b1c76aea 100644
--- a/src/quick3d/quick3d/items/quick3dconfiguration.h
+++ b/src/quick3d/quick3d/items/quick3dconfiguration_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_QUICK3DCONFIGURATION_H
-#define QT3D_QUICK_QUICK3DCONFIGURATION_H
+#ifndef QT3D_QUICK_QUICK3DCONFIGURATION_P_H
+#define QT3D_QUICK_QUICK3DCONFIGURATION_P_H
 
-#include <Qt3DQuick/qt3dquick_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +59,7 @@ class QCamera;
 
 namespace Quick {
 
-class QT3DQUICKSHARED_EXPORT Quick3DConfiguration : public QObject
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DConfiguration : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DCore::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged)
@@ -73,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK_QUICK3DCONFIGURATION_H
+#endif // QT3D_QUICK_QUICK3DCONFIGURATION_P_H
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index 8b3b9ba4b..b0b165679 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dentity.h"
+#include "quick3dentity_p.h"
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dentity.h b/src/quick3d/quick3d/items/quick3dentity_p.h
index 3a9adca06..b5f8ef8d3 100644
--- a/src/quick3d/quick3d/items/quick3dentity.h
+++ b/src/quick3d/quick3d/items/quick3dentity_p.h
@@ -34,13 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_QUICK3DENTITY_H
-#define QT3D_QUICK_QUICK3DENTITY_H
+#ifndef QT3D_QUICK_QUICK3DENTITY_P_H
+#define QT3D_QUICK_QUICK3DENTITY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QQmlListProperty>
 #include <Qt3DCore/qentity.h>
-#include <Qt3DQuick/quick3dnode.h>
-#include <Qt3DQuick/qt3dquick_global.h>
+#include <Qt3DQuick/private/quick3dnode_p.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +62,7 @@ class QComponent;
 
 namespace Quick {
 
-class QT3DQUICKSHARED_EXPORT Quick3DEntity : public QObject
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntity : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DCore::QComponent> components READ componentList)
@@ -75,4 +86,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK_QUICK3DENTITY_H
+#endif // QT3D_QUICK_QUICK3DENTITY_P_H
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 0b4d3d9a1..44b39a8da 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -34,8 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dentityloader.h"
-#include "quick3dentityloader_p.h"
+#include "quick3dentityloader_p_p.h"
 
 #include <QQmlContext>
 #include <QQmlEngine>
@@ -240,4 +239,4 @@ void Quick3DEntityLoaderPrivate::_q_componentStatusChanged(QQmlComponent::Status
 
 QT_END_NAMESPACE
 
-#include "moc_quick3dentityloader.cpp"
+#include "moc_quick3dentityloader_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.h b/src/quick3d/quick3d/items/quick3dentityloader.h
deleted file mode 100644
index 49d689e02..000000000
--- a/src/quick3d/quick3d/items/quick3dentityloader.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3D_QUICK_QUICK3DENTITYLOADER_H
-#define QT3D_QUICK_QUICK3DENTITYLOADER_H
-
-#include <QObject>
-#include <QUrl>
-
-#include <Qt3DCore/QEntity>
-
-#include <Qt3DQuick/qt3dquick_global.h>
-
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QEntity;
-
-namespace Quick {
-
-class Quick3DEntityLoaderPrivate;
-
-class QT3DQUICKSHARED_EXPORT Quick3DEntityLoader : public QEntity
-{
-    Q_OBJECT
-    Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged)
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-public:
-    explicit Quick3DEntityLoader(QNode *parent = 0);
-    ~Quick3DEntityLoader();
-
-    QObject *entity() const;
-
-    QUrl source() const;
-    void setSource(const QUrl &url);
-
-Q_SIGNALS:
-    void entityChanged();
-    void sourceChanged();
-
-protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-
-private:
-    Q_DECLARE_PRIVATE(Quick3DEntityLoader)
-    Q_PRIVATE_SLOT(d_func(), void _q_componentStatusChanged(QQmlComponent::Status))
-    QT3D_CLONEABLE(Quick3DEntityLoader)
-};
-
-} // namespace Quick
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QUICK3DENTITYLOADER_H
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index 21ec9ed55..af3f1df7d 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -48,16 +48,15 @@
 // We mean it.
 //
 
-#include "quick3dentityloader.h"
+#include <QObject>
+#include <QUrl>
 
-#include <QQmlComponent>
+#include <Qt3DCore/QEntity>
 
-#include <Qt3DCore/private/qentity_p.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 
-QT_BEGIN_NAMESPACE
 
-class QQmlIncubator;
-class QQmlContext;
+QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
@@ -65,28 +64,33 @@ class QEntity;
 
 namespace Quick {
 
-class Quick3DEntityLoaderIncubator;
+class Quick3DEntityLoaderPrivate;
 
-class Quick3DEntityLoaderPrivate : public QEntityPrivate
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity
 {
+    Q_OBJECT
+    Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 public:
-    Quick3DEntityLoaderPrivate();
+    explicit Quick3DEntityLoader(QNode *parent = 0);
+    ~Quick3DEntityLoader();
 
-    Q_DECLARE_PUBLIC(Quick3DEntityLoader)
+    QObject *entity() const;
 
-    void clear();
-    void loadFromSource();
-    void loadComponent(const QUrl &source);
+    QUrl source() const;
+    void setSource(const QUrl &url);
 
-    void _q_componentStatusChanged(QQmlComponent::Status status);
+Q_SIGNALS:
+    void entityChanged();
+    void sourceChanged();
 
-    static inline Quick3DEntityLoaderPrivate *get(Quick3DEntityLoader *q) { return q->d_func(); }
+protected:
+    void copy(const QNode *ref) Q_DECL_OVERRIDE;
 
-    QUrl m_source;
-    Quick3DEntityLoaderIncubator *m_incubator;
-    QQmlContext *m_context;
-    QQmlComponent *m_component;
-    QEntity *m_entity;
+private:
+    Q_DECLARE_PRIVATE(Quick3DEntityLoader)
+    Q_PRIVATE_SLOT(d_func(), void _q_componentStatusChanged(QQmlComponent::Status))
+    QT3D_CLONEABLE(Quick3DEntityLoader)
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
index 71bc44668..cbf0001da 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p_p.h
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Research In Motion.
-** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_QUICK3DNODEINSTANTIATOR_P_P_H
-#define QT3D_QUICK_QUICK3DNODEINSTANTIATOR_P_P_H
+#ifndef QT3D_QUICK_QUICK3DENTITYLOADER_P_P_H
+#define QT3D_QUICK_QUICK3DENTITYLOADER_P_P_H
 
 //
 //  W A R N I N G
@@ -49,40 +48,45 @@
 // We mean it.
 //
 
-#include <private/qnode_p.h>
-#include <private/qqmlchangeset_p.h>
-#include <private/qqmlobjectmodel_p.h>
+#include "quick3dentityloader_p.h"
+
+#include <QQmlComponent>
+
+#include <Qt3DCore/private/qentity_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlComponent;
+class QQmlIncubator;
+class QQmlContext;
 
 namespace Qt3DCore {
+
+class QEntity;
+
 namespace Quick {
 
-class Quick3DNodeInstantiatorPrivate : public QNodePrivate
-{
-    Q_DECLARE_PUBLIC(Quick3DNodeInstantiator)
+class Quick3DEntityLoaderIncubator;
 
+class Quick3DEntityLoaderPrivate : public QEntityPrivate
+{
 public:
-    Quick3DNodeInstantiatorPrivate();
-    ~Quick3DNodeInstantiatorPrivate();
+    Quick3DEntityLoaderPrivate();
+
+    Q_DECLARE_PUBLIC(Quick3DEntityLoader)
 
     void clear();
-    void regenerate();
-    void makeModel();
-    void _q_createdItem(int, QObject *);
-    void _q_modelUpdated(const QQmlChangeSet &, bool);
-
-    bool m_componentComplete:1;
-    bool m_effectiveReset:1;
-    bool m_active:1;
-    bool m_async:1;
-    bool m_ownModel:1;
-    QVariant m_model;
-    QQmlInstanceModel *m_instanceModel;
-    QQmlComponent *m_delegate;
-    QVector<QPointer<QObject> > m_objects;
+    void loadFromSource();
+    void loadComponent(const QUrl &source);
+
+    void _q_componentStatusChanged(QQmlComponent::Status status);
+
+    static inline Quick3DEntityLoaderPrivate *get(Quick3DEntityLoader *q) { return q->d_func(); }
+
+    QUrl m_source;
+    Quick3DEntityLoaderIncubator *m_incubator;
+    QQmlContext *m_context;
+    QQmlComponent *m_component;
+    QEntity *m_entity;
 };
 
 } // namespace Quick
@@ -90,5 +94,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK_QUICK3DNODEINSTANTIATOR_P_P_H
-
+#endif // QT3D_QUICK_QUICK3DENTITYLOADER_P_P_H
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index 2c4128bed..6658f6916 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dnode.h"
+#include "quick3dnode_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dnode.h b/src/quick3d/quick3d/items/quick3dnode_p.h
index 96fcd78e4..b25167528 100644
--- a/src/quick3d/quick3d/items/quick3dnode.h
+++ b/src/quick3d/quick3d/items/quick3dnode_p.h
@@ -34,19 +34,30 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_QUICK3DNODE_H
-#define QT3D_QUICK_QUICK3DNODE_H
+#ifndef QT3D_QUICK_QUICK3DNODE_P_H
+#define QT3D_QUICK_QUICK3DNODE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QQmlListProperty>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DQuick/qt3dquick_global.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 namespace Quick {
 
-class QT3DQUICKSHARED_EXPORT Quick3DNode : public QObject
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data)
@@ -81,4 +92,4 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-#endif // QUICK3DNODE_H
+#endif // QT3D_QUICK_QUICK3DNODE_P_H
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index fb49eef89..65948aa3c 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -36,7 +36,6 @@
 ****************************************************************************/
 
 #include "quick3dnodeinstantiator_p.h"
-#include "quick3dnodeinstantiator_p_p.h"
 
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
@@ -44,12 +43,40 @@
 #include <QtQml/QQmlError>
 #include <QtQml/private/qqmlobjectmodel_p.h>
 #include <QtQml/private/qqmldelegatemodel_p.h>
+#include <private/qnode_p.h>
+#include <private/qqmlchangeset_p.h>
+#include <private/qqmlobjectmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 namespace Quick {
 
+class Quick3DNodeInstantiatorPrivate : public QNodePrivate
+{
+    Q_DECLARE_PUBLIC(Quick3DNodeInstantiator)
+
+public:
+    Quick3DNodeInstantiatorPrivate();
+    ~Quick3DNodeInstantiatorPrivate();
+
+    void clear();
+    void regenerate();
+    void makeModel();
+    void _q_createdItem(int, QObject *);
+    void _q_modelUpdated(const QQmlChangeSet &, bool);
+
+    bool m_componentComplete:1;
+    bool m_effectiveReset:1;
+    bool m_active:1;
+    bool m_async:1;
+    bool m_ownModel:1;
+    QVariant m_model;
+    QQmlInstanceModel *m_instanceModel;
+    QQmlComponent *m_delegate;
+    QVector<QPointer<QObject> > m_objects;
+};
+
 /*!
     \class Qt3DCore::Quick::Quick3DNodeInstantiatorPrivate
     \internal
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index 38a4d5a6f..8a47fe316 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_NODEINSTANTIATOR_H
-#define QT3D_QUICK_NODEINSTANTIATOR_H
+#ifndef QT3D_QUICK_NODEINSTANTIATOR_P_H
+#define QT3D_QUICK_NODEINSTANTIATOR_P_H
 
 //
 //  W A R N I N G
@@ -49,7 +49,7 @@
 // We mean it.
 //
 
-#include <Qt3DQuick/qt3dquick_global.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 #include <Qt3DCore/qnode.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlparserstatus.h>
@@ -61,7 +61,7 @@ namespace Quick {
 
 class Quick3DNodeInstantiatorPrivate;
 
-class QT3DQUICKSHARED_EXPORT Quick3DNodeInstantiator : public QNode, public QQmlParserStatus
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeInstantiator : public QNode, public QQmlParserStatus
 {
     Q_OBJECT
 
@@ -126,4 +126,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK_NODEINSTANTIATOR_H
+#endif // QT3D_QUICK_NODEINSTANTIATOR_P_H
diff --git a/src/quick3d/quick3d/items/quick3dtransform.cpp b/src/quick3d/quick3d/items/quick3dtransform.cpp
index 3f313850a..f52051bd3 100644
--- a/src/quick3d/quick3d/items/quick3dtransform.cpp
+++ b/src/quick3d/quick3d/items/quick3dtransform.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtransform.h"
+#include "quick3dtransform_p.h"
 #include <Qt3DCore/qabstracttransform.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dtransform.h b/src/quick3d/quick3d/items/quick3dtransform_p.h
index 504b0fe61..8f1ffe282 100644
--- a/src/quick3d/quick3d/items/quick3dtransform.h
+++ b/src/quick3d/quick3d/items/quick3dtransform_p.h
@@ -34,12 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK_QUICK3DTRANSFORM_H
-#define QT3D_QUICK_QUICK3DTRANSFORM_H
+#ifndef QT3D_QUICK_QUICK3DTRANSFORM_P_H
+#define QT3D_QUICK_QUICK3DTRANSFORM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/QtGlobal>
 #include <QQmlListProperty>
-#include <Qt3DQuick/qt3dquick_global.h>
+#include <Qt3DQuick/private/qt3dquick_global_p.h>
 #include <Qt3DCore/qtransform.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,7 +61,7 @@ class QTransform;
 
 namespace Quick {
 
-class QT3DQUICKSHARED_EXPORT Quick3DTransform : public QObject
+class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DTransform : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractTransform> transforms READ transformList)
@@ -73,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK_QUICK3DTRANSFORM_H
+#endif // QT3D_QUICK_QUICK3DTRANSFORM_P_H
diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp
index 8cdee8674..c6c2a6b3d 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.cpp
+++ b/src/quick3d/quick3d/qqmlaspectengine.cpp
@@ -34,7 +34,6 @@
 **
 ****************************************************************************/
 
-#include "qqmlaspectengine.h"
 #include "qqmlaspectengine_p.h"
 #include <QQmlComponent>
 #include <QQmlContext>
diff --git a/src/quick3d/quick3drender/items/items.pri b/src/quick3d/quick3drender/items/items.pri
index 58458860d..99ffbc801 100644
--- a/src/quick3d/quick3drender/items/items.pri
+++ b/src/quick3d/quick3drender/items/items.pri
@@ -1,23 +1,23 @@
 HEADERS += \
-    $$PWD/quick3drenderpassfilter.h \
-    $$PWD/quick3drendertarget.h \
-    $$PWD/quick3dtechniquefilter.h \
-    $$PWD/quick3dviewport.h \
-    $$PWD/quick3dmaterial.h \
-    $$PWD/quick3dtechnique.h \
-    $$PWD/quick3deffect.h \
-    $$PWD/quick3dscene.h \
-    $$PWD/quick3dtexture.h \
-    $$PWD/quick3drenderpass.h \
-    $$PWD/quick3dsortmethod.h \
-    $$PWD/quick3dparameter_p.h \
-    $$PWD/quick3dparameter.h \
-    $$PWD/quick3dshaderdata.h \
-    $$PWD/quick3dshaderdataarray.h \
-    $$PWD/quick3dstateset.h \
-    $$PWD/quick3drendertargetselector.h \
-    $$PWD/quick3dgeometry.h \
-    $$PWD/quick3dbuffer.h
+    $$PWD/quick3dtechniquefilter_p.h \
+    $$PWD/quick3dbuffer_p.h \
+    $$PWD/quick3deffect_p.h \
+    $$PWD/quick3dgeometry_p.h \
+    $$PWD/quick3dmaterial_p.h \
+    $$PWD/quick3drenderpass_p.h \
+    $$PWD/quick3drenderpassfilter_p.h \
+    $$PWD/quick3drendertarget_p.h \
+    $$PWD/quick3drendertargetselector_p.h \
+    $$PWD/quick3dscene_p.h \
+    $$PWD/quick3dshaderdata_p.h \
+    $$PWD/quick3dshaderdataarray_p.h \
+    $$PWD/quick3dsortmethod_p.h \
+    $$PWD/quick3dstateset_p.h \
+    $$PWD/quick3dtechnique_p.h \
+    $$PWD/quick3dtexture_p.h \
+    $$PWD/quick3dviewport_p.h \
+    $$PWD/quick3dparameter_p_p.h \
+    $$PWD/quick3dparameter_p.h
 
 SOURCES += \
     $$PWD/quick3drenderpassfilter.cpp \
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index aaa3645c1..a80443e6f 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dbuffer.h"
+#include "quick3dbuffer_p.h"
 #include <QQmlEngine>
 #include <QJSValue>
 #include <QtQml/private/qqmlengine_p.h>
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.h b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
index edebb1454..d2933ddc9 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.h
+++ b/src/quick3d/quick3drender/items/quick3dbuffer_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H
-
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/QBuffer>
 
 QT_BEGIN_NAMESPACE
@@ -55,7 +66,7 @@ namespace Render {
 
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DBuffer : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DBuffer : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged)
@@ -84,4 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_P_H
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index b7f6cbed6..885cb4112 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3deffect.h"
+#include "quick3deffect_p.h"
 #include <Qt3DRender/qeffect.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3deffect.h b/src/quick3d/quick3drender/items/quick3deffect_p.h
index 2d4b7a023..51d9428c3 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.h
+++ b/src/quick3d/quick3drender/items/quick3deffect_p.h
@@ -34,22 +34,32 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <QQmlListProperty>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qtechnique.h>
 
-
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DEffect : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DEffect : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList)
@@ -81,4 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index b2af9763b..47235c106 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dgeometry.h"
+#include "quick3dgeometry_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
index bb95be1d0..0434b34c5 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QUICK3DGEOMETRY_H
-#define QT3D_QUICK3DGEOMETRY_H
+#ifndef QT3D_QUICK3DGEOMETRY_P_H
+#define QT3D_QUICK3DGEOMETRY_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <QQmlListProperty>
 #include <Qt3DRender/QGeometry>
 
@@ -47,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DGeometry : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList)
@@ -74,4 +85,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QUICK3DGEOMETRY_H
+#endif // QT3D_QUICK3DGEOMETRY_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index d66d1b21c..672a203f6 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dmaterial.h"
+#include "quick3dmaterial_p.h"
 #include <Qt3DRender/qtexture.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
index 76838418b..691ff276e 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.h
+++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qmaterial.h>
 #include <Qt3DRender/qparameter.h>
 #include <QQmlListProperty>
@@ -51,7 +62,7 @@ namespace Quick {
 // FIXME - write a custom QML parser and stop mis-using Tag
 // Tags could be replaced by Parameters directly
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DMaterial : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DMaterial : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters)
@@ -79,4 +90,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp
index fe3e497a3..9f2dfb59b 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp
@@ -34,8 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dparameter.h"
-#include "quick3dparameter_p.h"
+#include "quick3dparameter_p_p.h"
 
 #include <QJSValue>
 #include <QJSValueIterator>
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h
index 56c1fa6a6..6e3cfe61d 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRender/private/qparameter_p.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DRender/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,16 +57,20 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class Quick3DParameter;
+class Quick3DParameterPrivate;
 
-class Quick3DParameterPrivate : public QParameterPrivate
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DParameter : public QParameter
 {
+    Q_OBJECT
 public:
-    Quick3DParameterPrivate();
+    explicit Quick3DParameter(QNode *parent = 0);
 
-    Q_DECLARE_PUBLIC(Quick3DParameter)
+private:
+    Q_DECLARE_PRIVATE(Quick3DParameter)
 
-    void setValue(const QVariant &value) Q_DECL_OVERRIDE;
+protected:
+    Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent = 0);
+    QT3D_CLONEABLE(Quick3DParameter)
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dparameter.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
index cb1ccd057..429608024 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
@@ -34,11 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
-#include <Qt3DRender/qparameter.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "quick3dparameter_p.h"
+
+#include <Qt3DRender/private/qparameter_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,20 +58,16 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class Quick3DParameterPrivate;
+class Quick3DParameter;
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DParameter : public QParameter
+class Quick3DParameterPrivate : public QParameterPrivate
 {
-    Q_OBJECT
 public:
-    explicit Quick3DParameter(QNode *parent = 0);
+    Quick3DParameterPrivate();
 
-private:
-    Q_DECLARE_PRIVATE(Quick3DParameter)
+    Q_DECLARE_PUBLIC(Quick3DParameter)
 
-protected:
-    Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent = 0);
-    QT3D_CLONEABLE(Quick3DParameter)
+    void setValue(const QVariant &value) Q_DECL_OVERRIDE;
 };
 
 } // namespace Quick
@@ -68,4 +76,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_P_H
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index ff8089f4f..b1524dcbf 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -35,7 +35,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drenderpass.h"
+#include "quick3drenderpass_p.h"
 #include <Qt3DRender/qparametermapping.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
index 384d38486..536bd6b4a 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
@@ -35,10 +35,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <QQmlListProperty>
 
@@ -48,7 +59,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPass : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
@@ -93,4 +104,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_P_H
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index d0dbf7dab..127c2e9f3 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drenderpassfilter.h"
+#include "quick3drenderpassfilter_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
index bf98dbdd5..82d713bb5 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
@@ -34,13 +34,25 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_P_H
 
-#include <Qt3DQuick/quick3dnode.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DRender/qrenderpassfilter.h>
 #include <Qt3DRender/qannotation.h>
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +60,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPassFilter : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList)
@@ -80,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_P_H
diff --git a/src/quick3d/quick3drender/items/quick3drendertarget.cpp b/src/quick3d/quick3drender/items/quick3drendertarget.cpp
index 2bd4cfe5b..5f3916b45 100644
--- a/src/quick3d/quick3drender/items/quick3drendertarget.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertarget.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drendertarget.h"
+#include "quick3drendertarget_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertarget.h b/src/quick3d/quick3drender/items/quick3drendertarget_p.h
index d61b0ef8b..f64605c6a 100644
--- a/src/quick3d/quick3drender/items/quick3drendertarget.h
+++ b/src/quick3d/quick3drender/items/quick3drendertarget_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrendertarget.h>
 #include <Qt3DRender/qrenderattachment.h>
 #include <QQmlListProperty>
@@ -48,7 +59,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTarget : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTarget : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderAttachment> attachments READ qmlAttachments)
@@ -71,4 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index e09bfd8f5..dcc5dd2bd 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drendertargetselector.h"
+#include "quick3drendertargetselector_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
index 65bd93eb4..09f594580 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrenderattachment.h>
 #include <Qt3DRender/qrendertargetselector.h>
 #include <QQmlListProperty>
@@ -49,7 +60,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetSelector : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged)
@@ -72,4 +83,4 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-#endif // QUICK3DRENDERTARGETSELECTOR_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp
index b28487829..95a833448 100644
--- a/src/quick3d/quick3drender/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drender/items/quick3dscene.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dscene.h"
+#include "quick3dscene_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dscene.h b/src/quick3d/quick3drender/items/quick3dscene_p.h
index 4795de844..f607aaeeb 100644
--- a/src/quick3d/quick3drender/items/quick3dscene.h
+++ b/src/quick3d/quick3drender/items/quick3dscene_p.h
@@ -34,11 +34,22 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
-#include <Qt3DQuick/quick3dentity.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuick/private/quick3dentity_p.h>
 #include <Qt3DRender/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DScene : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject
 {
     Q_OBJECT
 public:
@@ -62,4 +73,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index 714f0fed9..1dd9ac323 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -34,10 +34,10 @@
 **
 ****************************************************************************/
 
-#include "quick3dshaderdata.h"
+#include "quick3dshaderdata_p.h"
 #include <private/qshaderdata_p.h>
 
-#include <Qt3DQuickRender/quick3dshaderdataarray.h>
+#include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h>
 #include <QMetaProperty>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.h b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
index fc8f5e18b..cb7e0fe7c 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qshaderdata.h>
 
 #include <QJSValue>
@@ -49,7 +60,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderData : public QShaderData
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderData : public QShaderData
 {
     Q_OBJECT
 public:
@@ -67,4 +78,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderData*)
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 3b863b35e..3306cf226 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dshaderdataarray.h"
+#include "quick3dshaderdataarray_p.h"
 #include <private/qshaderdata_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
index 82bdee7c2..df49c1f98 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h
@@ -34,12 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
-#include <Qt3DQuickRender/quick3dshaderdata.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuickRender/private/quick3dshaderdata_p.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -54,7 +65,7 @@ namespace Quick {
 class Quick3DShaderDataArrayPrivate;
 class Quick3DShaderData;
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList)
@@ -86,4 +97,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderDataArray*)
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dsortmethod.cpp b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp
index 2c04b054f..71d121682 100644
--- a/src/quick3d/quick3drender/items/quick3dsortmethod.cpp
+++ b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dsortmethod.h"
+#include "quick3dsortmethod_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dsortmethod.h b/src/quick3d/quick3drender/items/quick3dsortmethod_p.h
index 672f13703..9e1db429b 100644
--- a/src/quick3d/quick3drender/items/quick3dsortmethod.h
+++ b/src/quick3d/quick3drender/items/quick3dsortmethod_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qsortmethod.h>
 #include <Qt3DRender/qsortcriterion.h>
 #include <QQmlListProperty>
@@ -48,7 +59,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DSortMethod : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DSortMethod : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QSortCriterion> criteria READ criteriaList)
@@ -72,4 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index c6acec6a7..f97363a9c 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dstateset.h"
+#include "quick3dstateset_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h
index bae3bb3d5..a1312c5ca 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qstateset.h>
 #include <QQmlListProperty>
 
@@ -47,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DStateSet : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DStateSet : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT)
@@ -71,4 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 21690e6fe..d5be802e4 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtechnique.h"
+#include "quick3dtechnique_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
index 75de6d530..ee96c243a 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
@@ -34,10 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qtechnique.h>
 #include <QQmlListProperty>
 
@@ -47,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechnique : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
@@ -87,4 +98,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 936efc738..50334de28 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtechniquefilter.h"
+#include "quick3dtechniquefilter_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index 489a70c25..d8d4e4478 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -34,13 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qtechniquefilter.h>
 #include <Qt3DRender/qannotation.h>
-#include <Qt3DQuick/quick3dnode.h>
+#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +60,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> requires READ requireList)
@@ -81,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index bfe899802..90bd564f2 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dtexture.h"
+#include "quick3dtexture_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h
index 1369b1610..1089bb616 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.h
+++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h
@@ -34,14 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
-#include <Qt3DQuick/quick3dnode.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DRender/qtexture.h>
 
-#include <QQmlListProperty>
 #include <QUrl>
 
 QT_BEGIN_NAMESPACE
@@ -50,7 +60,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DTextureExtension : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTextureExtension : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages)
@@ -75,4 +85,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_P_H
diff --git a/src/quick3d/quick3drender/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp
index 0383c578b..5cb89a1b0 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport.cpp
+++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "quick3dviewport.h"
+#include "quick3dviewport_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drender/items/quick3dviewport.h b/src/quick3d/quick3drender/items/quick3dviewport_p.h
index 046c67223..a5eceadd0 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport.h
+++ b/src/quick3d/quick3drender/items/quick3dviewport_p.h
@@ -34,11 +34,22 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_P_H
 
-#include <Qt3DQuickRender/qt3dquickrender_global.h>
-#include <Qt3DQuick/quick3dnode.h>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
+#include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DRender/qviewport.h>
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +60,7 @@ namespace Quick {
 
 // TO DO : Check if this is required or if this might as well be removed
 
-class QT3DQUICKRENDERSHARED_EXPORT Quick3DViewport : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DViewport : public QObject
 {
     Q_OBJECT
 public:
@@ -62,5 +73,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_P_H
 
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
index 13f68f92e..45d27d752 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
@@ -52,7 +52,7 @@
 #include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QtQml/qqml.h>
 
-#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT
+#define QT3DQUICKRENDERSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT
 
 QT_BEGIN_NAMESPACE
 
@@ -60,8 +60,8 @@ namespace Qt3DRender {
 
 namespace Quick {
 
-QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3DRender_initialize();
-QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor);
+QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_initialize();
+QT3DQUICKRENDERSHARED_PRIVATE_EXPORT void Quick3DRender_registerType(const char *className, const char *quickName, int major, int minor);
 
 template<class T, class E> void registerExtendedType(const char *className, const char *quickName,
                                                      const char *uri, int major, int minor, const char *name)
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index ebd332c4e..3a723f1e3 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -1,6 +1,6 @@
 TARGET   = Qt3DQuickRender
 
-QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dcore-private 3drender-private
+QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
 DEFINES += QT3DQUICKRENDER_LIBRARY