diff --git a/main/actions/modesettingsaction.h b/main/actions/modesettingsaction.h
index 2d77b00..f321731 100644
--- a/main/actions/modesettingsaction.h
+++ b/main/actions/modesettingsaction.h
@@ -7,7 +7,9 @@
 #include "modes/larsmmode.h"
 #include "modes/gametrakmode.h"
 #include "modes/motortestmode.h"
+#ifdef FEATURE_JOYSTICK
 #include "modes/wheelchairmode.h"
+#endif
 #include "displays/menus/defaultmodesettingsmenu.h"
 #include "displays/menus/tempomatmodesettingsmenu.h"
 #include "displays/menus/larsmmodesettingsmenu.h"
diff --git a/main/displays/joystickdebugdisplay.h b/main/displays/joystickdebugdisplay.h
index 4b810a6..15b5f64 100644
--- a/main/displays/joystickdebugdisplay.h
+++ b/main/displays/joystickdebugdisplay.h
@@ -11,6 +11,7 @@
 #include "modeinterface.h"
 #include "modes/ignoreinputmode.h"
 
+#ifdef FEATURE_JOYSTICK
 class JoystickDebugDisplay : public BobbyDisplayWithTitle
 {
     using Base = BobbyDisplayWithTitle;
@@ -33,3 +34,4 @@ private:
 
     int16_t m_gasMin, m_gasMax, m_bremsMin, m_bremsMax, m_gasMitte, m_bremsMitte;
 };
+#endif