diff --git a/.gitignore b/.gitignore
index dd3e2058e..8761d1658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,3 +168,4 @@ wolfcrypt/user-crypto/m4
 wolfcrypt/user-crypto/missing
 wolfcrypt/user-crypto/Makefile.in
 wolfcrypt/user-crypto/lib/libusercrypto.*
+*.hzs
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/include.am b/IDE/ROWLEY-CROSSWORKS-ARM/include.am
index d7b17a037..e812cc7e6 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/include.am
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/include.am
@@ -10,6 +10,6 @@ EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/Kinetis_MemoryMap.xml
 EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/Kinetis_FlashPlacement.xml
 EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/README.md
 EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/test_main.c
-EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c
+EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/retarget.c
 EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
 EXTRA_DIST+= IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c
similarity index 73%
rename from IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c
rename to IDE/ROWLEY-CROSSWORKS-ARM/retarget.c
index 1929e868b..8f524b841 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/user_libc.c
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c
@@ -1,4 +1,4 @@
-/* user_libc.c
+/* retarget.c
  *
  * Copyright (C) 2006-2015 wolfSSL Inc.
  *
@@ -40,23 +40,7 @@ int __putchar(int c, __printf_tag_ptr ctx)
     hw_uart_printchar(c);
 }
 
-
-// Rowley CrossWorks, runtime support.
-//
-//  Copyright (c) 2001-2015 Rowley Associates Limited.
-//
-// This file may be distributed under the terms of the License Agreement
-// provided with this software.
-//
-// THIS FILE IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-#include <__libc.h>
-
-#if defined(__CROSSWORKS_ARM) || defined(__SES_ARM)
-
 extern unsigned char __stack_process_start__[];
-
 unsigned char * __aeabi_read_tp(void)
 {
     // thread-local storage addressing refers to the thread pointer
@@ -64,15 +48,7 @@ unsigned char * __aeabi_read_tp(void)
     return (__stack_process_start__);
 }
 
-#elif defined(__CROSSWORKS_AVR) || defined(__CROSSWORKS_MSP430)
-
-unsigned char * __RAL_read_tp(void)
-{
-  return 0;
-}
-
-#endif
-
+/* Stubs */
 void __heap_lock(void)
 {
 }
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
index 3221c59c1..7468f7e55 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl.hzp
@@ -12,7 +12,12 @@
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;inc" />
       <folder Name="wolfcrypt">
         <folder Name="benchmark" path="../../wolfcrypt/benchmark" />
-        <folder Name="src" path="../../wolfcrypt/src" />
+        <folder
+          Name="src"
+          exclude=".asm;.s"
+          filter=""
+          path="../../wolfcrypt/src"
+          recurse="No" />
         <folder Name="test" path="../../wolfcrypt/test" />
         <folder Name="user-crypto" path="../../wolfcrypt/user-crypto">
           <configuration Name="Common" build_exclude_from_build="Yes" />
@@ -60,7 +65,7 @@
       target_script_file="$(TargetsDir)/Kinetis/Kinetis_Target.js" />
     <folder Name="Source Files">
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc" />
-      <file file_name="user_libc.c" />
+      <file file_name="retarget.c" />
       <file file_name="kinetis_hw.c" />
       <file file_name="hw.h" />
       <file file_name="test_main.c" />
@@ -99,7 +104,7 @@
       target_script_file="$(TargetsDir)/Kinetis/Kinetis_Target.js" />
     <folder Name="Source Files">
       <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc" />
-      <file file_name="user_libc.c" />
+      <file file_name="retarget.c" />
       <file file_name="kinetis_hw.c" />
       <file file_name="hw.h" />
       <file file_name="benchmark_main.c" />