diff --git a/tools/export/exporters.py b/tools/export/exporters.py
index 0b074ef6ea..8bd76749f3 100644
--- a/tools/export/exporters.py
+++ b/tools/export/exporters.py
@@ -197,6 +197,7 @@ class Exporter(object):
             self.config_header = self.toolchain.MBED_CONFIG_FILE_NAME
             config.get_config_data_header(join(trg_path, self.config_header))
             self.config_macros = []
+            self.resources.inc_dirs.append(".")
         else:
             # And add the configuration macros to the toolchain
             self.config_macros = config.get_config_data_macros()
diff --git a/tools/export/gcc_arm_common.tmpl b/tools/export/gcc_arm_common.tmpl
index db5c9cb92a..446c856af8 100644
--- a/tools/export/gcc_arm_common.tmpl
+++ b/tools/export/gcc_arm_common.tmpl
@@ -89,13 +89,13 @@ all: $(PROJECT).bin $(PROJECT).hex size
 
 .asm.o:
 	+@$(call MAKEDIR,$(dir $@))
-	$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
+	$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
 .s.o:
 	+@$(call MAKEDIR,$(dir $@))
-	$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
+	$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
 .S.o:
 	+@$(call MAKEDIR,$(dir $@))
-	$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
+	$(CC) $(CPU) -c $(ASM_FLAGS) $(INCLUDE_PATHS) -o $@ $<
 
 .c.o:
 	+@$(call MAKEDIR,$(dir $@))