diff --git a/src/fwd_headers/kddockwidgets/KDDockWidgets.h b/src/fwd_headers/kddockwidgets/KDDockWidgets.h
index fd3fdb70..3f03c5da 100644
--- a/src/fwd_headers/kddockwidgets/KDDockWidgets.h
+++ b/src/fwd_headers/kddockwidgets/KDDockWidgets.h
@@ -10,10 +10,3 @@
 */
 
 #include "../../KDDockWidgets.h"
-
-class QWidget;
-
-namespace KDDockWidgets {
-// TODO remove
-using QWidgetOrQuick = QWidget;
-}
diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp
index ea4f15d3..2f91b359 100644
--- a/src/private/DragController.cpp
+++ b/src/private/DragController.cpp
@@ -741,7 +741,7 @@ bool DragController::eventFilter(QObject *o, QEvent *e)
     if (!me)
         return MinimalStateMachine::eventFilter(o, e);
 
-    auto w = qobject_cast<QWidgetOrQuick *>(o);
+    auto w = qobject_cast<QWidget *>(o);
     if (!w)
         return MinimalStateMachine::eventFilter(o, e);
 
@@ -788,7 +788,7 @@ StateBase *DragController::activeState() const
 }
 
 #if defined(Q_OS_WIN)
-static QWidgetOrQuick *qtTopLevelForHWND(HWND hwnd)
+static QWidget *qtTopLevelForHWND(HWND hwnd)
 {
     const QList<QWindow *> windows = qApp->topLevelWindows();
     for (QWindow *window : windows) {
@@ -822,7 +822,7 @@ static QWidgetOrQuick *qtTopLevelForHWND(HWND hwnd)
     return nullptr;
 }
 
-static QRect topLevelGeometry(const QWidgetOrQuick *topLevel)
+static QRect topLevelGeometry(const QWidget *topLevel)
 {
     if (auto mainWindow = qobject_cast<const MainWindowBase *>(topLevel))
         return mainWindow->windowGeometry();
diff --git a/tests/qtwidgets/tst_qtwidgets.cpp b/tests/qtwidgets/tst_qtwidgets.cpp
index 9de02b49..cd76e7df 100644
--- a/tests/qtwidgets/tst_qtwidgets.cpp
+++ b/tests/qtwidgets/tst_qtwidgets.cpp
@@ -45,6 +45,33 @@ using namespace KDDockWidgets::Controllers;
 using namespace KDDockWidgets::Tests;
 using namespace Layouting;
 
+inline Controllers::DockWidget *createDockWidget(const QString &name, QWidget *w,
+                                                 Controllers::DockWidget::Options options = {},
+                                                 Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},
+                                                 bool show = true,
+                                                 const QString &affinityName = {})
+{
+    w->setFocusPolicy(Qt::StrongFocus);
+    auto dock = new Controllers::DockWidget(name, options, layoutSaverOptions);
+    dock->setAffinityName(affinityName);
+    dock->setGuestView(std::shared_ptr<ViewWrapper>(new Views::ViewWrapper_qtwidgets(w)));
+    dock->setObjectName(name);
+    dock->view()->setGeometry(QRect(0, 0, 400, 400));
+    if (show) {
+        dock->show();
+        dock->dptr()->morphIntoFloatingWindow();
+        dock->view()->activateWindow();
+        Q_ASSERT(dock->window());
+        if (Platform::instance()->tests_waitForWindowActive(dock->view()->window(), 1000)) {
+            return dock;
+        }
+        qWarning() << Q_FUNC_INFO << "Couldn't activate window";
+        return nullptr;
+    } else {
+        return dock;
+    }
+};
+
 inline EmbeddedWindow *createEmbeddedMainWindow(QSize sz)
 {
     static int count = 0;
diff --git a/tests/utils.cpp b/tests/utils.cpp
index a120c490..e33b61a6 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -60,33 +60,6 @@ KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOption
     return ptr;
 }
 
-Controllers::DockWidget *KDDockWidgets::Tests::createDockWidget(const QString &name, QWidgetOrQuick *w,
-                                                                Controllers::DockWidget::Options options,
-                                                                Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions,
-                                                                bool show,
-                                                                const QString &affinityName)
-{
-    w->setFocusPolicy(Qt::StrongFocus);
-    auto dock = new Controllers::DockWidget(name, options, layoutSaverOptions);
-    dock->setAffinityName(affinityName);
-    dock->setGuestView(std::shared_ptr<ViewWrapper>(new Views::ViewWrapper_qtwidgets(w)));
-    dock->setObjectName(name);
-    dock->view()->setGeometry(QRect(0, 0, 400, 400));
-    if (show) {
-        dock->show();
-        dock->dptr()->morphIntoFloatingWindow();
-        dock->view()->activateWindow();
-        Q_ASSERT(dock->window());
-        if (Platform::instance()->tests_waitForWindowActive(dock->view()->window(), 1000)) {
-            return dock;
-        }
-        qWarning() << Q_FUNC_INFO << "Couldn't activate window";
-        return nullptr;
-    } else {
-        return dock;
-    }
-};
-
 Controllers::DockWidget *KDDockWidgets::Tests::createDockWidget(const QString &name, View *guest,
                                                                 Controllers::DockWidget::Options options,
                                                                 Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions,
diff --git a/tests/utils.h b/tests/utils.h
index a57e0e2b..22ed6ed8 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -137,11 +137,6 @@ std::unique_ptr<Controllers::MainWindow> createMainWindow(QSize sz = { 1000, 100
 
 std::unique_ptr<Controllers::MainWindow> createMainWindow(QVector<DockDescriptor> &docks);
 
-Controllers::DockWidget *createDockWidget(const QString &name, QWidgetOrQuick *w,
-                                          Controllers::DockWidget::Options options = {},
-                                          Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},
-                                          bool show = true, const QString &affinityName = {});
-
 Controllers::DockWidget *createDockWidget(const QString &name, View *guest,
                                           Controllers::DockWidget::Options options = {},
                                           Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},