diff --git a/tools/export/__init__.py b/tools/export/__init__.py
index b56f790cbf..501be59d15 100644
--- a/tools/export/__init__.py
+++ b/tools/export/__init__.py
@@ -310,6 +310,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
         extra_verbose=extra_verbose, config=config, build_profile=build_profile,
         app_config=app_config)
     # The first path will give the name to the library
+    toolchain.RESPONSE_FILES = False
     if name is None:
         name = basename(normpath(abspath(src_paths[0])))
 
diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py
index 247271aed3..d67e83ff98 100644
--- a/tools/export/makefile/__init__.py
+++ b/tools/export/makefile/__init__.py
@@ -225,7 +225,7 @@ class Arm(Makefile):
 
     def generate(self):
         if self.resources.linker_script:
-            new_script = self.toolchain.make_real_scatter(
+            new_script = self.toolchain.correct_scatter_shebang(
                 self.resources.linker_script)
             if new_script is not self.resources.linker_script:
                 self.resources.linker_script = new_script
diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index 12c3241207..8382bae0f0 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -167,8 +167,9 @@ class Uvision(Exporter):
         """Format toolchain flags for Uvision"""
         flags = copy.deepcopy(self.flags)
         # to be preprocessed with armcc
-        asm_flag_string = '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' + \
-                          ",".join(flags['asm_flags'])
+        asm_flag_string = (
+            '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' +
+            ",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
         flags['asm_flags'] = asm_flag_string
         # All non-asm flags are in one template field
         c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags']))
diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index f49c79659d..49c708c3bb 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -394,7 +394,7 @@
               <MiscControls>{{asm_flags}}</MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath></IncludePath>
+              <IncludePath>{{include_paths}}</IncludePath>
             </VariousControls>
           </Aads>
           <LDads>