diff --git a/src/layouts/QskLinearLayoutEngine.cpp b/src/layouts/QskLinearLayoutEngine.cpp
index 9a277130..72fd6e35 100644
--- a/src/layouts/QskLinearLayoutEngine.cpp
+++ b/src/layouts/QskLinearLayoutEngine.cpp
@@ -4,7 +4,6 @@
  *****************************************************************************/
 
 #include "QskLinearLayoutEngine.h"
-
 #include "QskLayoutHint.h"
 #include "QskLayoutConstraint.h"
 #include "QskLayoutChain.h"
@@ -614,14 +613,14 @@ class QskLinearLayoutEngine::PrivateData
 
     EntryTable entryTable;
 
-    Qt::LayoutDirection visualDirection = Qt::LeftToRight;
-    Qt::Edges extraSpacingAt;
-
     QskLayoutChain colChain;
     QskLayoutChain rowChain;
 
     CellGeometries geometries;
 
+    Qt::LayoutDirection visualDirection = Qt::LeftToRight;
+    Qt::Edges extraSpacingAt;
+
     /*
         Some weired controls do lazy updates inside of their sizeHint calculation
         that lead to LayoutRequest events. While being in the process of
@@ -865,7 +864,7 @@ void QskLinearLayoutEngine::invalidate( int what )
 
 void QskLinearLayoutEngine::setGeometries( const QRectF& rect )
 {
-    if ( m_data->entryTable.count() == 0 )
+    if ( m_data->entryTable.effectiveCount() == 0 )
         return;
 
     if ( m_data->geometries.boundingSize != rect.size() )
diff --git a/src/layouts/QskLinearLayoutEngine.h b/src/layouts/QskLinearLayoutEngine.h
index 43328f7a..5c864ae1 100644
--- a/src/layouts/QskLinearLayoutEngine.h
+++ b/src/layouts/QskLinearLayoutEngine.h
@@ -6,11 +6,14 @@
 #ifndef QSK_LINEAR_LAYOUT_ENGINE_H
 #define QSK_LINEAR_LAYOUT_ENGINE_H
 
+#include "QskGlobal.h"
+
 #include <qnamespace.h>
-#include <qrect.h>
 #include <memory>
 
 class QQuickItem;
+class QSizeF;
+class QRectF;
 
 class QskLinearLayoutEngine
 {