diff --git a/mk/board_qflight.mk b/mk/board_qflight.mk
index e638ea950e..f0bfb99a49 100644
--- a/mk/board_qflight.mk
+++ b/mk/board_qflight.mk
@@ -38,7 +38,6 @@ LIBOBJS += $(QFLIGHT_BUILD)/qflight_stub.o
 
 # Add missing parts from libc and libstdc++
 MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0 -DHAVE_STD_REMOVE_REFERENCE=0 -DHAVE_TYPE_TRAITS_H=0 -DHAVE_BYTESWAP_H=0
-MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
 
 # DSP build flags
 DSP_INC=$(MISSING_TOOLCHAIN_FLAGS) $(SHARED_INC) -I$(HEXAGON_FC_ADDON)/hexagon/inc -I$(HEXAGON_FC_ADDON)/hexagon/inc/dspal/sys -I$(HEXAGON_FC_ADDON)/hexagon/inc/dspal/sys/sys -I$(HEXAGON_FC_ADDON)/hexagon/inc/dspal/sys/machine -I$(HEXAGON_FC_ADDON)/hexagon/inc/dspal/include -I$(HEXAGON_SDK_ROOT)/lib/common/qurt/ADSPv5MP/include -I$(HEXAGON_SDK_ROOT)/lib/common/remote/ship/hexagon_ReleaseG -I$(QFLIGHT_BUILD) -I$(HEXAGON_SDK_ROOT)/inc/stddef -I$(SKETCHBOOK)/libraries
diff --git a/mk/board_qurt.mk b/mk/board_qurt.mk
index e96a7b13b3..0019c05e2d 100644
--- a/mk/board_qurt.mk
+++ b/mk/board_qurt.mk
@@ -50,7 +50,6 @@ DSP_LINK_FLAGS = -mv5 -G0 -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--w
 
 # Add missing parts from libc and libstdc++
 MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0 -DHAVE_STD_REMOVE_REFERENCE=0 -DHAVE_TYPE_TRAITS_H=0 -DHAVE_BYTESWAP_H=0
-MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
 
 CXXFLAGS       +=   -std=gnu++11 $(WARNFLAGS) $(WARNFLAGSCXX) $(DEPFLAGS) $(MISSING_TOOLCHAIN_FLAGS) $(CXXOPTS) $(DEFINES) $(DSP_FLAGS)
 CFLAGS         +=   $(WARNFLAGS) $(DEPFLAGS) $(COPTS) $(DEFINES) $(DSP_FLAGS)
diff --git a/mk/environ.mk b/mk/environ.mk
index 2695d82736..18a9ca9767 100644
--- a/mk/environ.mk
+++ b/mk/environ.mk
@@ -7,6 +7,9 @@ SYSTYPE			:=	$(shell uname)
 GIT_VERSION := $(shell git rev-parse HEAD | cut -c1-8)
 EXTRAFLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
 
+# Add missing parts from libc and libstdc++ for all boards
+EXTRAFLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
+
 # force LANG to C so awk works sanely on MacOS
 export LANG=C
 
diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk
index b1d21d8bdd..5d20ac563d 100644
--- a/mk/px4_targets.mk
+++ b/mk/px4_targets.mk
@@ -42,7 +42,6 @@ EXTRAFLAGS += -DUAVCAN=1
 
 # Add missing parts from libc and libstdc++
 EXTRAFLAGS += -DHAVE_STD_NULLPTR_T=0
-EXTRAFLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
 
 # we have different config files for V1 and V2
 PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk