4 files changed, 19 insertions, 16 deletions
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 3d94dcfb08b7..6b505ae4dfd3 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -29,6 +29,7 @@
 #include <svx/svdview.hxx>
 #include <memory>
 
+struct ImplSVEvent;
 class SdrView;
 class SdrObject;
 class SfxItemSet;
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 229c1f5988d0..236062d69670 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -26,7 +26,6 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
 #include <optional>
 
 class CommandEvent;
@@ -38,6 +37,10 @@ enum class TextDirectionality {
     BottomToTop_LeftToRight
 };
 
+namespace vcl {
+    class Window;
+}
+
 class VCL_DLLPUBLIC KeyEvent
 {
 private:
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index d0c56ea43090..d18bfc70e5f0 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -400,6 +400,20 @@ namespace o3tl
     template<> struct typed_flags<ShowFlags> : is_typed_flags<ShowFlags, 0x000e> {};
 }
 
+enum class TrackingEventFlags
+{
+    NONE           = 0x0000,
+    Cancel         = 0x0001,
+    Key            = 0x0002,
+    Focus          = 0x0004,
+    Repeat         = 0x0100,
+    End            = 0x1000,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<TrackingEventFlags> : is_typed_flags<TrackingEventFlags, 0x1107> {};
+}
+
 #endif // INCLUDED_VCL_VCLENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 095e597d6c28..4675d4254b30 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -101,21 +101,6 @@ namespace weld { class Window; }
 template<class T> class VclPtr;
 namespace tools { class JsonWriter; }
 
-enum class TrackingEventFlags
-{
-    NONE           = 0x0000,
-    Cancel         = 0x0001,
-    Key            = 0x0002,
-    Focus          = 0x0004,
-    Repeat         = 0x0100,
-    End            = 0x1000,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<TrackingEventFlags> : is_typed_flags<TrackingEventFlags, 0x1107> {};
-}
-
-
 // Type for GetWindow()
 enum class GetWindowType
 {