diff --git a/src/main/io/cms.c b/src/main/io/cms.c
index 2d1b8a6021..e74cb7005e 100644
--- a/src/main/io/cms.c
+++ b/src/main/io/cms.c
@@ -37,11 +37,22 @@
 
 #include "io/cms.h"
 #include "io/cms_types.h"
-#include "io/canvas.h"
 
+#ifdef CANVAS
+#include "io/canvas.h"
+#endif
+
+#ifdef USE_FLASHFS
 #include "io/flashfs.h"
+#endif
+
+#ifdef OSD
 #include "io/osd.h"
+#endif
+
+#ifdef USE_DASHBOARD
 #include "io/dashboard.h"
+#endif
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"
@@ -53,8 +64,6 @@
 #include "config/config_master.h"
 #include "config/feature.h"
 
-#include "io/cms.h"
-
 #include "build/debug.h"
 
 // External menu contents