diff --git a/cores/arduino/HardwareTimer.cpp b/libraries/SrcWrapper/src/HardwareTimer.cpp
similarity index 100%
rename from cores/arduino/HardwareTimer.cpp
rename to libraries/SrcWrapper/src/HardwareTimer.cpp
diff --git a/cores/arduino/new.cpp b/libraries/SrcWrapper/src/new.cpp
similarity index 100%
rename from cores/arduino/new.cpp
rename to libraries/SrcWrapper/src/new.cpp
diff --git a/platform.txt b/platform.txt
index b32548f988..d5e60d12a4 100644
--- a/platform.txt
+++ b/platform.txt
@@ -32,9 +32,9 @@ compiler.extra_flags=-mcpu={build.mcu} {build.flags.fp} -DUSE_FULL_LL_DRIVER -mt
 
 compiler.S.flags={compiler.extra_flags} -c -x assembler-with-cpp {compiler.stm.extra_include}
 
-compiler.c.flags={compiler.extra_flags} -c {build.flags.optimize} {build.flags.debug} {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD {compiler.stm.extra_include}
+compiler.c.flags={compiler.extra_flags} -c {build.flags.optimize} {build.flags.debug} {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections --param max-inline-insns-single=500 -MMD {compiler.stm.extra_include}
 
-compiler.cpp.flags={compiler.extra_flags} -c {build.flags.optimize} {build.flags.debug} {compiler.warning_flags} -std={compiler.cpp.std} -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -fno-use-cxa-atexit -MMD {compiler.stm.extra_include}
+compiler.cpp.flags={compiler.extra_flags} -c {build.flags.optimize} {build.flags.debug} {compiler.warning_flags} -std={compiler.cpp.std} -ffunction-sections -fdata-sections -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -fno-use-cxa-atexit -MMD {compiler.stm.extra_include}
 
 compiler.ar.flags=rcs