diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp
index 6f0ce2aa7..701271a6c 100644
--- a/src/toolbars/ToolDock.cpp
+++ b/src/toolbars/ToolDock.cpp
@@ -40,8 +40,6 @@
 #include <wx/window.h>
 #endif  /*  */
 
-#include "ToolManager.h"
-
 #include <algorithm>
 
 #include "../AColor.h"
@@ -378,7 +376,7 @@ END_EVENT_TABLE()
 //
 // Constructor
 //
-ToolDock::ToolDock( ToolManager *manager, wxWindow *parent, int dockid ):
+ToolDock::ToolDock( wxEvtHandler *manager, wxWindow *parent, int dockid ):
    wxPanelWrapper( parent, dockid, wxDefaultPosition, parent->GetSize() )
 {
    SetLabel( XO( "ToolDock" ) );
diff --git a/src/toolbars/ToolDock.h b/src/toolbars/ToolDock.h
index 0c152b7f9..c7099e836 100644
--- a/src/toolbars/ToolDock.h
+++ b/src/toolbars/ToolDock.h
@@ -27,7 +27,6 @@ class wxRect;
 class wxWindow;
 
 class GrabberEvent;
-class ToolManager;
 
 ////////////////////////////////////////////////////////////
 /// class ToolDock
@@ -290,7 +289,7 @@ class ToolDock final : public wxPanelWrapper
 {
 public:
 
-   ToolDock( ToolManager *manager, wxWindow *parent, int dockid );
+   ToolDock( wxEvtHandler *manager, wxWindow *parent, int dockid );
    ~ToolDock();
 
    bool AcceptsFocus() const override { return false; };
@@ -332,7 +331,7 @@ public:
 
 
 
-   ToolManager *mManager;
+   wxEvtHandler *mManager;
 
    // Stores adjacency relations that we want to realize in the dock layout
    ToolBarConfiguration mConfiguration;