BUG: Fix haptic build, remove some includes

4 jobs for !838 with FixNonRenderBuild
latest merge request