diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp
index dc75d3c8..a5c376b2 100644
--- a/src/controls/QskGestureRecognizer.cpp
+++ b/src/controls/QskGestureRecognizer.cpp
@@ -11,13 +11,15 @@
 #include <qvector.h>
 
 QSK_QT_PRIVATE_BEGIN
+
 #include <private/qquickwindow_p.h>
-QSK_QT_PRIVATE_END
 
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 3, 0 )
 #include <private/qeventpoint_p.h>
 #endif
 
+QSK_QT_PRIVATE_END
+
 static QMouseEvent* qskClonedMouseEventAt(
     const QMouseEvent* event, QPointF* localPos )
 {
diff --git a/src/controls/QskQuickItem.cpp b/src/controls/QskQuickItem.cpp
index bcd95a1e..b60016eb 100644
--- a/src/controls/QskQuickItem.cpp
+++ b/src/controls/QskQuickItem.cpp
@@ -15,16 +15,21 @@
 #include <qquickwindow.h>
 
 #if defined( QT_DEBUG )
+
 QSK_QT_PRIVATE_BEGIN
+
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 )
     #ifndef emit
-        // qvariantanimation_p.h needs it
         #define emit
+        #include <private/qabstractanimation_p.h>
+        #undef emit
     #endif
 #endif
 
 #include <private/qquickpositioners_p.h>
+
 QSK_QT_PRIVATE_END
+
 #endif
 
 #include <unordered_set>
@@ -193,9 +198,9 @@ void QskQuickItem::classBegin()
 void QskQuickItem::componentComplete()
 {
 #if defined( QT_DEBUG )
-    if ( qobject_cast< const QQuickBasePositioner* >( parent() ) )
+    if ( d_func()->updateFlags & QskQuickItem::DeferredLayout )
     {
-        if ( d_func()->updateFlags & QskQuickItem::DeferredLayout )
+        if ( qobject_cast< const QQuickBasePositioner* >( parent() ) )
         {
             qWarning( "QskQuickItem in DeferredLayout mode under control of a positioner" );
         }
diff --git a/src/controls/QskVariantAnimator.cpp b/src/controls/QskVariantAnimator.cpp
index 9492106d..6372fbf0 100644
--- a/src/controls/QskVariantAnimator.cpp
+++ b/src/controls/QskVariantAnimator.cpp
@@ -21,14 +21,17 @@
 #include <qvariantanimation.h>
 
 QSK_QT_PRIVATE_BEGIN
+
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 )
     #ifndef emit
-        // qvariantanimation_p.h needs it
         #define emit
+        #include <private/qabstractanimation_p.h>
+        #undef emit
     #endif
 #endif
 
 #include <private/qvariantanimation_p.h>
+
 QSK_QT_PRIVATE_END
 
 #if 1