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>

40 files changed, 355 insertions, 157 deletions

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