diff --git a/src/Config.cpp b/src/Config.cpp
index d6e16a81..2f0c864a 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -18,7 +18,7 @@
 
 #include "Config.h"
 #include "multisplitter/MultiSplitterConfig.h"
-#include "multisplitter/Widget_qwidget.h"
+#include "multisplitter/Widget.h"
 #include "DockRegistry_p.h"
 #include "FrameworkWidgetFactory.h"
 #include "Utils_p.h"
diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp
index 276cb464..3163d4f5 100644
--- a/src/private/DragController.cpp
+++ b/src/private/DragController.cpp
@@ -20,7 +20,7 @@
 #include "Qt5Qt6Compat_p.h"
 
 #include <QMouseEvent>
-#include <QApplication>
+#include <QGuiApplication>
 #include <QCursor>
 #include <QWindow>
 #include <QDrag>
diff --git a/src/private/Frame.cpp b/src/private/Frame.cpp
index cdf58a9b..13da0d30 100644
--- a/src/private/Frame.cpp
+++ b/src/private/Frame.cpp
@@ -650,7 +650,7 @@ QSize Frame::dockWidgetsMinSize() const
 {
     QSize size = Layouting::Item::hardcodedMinimumSize;
     for (DockWidgetBase *dw : dockWidgets())
-        size = size.expandedTo(Layouting::Widget_qwidget::widgetMinSize(dw));
+        size = size.expandedTo(Layouting::Widget::widgetMinSize(dw));
 
     return size;
 }
diff --git a/src/private/Frame_p.h b/src/private/Frame_p.h
index ce809b24..aadf0a98 100644
--- a/src/private/Frame_p.h
+++ b/src/private/Frame_p.h
@@ -23,11 +23,9 @@
 #include "kddockwidgets/QWidgetAdapter.h"
 #include "kddockwidgets/FocusScope.h"
 #include "../LayoutSaver_p.h"
-#include "multisplitter/Widget_qwidget.h"
+#include "multisplitter/Widget.h"
 #include "multisplitter/Item_p.h"
 
-
-#include <QWidget>
 #include <QVector>
 #include <QDebug>
 #include <QPointer>
diff --git a/src/private/MultiSplitter.cpp b/src/private/MultiSplitter.cpp
index d1646c76..77765f3a 100644
--- a/src/private/MultiSplitter.cpp
+++ b/src/private/MultiSplitter.cpp
@@ -29,7 +29,7 @@
 #include "DockRegistry_p.h"
 #include "Config.h"
 #include "FrameworkWidgetFactory.h"
-#include "multisplitter/Widget_qwidget.h"
+#include "multisplitter/Widget.h"
 #include "DropArea_p.h"
 #include "WindowBeingDragged_p.h"
 
diff --git a/src/private/Utils_p.h b/src/private/Utils_p.h
index 1c021358..2e745f02 100644
--- a/src/private/Utils_p.h
+++ b/src/private/Utils_p.h
@@ -130,11 +130,6 @@ inline int screenNumberForWindow(const QWindow *window)
     return -1;
 }
 
-inline bool isWindow(const QWidget *w)
-{
-    return w && w->isWindow();
-}
-
 inline bool isWindow(const QWindow *w)
 {
     return w != nullptr;
@@ -200,6 +195,11 @@ inline void activateWindow(QWidget *widget)
     widget->activateWindow();
 }
 
+inline bool isWindow(const QWidget *w)
+{
+    return w && w->isWindow();
+}
+
 #else
 
 inline int screenNumberForWidget(const QQuickItem *w)
diff --git a/src/private/WidgetResizeHandler.cpp b/src/private/WidgetResizeHandler.cpp
index 3e2b1236..92153090 100644
--- a/src/private/WidgetResizeHandler.cpp
+++ b/src/private/WidgetResizeHandler.cpp
@@ -325,15 +325,19 @@ void WidgetResizeHandler::setTarget(QWidgetOrQuick *w)
 
 void WidgetResizeHandler::updateCursor(CursorPosition m)
 {
+#ifdef KDDOCKWIDGETS_QTWIDGETS
     //Need for updating cursor when we change child widget
     const QObjectList children = mTarget->children();
     for (int i = 0, total = children.size(); i < total; ++i) {
-        if (auto child = qobject_cast<QWidget*>(children.at(i))) {
+        if (auto child = qobject_cast<WidgetType*>(children.at(i))) {
+
             if (!child->testAttribute(Qt::WA_SetCursor)) {
                 child->setCursor(Qt::ArrowCursor);
             }
         }
     }
+#endif
+
     switch (m) {
     case CursorPosition::TopLeft:
     case CursorPosition::BottomRight:
diff --git a/tests/Testing.h b/tests/Testing.h
index 0fe05380..7b735d72 100644
--- a/tests/Testing.h
+++ b/tests/Testing.h
@@ -24,7 +24,6 @@
 #include <QRect>
 #include <QVector>
 #include <QEvent>
-#include <QWidget>
 #include <QVariant>
 
 /**