unused member removed

examples/automotive/Speedometer.h

@@ -16,7 +16,6 @@ public:
     void setLabels( const QVector< QString >& labels );
 
 private:
-    float m_labelsStep;
     QVector< QString > m_labels;
 };
 

examples/gbenchmark/Benchmark.cpp

@@ -16,6 +16,7 @@
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QQuickWindow>
+#include <QPainter>
 
 bool Benchmark::run( const QString& dirName )
 {

src/common/QskAspect.cpp

@@ -5,12 +5,11 @@
 
 #include "QskAspect.h"
 
-#include <QDebug>
-#include <QMetaEnum>
-#include <QtAlgorithms>
-#include <QVector>
+#include <qdebug.h>
+#include <qmetaobject.h>
+#include <qalgorithms.h>
+#include <qvector.h>
 
-#include <limits>
 #include <bitset>
 #include <string>
 #include <unordered_map>

src/common/QskAspect.h

@@ -7,7 +7,8 @@
 #define QSK_ASPECT_H
 
 #include "QskFlags.h"
-#include <QMetaObject>
+
+#include <qmetaobject.h>
 #include <functional>
 
 #ifdef Q_MOC_RUN

src/common/QskBoxBorderColors.cpp

@@ -7,7 +7,7 @@
 #include "QskRgbValue.h"
 
 #include <qhashfunctions.h>
-#include <QDebug>
+#include <qvariant.h>
 
 static void qskRegisterBoxBorderColors()
 {
@@ -194,6 +194,8 @@ uint QskBoxBorderColors::hash( uint seed ) const
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 static inline void qskDebugColor( QDebug debug, const QColor& c )
 {
     debug << '('

src/common/QskBoxBorderColors.h

@@ -8,10 +8,9 @@
 
 #include "QskGlobal.h"
 #include "QskNamespace.h"
-#include "QskRgbValue.h"
 
-#include <QColor>
-#include <QMetaType>
+#include <qcolor.h>
+#include <qmetatype.h>
 
 class QDebug;
 

src/common/QskBoxBorderMetrics.cpp

@@ -6,7 +6,7 @@
 #include "QskBoxBorderMetrics.h"
 
 #include <qhashfunctions.h>
-#include <QDebug>
+#include <qvariant.h>
 
 static void qskRegisterBoxBorderMetrics()
 {
@@ -104,6 +104,8 @@ uint QskBoxBorderMetrics::hash( uint seed ) const
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 QDebug operator<<( QDebug debug, const QskBoxBorderMetrics& metrics )
 {
     QDebugStateSaver saver( debug );

src/common/QskBoxBorderMetrics.h

@@ -9,9 +9,9 @@
 #include "QskGlobal.h"
 #include "QskMargins.h"
 
-#include <Qt>
-#include <QMetaType>
-#include <QSizeF>
+#include <qnamespace.h>
+#include <qmetatype.h>
+#include <qsize.h>
 
 class QDebug;
 class QVariant;

src/common/QskBoxShapeMetrics.cpp

@@ -6,7 +6,7 @@
 #include "QskBoxShapeMetrics.h"
 
 #include <qhashfunctions.h>
-#include <QDebug>
+#include <qvariant.h>
 
 static void qskRegisterBoxShapeMetrics()
 {
@@ -210,6 +210,8 @@ uint QskBoxShapeMetrics::hash( uint seed ) const
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 QDebug operator<<( QDebug debug, const QskBoxShapeMetrics& metrics )
 {
     QDebugStateSaver saver( debug );

src/common/QskBoxShapeMetrics.h

@@ -8,11 +8,10 @@
 
 #include "QskGlobal.h"
 
-#include <Qt>
-#include <QMetaType>
-#include <QSizeF>
+#include <qnamespace.h>
+#include <qmetatype.h>
+#include <qsize.h>
 
-class QDebug;
 class QVariant;
 class QMarginsF;
 

src/common/QskCorner.cpp

@@ -4,8 +4,6 @@
  *****************************************************************************/
 
 #include "QskCorner.h"
-#include <QSizeF>
-#include <QDebug>
 
 QskCorner::QskCorner()
 {

src/common/QskCorner.h

@@ -9,8 +9,8 @@
 #include "QskGlobal.h"
 #include "QskBoxShapeMetrics.h"
 
-#include <QMetaType>
-#include <Qt>
+#include <qmetatype.h>
+#include <qnamespace.h>
 
 class QDebug;
 class QSizeF;

src/common/QskFunctions.cpp

@@ -1,8 +1,8 @@
 #include "QskFunctions.h"
 
-#include <QGuiApplication>
-#include <QScreen>
-#include <QtMath>
+#include <qguiapplication.h>
+#include <qscreen.h>
+#include <qmath.h>
 
 template< class Rect, class Value >
 static inline Rect qskAlignedRect( const Rect& outerRect,

src/common/QskFunctions.h

@@ -8,8 +8,8 @@
 
 #include "QskGlobal.h"
 
-#include <QMargins>
-#include <QRectF>
+#include <qmargins.h>
+#include <qrect.h>
 
 QSK_EXPORT qreal qskDpiScaled( qreal value );
 

src/common/QskGradient.cpp

@@ -5,9 +5,8 @@
 
 #include "QskGradient.h"
 #include "QskRgbValue.h"
-#include <QVariant>
-#include <QDebug>
 
+#include <qvariant.h>
 #include <qhashfunctions.h>
 
 static void qskRegisterGradient()
@@ -471,6 +470,8 @@ QVariant QskGradient::interpolate(
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 QDebug operator<<( QDebug debug, const QskGradientStop& stop )
 {
     debug << "GR:" << stop.position() << stop.color();

src/common/QskGradient.h

@@ -8,9 +8,9 @@
 
 #include "QskGlobal.h"
 
-#include <QMetaType>
-#include <QColor>
-#include <QVector>
+#include <qmetatype.h>
+#include <qcolor.h>
+#include <qvector.h>
 
 class QDebug;
 class QVariant;

src/common/QskMargins.cpp

@@ -1,5 +1,5 @@
 #include "QskMargins.h"
-#include <QVariant>
+#include <qvariant.h>
 
 static inline qreal qskInterpolated( qreal from, qreal to, qreal ratio )
 {

src/common/QskMargins.h

@@ -8,9 +8,9 @@
 
 #include "QskGlobal.h"
 
-#include <QMarginsF>
-#include <Qt>
-#include <QMetaType>
+#include <qmargins.h>
+#include <qnamespace.h>
+#include <qmetatype.h>
 
 class QVariant;
 

src/common/QskMetaFunction.cpp

@@ -6,10 +6,10 @@
 #include "QskGlobal.h"
 #include "QskMetaFunction.h"
 
-#include <QCoreApplication>
-#include <QThread>
-#include <QObject>
-#include <QSemaphore>
+#include <qcoreapplication.h>
+#include <qthread.h>
+#include <qobject.h>
+#include <qsemaphore.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qobject_p.h>

src/common/QskMetaFunction.h

@@ -7,8 +7,9 @@
 #define QSK_META_FUNCTION_H 1
 
 #include "QskGlobal.h"
-#include <QMetaType>
-#include <QObject>
+
+#include <qmetatype.h>
+#include <qobject.h>
 
 namespace QskMetaFunctionTraits
 {

src/common/QskMetaFunction.hpp

@@ -7,7 +7,7 @@
 #define QSK_META_FUNCTION_HPP 1
 
 #include "QskGlobal.h"
-#include <QObject>
+#include <qobject.h>
 
 class QskMetaFunction::FunctionCall : public QtPrivate::QSlotObjectBase
 {

src/common/QskMetaInvokable.cpp

@@ -6,15 +6,12 @@
 #include "QskMetaInvokable.h"
 #include "QskMetaFunction.h"
 
-#include <QMetaMethod>
-#include <QMetaProperty>
+#include <qmetaobject.h>
+#include <qobject.h>
 
-#include <QVector>
-#include <QObject>
-
-#include <QThread>
-#include <QCoreApplication>
-#include <QSemaphore>
+#include <qthread.h>
+#include <qcoreapplication.h>
+#include <qsemaphore.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qobject_p.h>

src/common/QskMetaInvokable.h

@@ -8,14 +8,15 @@
 
 #include "QskGlobal.h"
 
-#include <QMetaType>
-#include <Qt>
+#include <qmetatype.h>
+#include <qnamespace.h>
 
 class QskMetaFunction;
 struct QMetaObject;
 class QMetaMethod;
 class QMetaProperty;
 class QObject;
+class QByteArray;
 
 class QSK_EXPORT QskMetaInvokable
 {

src/common/QskModule.cpp

@@ -43,17 +43,14 @@
 #include "QskSelectionWindow.h"
 #include "QskWindow.h"
 
-#include <QList>
-#include <QStringList>
-#include <QMarginsF>
-#include <QJSValueIterator>
-#include <QQmlEngine>
+#include <qstringlist.h>
+#include <qmargins.h>
+#include <qjsvalueiterator.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qqmlmetatype_p.h>
 #include <private/qqmlglobal_p.h>
 #include <private/qvariantanimation_p.h>
-#include <private/qmetaobjectbuilder_p.h>
 QSK_QT_PRIVATE_END
 
 #define QSK_MODULE_NAME "Skinny"

src/common/QskObjectCounter.cpp

@@ -4,9 +4,9 @@
  *****************************************************************************/
 
 #include "QskObjectCounter.h"
-#include <QQuickItem>
-#include <QSet>
-#include <QDebug>
+
+#include <qset.h>
+#include <qdebug.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qhooks_p.h>

src/common/QskSizePolicy.cpp

@@ -4,7 +4,6 @@
  *****************************************************************************/
 
 #include "QskSizePolicy.h"
-#include <QDebug>
 
 QskSizePolicy::Policy QskSizePolicy::policy( Qt::Orientation orientation ) const
 {
@@ -22,6 +21,8 @@ void QskSizePolicy::setPolicy( Qt::Orientation orientation, Policy policy )
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 QDebug operator<<( QDebug debug, const QskSizePolicy& policy )
 {
     QDebugStateSaver saver( debug );

src/common/QskSizePolicy.h

@@ -7,7 +7,7 @@
 #define QSK_SIZE_POLICY_H_
 
 #include "QskGlobal.h"
-#include <QMetaType>
+#include <qmetatype.h>
 
 class QDebug;
 

src/common/QskTextColors.cpp

@@ -6,9 +6,8 @@
 #include "QskTextColors.h"
 #include "QskRgbValue.h"
 
-#include <QVariant>
+#include <qvariant.h>
 #include <qhashfunctions.h>
-#include <QDebug>
 
 uint QskTextColors::hash( uint seed ) const
 {
@@ -42,6 +41,8 @@ QVariant QskTextColors::interpolate( const QskTextColors& from,
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 static inline void qskDebugColor( QDebug debug, const QColor& c )
 {
     debug << '('

src/common/QskTextColors.h

@@ -7,8 +7,8 @@
 #define QSK_TEXT_COLORS_H
 
 #include "QskGlobal.h"
-#include <QColor>
-#include <QMetaType>
+#include <qcolor.h>
+#include <qmetatype.h>
 
 class QDebug;
 class QVariant;

src/common/QskTextOptions.cpp

@@ -4,8 +4,7 @@
  *****************************************************************************/
 
 #include "QskTextOptions.h"
-#include <QTextDocument>
-#include <QDebug>
+#include <qtextdocument.h>
 #include <limits>
 
 QskTextOptions::QskTextOptions():
@@ -135,6 +134,8 @@ uint qHash( const QskTextOptions &options, uint seed ) noexcept
 
 #ifndef QT_NO_DEBUG_STREAM
 
+#include <qdebug.h>
+
 QDebug operator<<( QDebug debug, const QskTextOptions& options )
 {
     QDebugStateSaver saver( debug );

src/common/QskTextOptions.h

@@ -7,8 +7,8 @@
 #define QSK_TEXT_OPTIONS_H
 
 #include "QskGlobal.h"
-#include <QMetaType>
-#include <QTextOption>
+#include <qmetatype.h>
+#include <qtextoption.h>
 
 class QDebug;
 

src/controls/QskAbstractButton.cpp

@@ -8,7 +8,7 @@
 #include "QskEvent.h"
 #include "QskQuick.h"
 
-#include <QBasicTimer>
+#include <qbasictimer.h>
 
 QSK_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 )
 QSK_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 4 )

src/controls/QskAnimationHint.h

@@ -8,8 +8,8 @@
 
 #include "QskGlobal.h"
 
-#include <QEasingCurve>
-#include <QMetaType>
+#include <qeasingcurve.h>
+#include <qmetatype.h>
 
 class QSK_EXPORT QskAnimationHint
 {

src/controls/QskAnimator.cpp

@@ -5,12 +5,15 @@
 
 #include "QskAnimator.h"
 
-#include <QObject>
-#include <QVector>
-#include <QQuickWindow>
-#include <QElapsedTimer>
-#include <QGlobalStatic>
-#include <QDebug>
+#include <qobject.h>
+#include <qvector.h>
+#include <qquickwindow.h>
+#include <qelapsedtimer.h>
+#include <qglobalstatic.h>
+
+#ifndef QT_NO_DEBUG_STREAM
+#include <qdebug.h>
+#endif
 
 namespace
 {

src/controls/QskAnimator.h

@@ -7,8 +7,8 @@
 #define QSK_ANIMATOR_H
 
 #include "QskGlobal.h"
-#include <QEasingCurve>
-#include <QMetaObject>
+#include <qeasingcurve.h>
+#include <qobjectdefs.h>
 
 class QQuickWindow;
 class QObject;

src/controls/QskControl.cpp

@@ -7,15 +7,14 @@
 #include "QskQuick.h"
 #include "QskAspect.h"
 #include "QskSetup.h"
-#include "QskSkinlet.h"
-#include "QskSkin.h"
 #include "QskEvent.h"
 #include "QskDirtyItemFilter.h"
 #include "QskSkinHintTable.h"
+#include "QskSkin.h"
 
-#include <QLocale>
-#include <QVector>
-#include <QGlobalStatic>
+#include <qlocale.h>
+#include <qvector.h>
+#include <qglobalstatic.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickitem_p.h>
@@ -26,7 +25,6 @@ QSK_QT_PRIVATE_END
 
 #include <limits>
 #include <unordered_set>
-#include <unordered_map>
 
 QSK_STATE( QskControl, Disabled, QskAspect::FirstSystemState )
 QSK_STATE( QskControl, Hovered, QskAspect::LastSystemState >> 1 )

src/controls/QskControl.h

@@ -12,8 +12,8 @@
 #include "QskSizePolicy.h"
 #include "QskAspect.h"
 
-#include <QQuickItem>
-#include <QLocale>
+#include <qquickitem.h>
+#include <qlocale.h>
 
 #include <memory>
 

src/controls/QskDirtyItemFilter.cpp

@@ -4,11 +4,8 @@
  *****************************************************************************/
 
 #include "QskDirtyItemFilter.h"
-#include "QskWindow.h"
 #include "QskControl.h"
 
-#include <QQuickWindow>
-
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickwindow_p.h>
 #include <private/qquickitem_p.h>

src/controls/QskDirtyItemFilter.h

@@ -8,8 +8,8 @@
 
 #include "QskGlobal.h"
 
-#include <QObject>
-#include <QSet>
+#include <qobject.h>
+#include <qset.h>
 
 class QQuickWindow;
 class QQuickItem;

src/controls/QskEvent.cpp

@@ -1,6 +1,7 @@
 #include "QskEvent.h"
 #include "QskGesture.h"
-#include <QKeyEvent>
+
+#include <qevent.h>
 
 static void qskRegisterEventTypes()
 {

src/controls/QskEvent.h

@@ -9,8 +9,8 @@
 #include "QskGlobal.h"
 #include "QskAspect.h"
 
-#include <QEvent>
-#include <QRectF>
+#include <qcoreevent.h>
+#include <qrect.h>
 
 class QskGesture;
 class QQuickWindow;

src/controls/QskFocusIndicator.cpp

@@ -5,11 +5,10 @@
 
 #include "QskFocusIndicator.h"
 #include "QskQuick.h"
-#include "QskBoxNode.h"
 #include "QskAspect.h"
 #include "QskEvent.h"
 
-#include <QQuickWindow>
+#include <qquickwindow.h>
 
 QSK_SUBCONTROL( QskFocusIndicator, Panel )
 

src/controls/QskGesture.h

@@ -8,8 +8,8 @@
 
 #include "QskGlobal.h"
 
-#include <QPointF>
-#include <QMetaType>
+#include <qpoint.h>
+#include <qmetatype.h>
 
 class QSK_EXPORT QskGesture
 {

src/controls/QskGestureRecognizer.cpp

@@ -1,12 +1,12 @@
 #include "QskGestureRecognizer.h"
 
-#include <QQuickWindow>
-#include <QQuickItem>
-#include <QCoreApplication>
-#include <QBasicTimer>
-#include <QScopedPointer>
-#include <QMouseEvent>
-#include <QVector>
+#include <qquickwindow.h>
+#include <qquickitem.h>
+#include <qcoreapplication.h>
+#include <qcoreevent.h>
+#include <qbasictimer.h>
+#include <qscopedpointer.h>
+#include <qvector.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickwindow_p.h>

src/controls/QskGestureRecognizer.h

@@ -7,7 +7,8 @@
 #define QSK_GESTURE_RECOGNIZER_H
 
 #include "QskGlobal.h"
-#include <Qt>
+
+#include <qnamespace.h>
 #include <memory>
 
 class QQuickItem;

src/controls/QskGraphicLabel.cpp

@@ -6,12 +6,10 @@
 #include "QskGraphicLabel.h"
 #include "QskGraphic.h"
 #include "QskGraphicProvider.h"
-#include "QskGraphicTextureFactory.h"
 #include "QskAspect.h"
 #include "QskSetup.h"
 #include "QskSkin.h"
-
-#include <QtMath>
+#include "QskColorFilter.h"
 
 QSK_SUBCONTROL( QskGraphicLabel, Graphic )
 

src/controls/QskGraphicLabelSkinlet.cpp

@@ -5,10 +5,9 @@
 
 #include "QskGraphicLabelSkinlet.h"
 #include "QskGraphicLabel.h"
-#include "QskGraphic.h"
-#include "QskGraphicTextureFactory.h"
 #include "QskAspect.h"
-#include "QskSkin.h"
+#include "QskGraphic.h"
+#include "QskColorFilter.h"
 #include "QskTextureNode.h"
 #include "QskFunctions.h"
 

src/controls/QskHintAnimator.cpp

@@ -7,12 +7,9 @@
 #include "QskAnimationHint.h"
 #include "QskControl.h"
 #include "QskEvent.h"
-#include "QskMargins.h"
-#include "QskBoxBorderMetrics.h"
-#include "QskBoxShapeMetrics.h"
 
-#include <QObject>
-#include <QThread>
+#include <qobject.h>
+#include <qthread.h>
 
 #include <map>
 #include <vector>

src/controls/QskHintAnimator.h

@@ -10,7 +10,7 @@
 #include "QskVariantAnimator.h"
 #include "QskAspect.h"
 
-#include <QPointer>
+#include <qpointer.h>
 
 class QskControl;
 class QskAnimationHint;
@@ -26,7 +26,7 @@ public:
     void setAspect( QskAspect::Aspect );
     QskAspect::Aspect aspect() const;
 
-    void setControl( QskControl* control );
+    void setControl( QskControl* );
     QskControl* control() const;
 
     virtual void advance( qreal value ) override;

src/controls/QskInputGrabber.cpp

@@ -5,8 +5,8 @@
 
 #include "QskInputGrabber.h"
 #include "QskWindow.h"
-#include "QskQuick.h"
-#include <QPointer>
+
+#include <qpointer.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickitem_p.h>

src/controls/QskListViewSkinlet.cpp

@@ -5,17 +5,13 @@
 
 #include "QskListViewSkinlet.h"
 #include "QskListView.h"
-#include "QskAspect.h"
-#include "QskTextOptions.h"
-#include "QskTextNode.h"
-#include "QskGraphic.h"
-#include "QskGraphicNode.h"
 #include "QskColorFilter.h"
+#include "QskGraphic.h"
 
-#include <QSGSimpleRectNode>
-#include <QSGTransformNode>
-#include <QTransform>
-#include <QtMath>
+#include <qsgnode.h>
+#include <qsgsimplerectnode.h>
+#include <qtransform.h>
+#include <qmath.h>
 
 class QskListViewNode final : public QSGTransformNode
 {

src/controls/QskObjectTree.cpp

@@ -4,9 +4,10 @@
  *****************************************************************************/
 
 #include "QskObjectTree.h"
-#include <QQuickWindow>
-#include <QQuickItem>
-#include <QGuiApplication>
+
+#include <qquickwindow.h>
+#include <qquickitem.h>
+#include <qguiapplication.h>
 
 bool QskObjectTree::isRoot( const QObject* object )
 {

src/controls/QskObjectTree.h

@@ -10,7 +10,7 @@
 #include "QskControl.h"
 #include "QskWindow.h"
 
-#include <QVariant>
+#include <qvariant.h>
 
 namespace QskObjectTree
 {

src/controls/QskPageIndicator.cpp

@@ -4,7 +4,6 @@
  *****************************************************************************/
 
 #include "QskPageIndicator.h"
-#include "QskPageIndicatorSkinlet.h"
 #include "QskAspect.h"
 
 QSK_SUBCONTROL( QskPageIndicator, Panel )

src/controls/QskPanGestureRecognizer.cpp

@@ -2,10 +2,10 @@
 #include "QskGesture.h"
 #include "QskEvent.h"
 
-#include <QQuickItem>
-#include <QCoreApplication>
-#include <QtMath>
-#include <QLineF>
+#include <qquickitem.h>
+#include <qcoreapplication.h>
+#include <qmath.h>
+#include <qline.h>
 
 static inline qreal qskDistance( const QPointF& from, const QPointF& to,
     Qt::Orientations orientations )

src/controls/QskPopup.cpp

@@ -8,10 +8,8 @@
 #include "QskAspect.h"
 #include "QskWindow.h"
 #include "QskQuick.h"
-#include <QtMath>
 
 QSK_QT_PRIVATE_BEGIN
-#include <private/qquickitem_p.h>
 #include <private/qquickwindow_p.h>
 QSK_QT_PRIVATE_END
 

src/controls/QskPushButton.cpp

@@ -14,7 +14,7 @@
 #include "QskSetup.h"
 #include "QskSkinlet.h"
 
-#include <QFontMetricsF>
+#include <qfontmetrics.h>
 
 QSK_SUBCONTROL( QskPushButton, Panel )
 QSK_SUBCONTROL( QskPushButton, Text )

src/controls/QskPushButtonSkinlet.cpp

@@ -8,8 +8,8 @@
 #include "QskGraphic.h"
 #include "QskTextOptions.h"
 
-#include <QFontMetrics>
-#include <QtMath>
+#include <qfontmetrics.h>
+#include <qmath.h>
 
 QskPushButtonSkinlet::QskPushButtonSkinlet( QskSkin* skin ):
     Inherited( skin )

src/controls/QskQuick.cpp

@@ -5,6 +5,7 @@
 
 #include "QskQuick.h"
 #include "QskControl.h"
+#include <qquickitem.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickitem_p.h>

src/controls/QskQuick.h

@@ -7,7 +7,12 @@
 #define QSK_QUICK_H 1
 
 #include "QskGlobal.h"
-#include <QQuickItem>
+#include <qnamespace.h>
+
+class QQuickItem;
+class QSGNode;
+class QRectF;
+template <typename T> class QList;
 
 /*
     Exporting methods from QQuickItemPrivate, that should be part

src/controls/QskRangeControl.cpp

@@ -4,7 +4,6 @@
  *****************************************************************************/
 
 #include "QskRangeControl.h"
-#include "QskAspect.h"
 #include "QskFunctions.h"
 
 class QskRangeControl::PrivateData

src/controls/QskRgbValue.h

@@ -7,7 +7,7 @@
 #define QSK_RGB_VALUE_H
 
 #include "QskGlobal.h"
-#include <QColor>
+#include <qcolor.h>
 
 #define QSK_RGB_VALUES \
     /* Web colors */ \

src/controls/QskScrollView.cpp

@@ -12,8 +12,6 @@
 #include "QskAspect.h"
 #include "QskEvent.h"
 
-#include <QSGNode>
-
 QSK_SUBCONTROL( QskScrollView, Panel )
 QSK_SUBCONTROL( QskScrollView, Viewport )
 QSK_SUBCONTROL( QskScrollView, HorizontalScrollBar )

src/controls/QskScrollViewSkinlet.cpp

@@ -7,10 +7,8 @@
 #include "QskScrollView.h"
 #include "QskQuick.h"
 #include "QskAspect.h"
-#include "QskFunctions.h"
 
-#include <QTransform>
-#include <QSGNode>
+#include <qsgnode.h>
 
 static void qskAlignedHandle( qreal start, qreal end,
     qreal scrollBarLength, qreal minHandleLength,

src/controls/QskSetup.cpp

@@ -11,11 +11,9 @@
 #include "QskWindow.h"
 #include "QskObjectTree.h"
 
-#include <QGuiApplication>
-#include <QStyleHints>
-
-#include <QPointer>
-#include <QDebug>
+#include <qpointer.h>
+#include <qguiapplication.h>
+#include <qstylehints.h>
 
 QskSetup* QskSetup::s_instance = nullptr;
 

src/controls/QskShortcut.cpp

@@ -5,9 +5,13 @@
 
 #include "QskShortcut.h"
 #include "QskShortcutMap.h"
-#include <QQuickItem>
-#include <QQuickWindow>
+
+#include <qquickitem.h>
+#include <qquickwindow.h>
+
+QSK_QT_PRIVATE_BEGIN
 #include <QtGui/private/qguiapplication_p.h>
+QSK_QT_PRIVATE_END
 
 static inline QShortcutMap& qskShortcutMap()
 {

src/controls/QskShortcut.h

@@ -8,9 +8,10 @@
 
 #include "QskGlobal.h"
 
-#include <QObject>
-#include <QQmlParserStatus>
-#include <Qt>
+#include <qobject.h>
+#include <qqmlparserstatus.h>
+#include <qnamespace.h>
+
 #include <memory>
 
 class QKeySequence;

src/controls/QskShortcutMap.cpp

@@ -4,14 +4,15 @@
  *****************************************************************************/
 
 #include "QskShortcutMap.h"
-#include "QskControl.h"
 #include "QskQuick.h"
 #include "QskMetaInvokable.h"
 
-#include <QQuickWindow>
-#include <QKeySequence>
-#include <QGlobalStatic>
+#include <qquickitem.h>
+#include <qkeysequence.h>
+
+QSK_QT_PRIVATE_BEGIN
 #include <QtGui/private/qguiapplication_p.h>
+QSK_QT_PRIVATE_END
 
 #include <map>
 

src/controls/QskShortcutMap.h

@@ -9,7 +9,7 @@
 #include "QskGlobal.h"
 #include "QskMetaFunction.h"
 
-#include <QQuickWindow>
+#include <qquickwindow.h>
 
 class QQuickItem;
 class QKeySequence;

src/controls/QskSimpleListBox.cpp

@@ -5,7 +5,8 @@
 
 #include "QskSimpleListBox.h"
 #include "QskAspect.h"
-#include <QFontMetricsF>
+
+#include <qfontmetrics.h>
 
 static inline qreal qskMaxWidth(
     const QFont& font, const QStringList& list )

src/controls/QskSimpleListBox.h

@@ -8,7 +8,8 @@
 
 #include "QskGlobal.h"
 #include "QskListView.h"
-#include <QStringList>
+
+#include <qstringlist.h>
 
 class QSK_EXPORT QskSimpleListBox : public QskListView
 {

src/controls/QskSkin.cpp

@@ -9,13 +9,10 @@
 #include "QskGraphic.h"
 #include "QskColorFilter.h"
 #include "QskGraphicProviderMap.h"
-#include "QskSetup.h"
 #include "QskAnimationHint.h"
 #include "QskStandardSymbol.h"
 #include "QskSkinHintTable.h"
 
-#include "QskFocusIndicator.h"
-
 QSK_QT_PRIVATE_BEGIN
 #include <private/qguiapplication_p.h>
 QSK_QT_PRIVATE_END
@@ -23,11 +20,7 @@ QSK_QT_PRIVATE_END
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformdialoghelper.h>
 
-#include <QtAlgorithms>
-
-#include <algorithm>
 #include <unordered_map>
-#include <unordered_set>
 #include <cmath>
 
 #include "QskBox.h"

src/controls/QskSkin.h

@@ -9,8 +9,8 @@
 #include "QskGlobal.h"
 #include "QskAspect.h"
 
-#include <QObject>
-#include <QColor>
+#include <qobject.h>
+#include <qcolor.h>
 
 #include <unordered_map>
 #include <memory>

src/controls/QskSkinFactory.h

@@ -7,7 +7,7 @@
 #define QSK_SKIN_FACTORY_H
 
 #include "QskGlobal.h"
-#include <QObject>
+#include <qobject.h>
 
 class QskSkin;
 class QStringList;

src/controls/QskSkinHintTable.h

@@ -15,11 +15,10 @@
 #include "QskBoxBorderColors.h"
 #include "QskAnimationHint.h"
 
-#include <QVariant>
-#include <QColor>
+#include <qvariant.h>
+#include <qcolor.h>
 
 #include <unordered_map>
-#include <set>
 
 class QSK_EXPORT QskSkinHintTable
 {

src/controls/QskSkinManager.cpp

@@ -6,14 +6,14 @@
 #include "QskSkinManager.h"
 #include "QskSkinFactory.h"
 
-#include <QGlobalStatic>
-#include <QDir>
-#include <QPluginLoader>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QMap>
-#include <QSet>
-#include <QPointer>
+#include <qglobalstatic.h>
+#include <qdir.h>
+#include <qpluginloader.h>
+#include <qjsonobject.h>
+#include <qjsonarray.h>
+#include <qmap.h>
+#include <qset.h>
+#include <qpointer.h>
 
 /*
     We could use QFactoryLoader, but as it is again a "private" class

src/controls/QskSkinManager.h

@@ -7,7 +7,7 @@
 #define QSK_SKIN_MANAGER_H
 
 #include "QskGlobal.h"
-#include <QObject>
+#include <qobject.h>
 #include <memory>
 
 class QskSkin;

src/controls/QskSkinTransition.cpp

@@ -5,12 +5,12 @@
 #include "QskColorFilter.h"
 #include "QskHintAnimator.h"
 
-#include <QGuiApplication>
-#include <QQuickWindow>
-#include <QVector>
-#include <QObject>
-#include <QPointer>
-#include <QGlobalStatic>
+#include <qguiapplication.h>
+#include <qquickwindow.h>
+#include <qvector.h>
+#include <qobject.h>
+#include <qvector.h>
+#include <qglobalstatic.h>
 
 #include <unordered_map>
 #include <vector>

src/controls/QskSkinTransition.h

@@ -5,7 +5,6 @@
 #include "QskAspect.h"
 #include "QskAnimationHint.h"
 
-class QskAnimatorHint;
 class QskSkin;
 class QVariant;
 

src/controls/QskSkinlet.cpp

@@ -6,8 +6,6 @@
 #include "QskSkinlet.h"
 
 #include "QskAspect.h"
-#include "QskSetup.h"
-#include "QskSkin.h"
 #include "QskControl.h"
 #include "QskBoxShapeMetrics.h"
 #include "QskBoxBorderMetrics.h"
@@ -22,11 +20,9 @@
 #include "QskGraphicTextureFactory.h"
 #include "QskFunctions.h"
 
-#include <QQuickWindow>
-#include <QGuiApplication>
-#include <QSGSimpleRectNode>
-
-#include <unordered_map>
+#include <qquickwindow.h>
+#include <qguiapplication.h>
+#include <qsgsimplerectnode.h>
 
 static const int qskBackgroundRole = 254;
 static const int qskDebugRole = 253;

src/controls/QskSkinlet.h

@@ -9,8 +9,9 @@
 #include "QskGlobal.h"
 #include "QskAspect.h"
 
-#include <Qt>
-#include <QRectF>
+#include <qnamespace.h>
+#include <qrect.h>
+
 #include <memory>
 
 class QskSkin;

src/controls/QskSkinnable.cpp

@@ -17,9 +17,7 @@
 #include "QskColorFilter.h"
 #include "QskSkinTransition.h"
 
-#include <QFont>
-#include <QElapsedTimer>
-#include <QMarginsF>
+#include <qfont.h>
 
 #define DEBUG_MAP 0
 #define DEBUG_ANIMATOR 0

src/controls/QskSkinnable.h

@@ -9,7 +9,7 @@
 #include "QskGlobal.h"
 #include "QskAspect.h"
 
-#include <QVariant>
+#include <qvariant.h>
 #include <memory>
 
 typedef unsigned int QRgb;
@@ -19,7 +19,6 @@ class QColor;
 class QFont;
 class QMarginsF;
 struct QMetaObject;
-class QVariant;
 class QDebug;
 
 class QSGNode;

src/controls/QskSlider.cpp

@@ -7,8 +7,6 @@
 #include "QskAspect.h"
 #include "QskAnimationHint.h"
 
-#include <QtMath>
-
 QSK_SUBCONTROL( QskSlider, Panel )
 QSK_SUBCONTROL( QskSlider, Groove )
 QSK_SUBCONTROL( QskSlider, Fill )

src/controls/QskStatusIndicator.cpp

@@ -7,7 +7,8 @@
 #include "QskGraphic.h"
 #include "QskColorFilter.h"
 #include "QskGraphicProvider.h"
-#include <QDebug>
+
+#include <qdebug.h>
 
 QSK_SUBCONTROL( QskStatusIndicator, Graphic )
 

src/controls/QskStatusIndicatorSkinlet.cpp

@@ -6,10 +6,8 @@
 #include "QskStatusIndicatorSkinlet.h"
 #include "QskStatusIndicator.h"
 #include "QskGraphic.h"
-#include "QskGraphicTextureFactory.h"
+#include "QskColorFilter.h"
 #include "QskAspect.h"
-#include "QskSkin.h"
-#include "QskTextureNode.h"
 #include "QskFunctions.h"
 
 QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin ):

src/controls/QskSubWindow.cpp

@@ -6,12 +6,8 @@
 #include "QskSubWindow.h"
 #include "QskQuick.h"
 #include "QskAspect.h"
-#include "QskSkin.h"
 #include "QskFunctions.h"
 
-#include <QQuickWindow>
-#include <QtMath>
-
 QSK_SUBCONTROL( QskSubWindow, Panel )
 QSK_SUBCONTROL( QskSubWindow, TitleBar )
 

src/controls/QskSubWindowArea.cpp

@@ -8,7 +8,7 @@
 #include "QskFunctions.h"
 #include "QskEvent.h"
 
-#include <QTimer>
+#include <qtimer.h>
 
 QSK_SUBCONTROL( QskSubWindowArea, Panel )
 

src/controls/QskSubWindowSkinlet.cpp

@@ -8,7 +8,7 @@
 #include "QskAspect.h"
 #include "QskBoxBorderMetrics.h"
 
-#include <QFontMetricsF>
+#include <qfontmetrics.h>
 
 QskSubWindowSkinlet::QskSubWindowSkinlet( QskSkin* skin ):
     Inherited( skin )

src/controls/QskTabButton.cpp

@@ -8,8 +8,8 @@
 #include "QskTextOptions.h"
 #include "QskSkinlet.h"
 
-#include <QFontMetricsF>
-#include <QPointer>
+#include <qfontmetrics.h>
+#include <qpointer.h>
 
 QSK_SUBCONTROL( QskTabButton, Panel )
 QSK_SUBCONTROL( QskTabButton, Text )

src/controls/QskTabButtonSkinlet.cpp

@@ -5,9 +5,6 @@
 
 #include "QskTabButtonSkinlet.h"
 #include "QskTabButton.h"
-#include "QskTextRenderer.h"
-#include "QskTabBar.h"
-#include "QskTabButton.h"
 #include "QskTextOptions.h"
 
 QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin ):

src/controls/QskTextLabel.cpp

@@ -8,8 +8,8 @@
 #include "QskTextOptions.h"
 #include "QskTextRenderer.h"
 
-#include <QFontMetricsF>
-#include <QtMath>
+#include <qfontmetrics.h>
+#include <qmath.h>
 
 QSK_SUBCONTROL( QskTextLabel, Text )
 

src/controls/QskVariantAnimator.cpp

@@ -15,8 +15,11 @@
 // Even if we don't use the standard Qt animation system we
 // use its registry of interpolators: why adding our own ...
 
-#include <QVariantAnimation>
+#include <qvariantanimation.h>
+
+QSK_QT_PRIVATE_BEGIN
 #include <private/qvariantanimation_p.h>
+QSK_QT_PRIVATE_END
 
 #if 1
 static void qskRegisterInterpolator()

src/controls/QskVariantAnimator.h

@@ -8,7 +8,7 @@
 
 #include "QskGlobal.h"
 #include "QskAnimator.h"
-#include <QVariant>
+#include <qvariant.h>
 
 class QSK_EXPORT QskVariantAnimator : public QskAnimator
 {

src/controls/QskWindow.cpp

@@ -6,13 +6,11 @@
 #include "QskWindow.h"
 #include "QskControl.h"
 #include "QskQuick.h"
-#include "QskAspect.h"
 #include "QskSetup.h"
-#include "QskSkin.h"
 #include "QskEvent.h"
 
-#include <QtMath>
-#include <QPointer>
+#include <qmath.h>
+#include <qpointer.h>
 
 QSK_QT_PRIVATE_BEGIN
 #include <private/qquickitem_p.h>

src/controls/QskWindow.h

@@ -7,7 +7,7 @@
 #define QSK_WINDOW_H 1
 
 #include "QskGlobal.h"
-#include <QQuickWindow>
+#include <qquickwindow.h>
 
 class QskWindowPrivate;
 class QskObjectAttributes;

src/dialogs/QskDialog.cpp

@@ -14,11 +14,10 @@
 
 #include "QskFocusIndicator.h"
 #include "QskStandardSymbol.h"
-#include "QskAspect.h"
 
-#include <QPointer>
-#include <QQuickWindow>
-#include <QGuiApplication>
+#include <qpointer.h>
+#include <qquickwindow.h>
+#include <qguiapplication.h>
 
 static QskDialog::DialogCode qskExec( QskDialogWindow* dialogWindow )
 {

src/dialogs/QskDialog.h

@@ -7,7 +7,7 @@
 #define QSK_DIALOG_H 1
 
 #include "QskGlobal.h"
-#include <QObject>
+#include <qobject.h>
 #include <memory>
 
 class QString;

src/dialogs/QskDialogButtonBox.cpp

@@ -8,11 +8,14 @@
 #include "QskLinearBox.h"
 #include "QskSkin.h"
 
-#include <QKeyEvent>
-#include <private/qguiapplication_p.h>
+#include <qevent.h>
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformdialoghelper.h>
 
+QSK_QT_PRIVATE_BEGIN
+#include <private/qguiapplication_p.h>
+QSK_QT_PRIVATE_END
+
 QSK_SUBCONTROL( QskDialogButtonBox, Panel )
 
 static void qskSendEventTo( QObject* object, QEvent::Type type )

src/dialogs/QskDialogSubWindow.cpp

@@ -4,8 +4,9 @@
  *****************************************************************************/
 
 #include "QskDialogSubWindow.h"
-#include <QEventLoop>
-#include <QQuickWindow>
+
+#include <qeventloop.h>
+#include <qquickwindow.h>
 
 static inline void qskSetRejectOnClose( QskDialogSubWindow* subWindow, bool on )
 {