diff --git a/src/Platform.h b/src/Platform.h
index e86d110a..9103fd75 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -148,9 +148,9 @@ public:
     virtual bool isLeftMouseButtonPressed() const = 0;
 
     /// @brief Returns all available screens
-    virtual Screen::List screens() const = 0;
+    virtual QVector<std::shared_ptr<Screen>> screens() const = 0;
 
-    virtual Screen::Ptr primaryScreen() const = 0;
+    virtual std::shared_ptr<Screen> primaryScreen() const = 0;
 
     /// @brief For non-C++, managed languages (having a VM) prints a non-native back-trace
     /// For example, the flutter frontend implements this to get a dart backtrace
diff --git a/src/View.h b/src/View.h
index f4ee9dee..31b26a5b 100644
--- a/src/View.h
+++ b/src/View.h
@@ -14,7 +14,6 @@
 #include "kddockwidgets/docks_export.h"
 #include "kddockwidgets/KDDockWidgets.h"
 #include "Controller.h"
-#include "Screen.h"
 
 #include <QSize> // TODOm4 Remove Qt headers, introduce Size and Rect structs
 #include <QRect>
@@ -222,7 +221,7 @@ public:
     bool equals(const std::shared_ptr<View> &) const;
     static bool equals(const View *one, const View *two);
 
-    Screen::Ptr screen() const;
+    std::shared_ptr<Screen> screen() const;
 
     /// @brief Returns the views's geometry, but always in global space
     QRect globalGeometry() const;
diff --git a/src/dummy/Platform_dummy.h b/src/dummy/Platform_dummy.h
index 707edc5e..c54d8ec3 100644
--- a/src/dummy/Platform_dummy.h
+++ b/src/dummy/Platform_dummy.h
@@ -38,8 +38,8 @@ public:
     bool inDisallowedDragView(QPoint globalPos) const override;
     bool usesFallbackMouseGrabber() const override;
     void ungrabMouse() override;
-    Screen::List screens() const override;
-    Screen::Ptr primaryScreen() const override;
+    QVector<std::shared_ptr<Screen>> screens() const override;
+    std::shared_ptr<Screen> primaryScreen() const override;
 
 
 #ifdef DOCKS_DEVELOPER_MODE
diff --git a/src/flutter/Platform_flutter.h b/src/flutter/Platform_flutter.h
index 81da8b14..4a77c74a 100644
--- a/src/flutter/Platform_flutter.h
+++ b/src/flutter/Platform_flutter.h
@@ -38,8 +38,8 @@ public:
     bool inDisallowedDragView(QPoint globalPos) const override;
     bool usesFallbackMouseGrabber() const override;
     void ungrabMouse() override;
-    Screen::List screens() const override;
-    Screen::Ptr primaryScreen() const override;
+    QVector<std::shared_ptr<Screen>> screens() const override;
+    std::shared_ptr<Screen> primaryScreen() const override;
 
 #ifdef DOCKS_DEVELOPER_MODE
     explicit Platform_flutter(int &argc, char **argv);
diff --git a/src/qtcommon/Platform_qt.h b/src/qtcommon/Platform_qt.h
index 546b3a6a..5fb0ee13 100644
--- a/src/qtcommon/Platform_qt.h
+++ b/src/qtcommon/Platform_qt.h
@@ -48,7 +48,7 @@ public:
     DisplayType displayType() const override;
     bool isLeftMouseButtonPressed() const override;
 
-    Screen::List screens() const override;
+    QVector<std::shared_ptr<Screen>> screens() const override;
 
     /// @brief Returns the specified QObject casted to View
     /// Nullptr if it's not a view. TODOm3: This is shared between the
@@ -58,7 +58,7 @@ public:
 
     static Platform_qt *instance();
 
-    Screen::Ptr primaryScreen() const override;
+    std::shared_ptr<Screen> primaryScreen() const override;
 
 #ifdef DOCKS_DEVELOPER_MODE
     static bool isGammaray();