diff --git a/main/actions/ledstripanimationactions.h b/main/actions/ledstripanimationactions.h
index 2d58f69..ed08b8f 100644
--- a/main/actions/ledstripanimationactions.h
+++ b/main/actions/ledstripanimationactions.h
@@ -9,6 +9,7 @@
 using namespace espgui;
 
 namespace {
+#ifdef FEATURE_LEDSTRIP
 template<int16_t type>
 class LedStripSetAnimationAction : public virtual ActionInterface
 {
@@ -35,4 +36,5 @@ public:
     void triggered() override { animation_type = LEDSTRIP_ANIMATION_TYPE_SPEEDSYNCANIMATION; }
 };
 */
+#endif
 }
diff --git a/main/actions/ledstripblinkactions.h b/main/actions/ledstripblinkactions.h
index 06c5f8d..f22efa5 100644
--- a/main/actions/ledstripblinkactions.h
+++ b/main/actions/ledstripblinkactions.h
@@ -8,6 +8,7 @@
 
 using namespace espgui;
 
+#ifdef FEATURE_LEDSTRIP
 namespace {
 class LedstripAnimationBlinkNoneAction : public virtual ActionInterface
 {
@@ -49,3 +50,4 @@ public:
     void triggered() override { blinkAnimation = LEDSTRIP_OVERWRITE_BLINKBOTH; }
 };
 }
+#endif
diff --git a/main/buildserver.h b/main/buildserver.h
index 5f1f8ca..b190c78 100644
--- a/main/buildserver.h
+++ b/main/buildserver.h
@@ -16,6 +16,7 @@
 // esp-idf
 #include "esp_http_client.h"
 
+#ifdef FEATURE_OTA
 namespace {
     void buildMenuFromJson(std::string json);
     void buildMenuRequestError(std::string error);
@@ -191,3 +192,4 @@ namespace {
         return request_running;
     }
 }
+#endif
diff --git a/main/displays/ledstripcolorsdisplay.cpp b/main/displays/ledstripcolorsdisplay.cpp
index 87bdbbe..22732eb 100644
--- a/main/displays/ledstripcolorsdisplay.cpp
+++ b/main/displays/ledstripcolorsdisplay.cpp
@@ -22,6 +22,7 @@
 #include "globals.h"
 #include "displays/menus/ledstripmenu.h"
 
+#ifdef FEATURE_LEDSTRIP
 int8_t selected_side = 7;
 int8_t selected_color;
 bool state_select_color{false};
@@ -238,3 +239,4 @@ void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color)
     }
     // espgui::tft.fillCircle(espgui::tft.width() / 2, 140, 100, TFT_BLACK);
 }
+#endif
diff --git a/main/displays/ledstripcolorsdisplay.h b/main/displays/ledstripcolorsdisplay.h
index 65fbcbd..bd14554 100644
--- a/main/displays/ledstripcolorsdisplay.h
+++ b/main/displays/ledstripcolorsdisplay.h
@@ -10,6 +10,7 @@
 // local includes
 #include "ledstrip.h"
 
+#ifdef FEATURE_LEDSTRIP
 extern int8_t selected_side;
 extern int8_t selected_color;
 extern bool state_select_color;
@@ -38,3 +39,4 @@ public:
 private:
     bool already_drew_circle{false};
 };
+#endif
diff --git a/main/displays/menus/cloudsettingsmenu.cpp b/main/displays/menus/cloudsettingsmenu.cpp
index ec4dd36..ec9f2f2 100644
--- a/main/displays/menus/cloudsettingsmenu.cpp
+++ b/main/displays/menus/cloudsettingsmenu.cpp
@@ -16,6 +16,7 @@
 #include "cloud.h"
 #include "displays/menus/settingsmenu.h"
 
+#ifdef FEATURE_CLOUD
 namespace {
 using CloudTransmitTimeoutChangeScreen = espgui::makeComponent<
     espgui::ChangeValueDisplay<int16_t>,
@@ -70,3 +71,4 @@ void CloudSettingsMenu::back()
 {
     switchScreen<SettingsMenu>();
 }
+#endif
diff --git a/main/displays/menus/ledstripselectanimationmenu.h b/main/displays/menus/ledstripselectanimationmenu.h
index 4a22635..8deae40 100644
--- a/main/displays/menus/ledstripselectanimationmenu.h
+++ b/main/displays/menus/ledstripselectanimationmenu.h
@@ -14,6 +14,7 @@
 #include "ledstrip.h"
 #include "ledstripdefines.h"
 
+#ifdef FEATURE_LEDSTRIP
 class currentSelectedAnimationText : public virtual TextInterface { public: std::string text() const override {
         switch (animation_type) {
             case LEDSTRIP_ANIMATION_TYPE_DEFAULTRAINBOW:
@@ -51,3 +52,4 @@ namespace  {
         }
     };
 } // Namespace
+#endif
diff --git a/main/displays/menus/ledstripselectblinkmenu.h b/main/displays/menus/ledstripselectblinkmenu.h
index cbb862a..e565bf2 100644
--- a/main/displays/menus/ledstripselectblinkmenu.h
+++ b/main/displays/menus/ledstripselectblinkmenu.h
@@ -13,6 +13,7 @@
 #include "actions/switchscreenaction.h"
 #include "ledstripdefines.h"
 
+#ifdef FEATURE_LEDSTRIP
 class currentSelectedBlinkAnimationText : public virtual TextInterface { public: std::string text() const override {
         switch (blinkAnimation) {
             case LEDSTRIP_OVERWRITE_BLINKLEFT:
@@ -56,3 +57,4 @@ namespace {
         }
     };
 } // Namespace
+#endif
diff --git a/main/displays/menus/otamenu.cpp b/main/displays/menus/otamenu.cpp
index 422fafc..4770618 100644
--- a/main/displays/menus/otamenu.cpp
+++ b/main/displays/menus/otamenu.cpp
@@ -16,6 +16,7 @@
 #include "displays/menus/selectbuildservermenu.h"
 #include "displays/menus/mainmenu.h"
 
+#ifdef FEATURE_OTA
 namespace {
 
 class RedownloadJsonAction : public virtual espgui::ActionInterface
@@ -44,3 +45,4 @@ void OtaMenu::back()
 {
     switchScreen<MainMenu>();
 }
+#endif
diff --git a/main/displays/menus/selectbuildservermenu.cpp b/main/displays/menus/selectbuildservermenu.cpp
index cc9413b..be80491 100644
--- a/main/displays/menus/selectbuildservermenu.cpp
+++ b/main/displays/menus/selectbuildservermenu.cpp
@@ -10,6 +10,7 @@
 // local includes
 #include "displays/menus/settingsmenu.h"
 
+#ifdef FEATURE_OTA
 namespace {
 class BuildserverMenuItem : public espgui::MenuItem
 {
@@ -69,3 +70,4 @@ void SelectBuildServerMenu::back()
 {
     espgui::switchScreen<SettingsMenu>();
 }
+#endif
diff --git a/main/displays/menus/selectbuildservermenu.h b/main/displays/menus/selectbuildservermenu.h
index aae8471..be4ce41 100644
--- a/main/displays/menus/selectbuildservermenu.h
+++ b/main/displays/menus/selectbuildservermenu.h
@@ -11,6 +11,7 @@
 #include "globals.h"
 #include "buildserver.h"
 
+#ifdef FEATURE_OTA
 class SelectBuildServerMenu :
     public espgui::MenuDisplay,
     public espgui::StaticText<TEXT_SELECTBUILDSERVERMENU>
@@ -20,3 +21,4 @@ public:
 
     void back() override;
 };
+#endif
diff --git a/main/displays/menus/selectotabuildmenu.h b/main/displays/menus/selectotabuildmenu.h
index 3c9c051..746f104 100644
--- a/main/displays/menus/selectotabuildmenu.h
+++ b/main/displays/menus/selectotabuildmenu.h
@@ -20,6 +20,7 @@
 
 using namespace espgui;
 
+#ifdef FEATURE_OTA
 namespace {
 
 // ToDo: if (request_failed) => MESSAGE("An error occurred")
@@ -147,3 +148,4 @@ void SelectBuildMenu::buildMenuRequestError(std::string error)
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>,                SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 } // namespace
+#endif