diff --git a/core/definitions.mk b/core/definitions.mk
index 6bd9cf0..afb4558 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1156,9 +1156,12 @@
 $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
 $$(cat $(PRIVATE_IMPORT_INCLUDES))\
 $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),,\
+    $(addprefix -I ,\
+        $(filter-out $(PRIVATE_C_INCLUDES), \
+            $(PRIVATE_GLOBAL_C_INCLUDES))) \
     $(addprefix -isystem ,\
         $(filter-out $(PRIVATE_C_INCLUDES), \
-            $(PRIVATE_GLOBAL_C_INCLUDES))))
+            $(PRIVATE_GLOBAL_C_SYSTEM_INCLUDES))))
 endef
 
 ###########################################################