diff --git a/sinqMotor b/sinqMotor
index 603b3e7..2f8ae23 160000
--- a/sinqMotor
+++ b/sinqMotor
@@ -1 +1 @@
-Subproject commit 603b3e77afcffbaa91ae42272a5b8687286f9c68
+Subproject commit 2f8ae23d579fc3fa16398efe8ebaf057a0d4ceef
diff --git a/src/turboPmacAxis.h b/src/turboPmacAxis.h
index 38bb445..5a98ab2 100644
--- a/src/turboPmacAxis.h
+++ b/src/turboPmacAxis.h
@@ -1,15 +1,11 @@
 #ifndef turboPmacAXIS_H
 #define turboPmacAXIS_H
-#include "sinqAxis.h"
+#include "sinqController.h"
+#include "turboPmacController.h"
 #include <memory>
 
 struct turboPmacAxisImpl;
 
-// Forward declaration of the controller class to resolve the cyclic dependency
-// between the controller and the axis .h-file. See
-// https://en.cppreference.com/w/cpp/language/class.
-class turboPmacController;
-
 class turboPmacAxis : public sinqAxis {
   public:
     /**
@@ -145,7 +141,7 @@ class turboPmacAxis : public sinqAxis {
     /**
      * @brief Return a pointer to the axis controller
      */
-    turboPmacController *pController() override { return pC_; };
+    virtual turboPmacController *pController() override { return pC_; };
 
   private:
     turboPmacController *pC_;
diff --git a/src/turboPmacController.h b/src/turboPmacController.h
index a886539..f9a8915 100644
--- a/src/turboPmacController.h
+++ b/src/turboPmacController.h
@@ -10,9 +10,13 @@
 #define turboPmacController_H
 #include "sinqAxis.h"
 #include "sinqController.h"
-#include "turboPmacAxis.h"
 #include <memory>
 
+// Forward declaration of the controller class to resolve the cyclic dependency
+// between the controller and the axis .h-file. See
+// https://en.cppreference.com/w/cpp/language/class.
+class turboPmacAxis;
+
 struct turboPmacControllerImpl;
 
 class turboPmacController : public sinqController {