diff --git a/meson.build b/meson.build
index 2b7f4663..ed6670fe 100644
--- a/meson.build
+++ b/meson.build
@@ -98,9 +98,14 @@ else
   codec2_dep  = dependency('codec2')
 endif
 
-# tinyusb, An open source cross-platform USB stack for embedded system
-tinyusb_proj = subproject('tinyusb')
-tinyusb_dep  = tinyusb_proj.get_variable('tinyusb_dep')
+# tinyusb, open source cross-platform USB stack for embedded system.
+# Subproject included only for embedded targets
+if meson.is_cross_build()
+  tinyusb_proj = subproject('tinyusb')
+  tinyusb_dep  = tinyusb_proj.get_variable('tinyusb_dep')
+else
+  tinyusb_dep = [ ]
+endif
 
 ##
 ## RTOS
@@ -111,10 +116,14 @@ rtos_inc = ['lib/miosix-kernel',
             'lib/miosix-kernel/arch/cortexM4_stm32f4/M4_openrtx',
             'lib/miosix-kernel/config/arch/cortexM4_stm32f4/M4_openrtx']
 
-
 src = openrtx_src + main_src + minmea_src
-inc = openrtx_inc + rtos_inc + minmea_inc + qdec_inc
-def = def + {'DONT_USE_CMSIS_INIT': ''}
+inc = openrtx_inc + minmea_inc + qdec_inc
+
+# Include RTOS only for embedded targets
+if meson.is_cross_build()
+  inc = inc + rtos_inc
+  def = def + {'DONT_USE_CMSIS_INIT': ''}
+endif
 
 ## Add git commit or tag to print in OpenRTX
 r = run_command('git', 'describe', '--tags', '--dirty')
diff --git a/openrtx/include/interfaces/keyboard.h b/openrtx/include/interfaces/keyboard.h
index 8112f22d..1ecd8f77 100644
--- a/openrtx/include/interfaces/keyboard.h
+++ b/openrtx/include/interfaces/keyboard.h
@@ -22,7 +22,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <board_settings.h>
 
 /**
  * The following enum provides a set of flags to be used to check which buttons