diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_NUC123SD4AN0.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_NUC123SD4AN0.mk
new file mode 100644
index 00000000..f19c9270
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_NUC123SD4AN0.mk
@@ -0,0 +1,19 @@
+# List of the ChibiOS generic NUC123SD4AN0 startup and CMSIS files.
+STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c
+
+STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.S
+
+STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NUC123SD4AN0 \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld \
+             $(CHIBIOS)/os/common/ext/CMSIS/include \
+             $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
+             $(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/Nuvoton/NUMICRO
+
+STARTUPLD  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld
+STARTUPLD_CONTRIB  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
+
+# Shared variables
+ALLXASMSRC += $(STARTUPASM)
+ALLCSRC    += $(STARTUPSRC)
+ALLINC     += $(STARTUPINC)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nuc123sd4an0.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nuc123sd4an0.mk
deleted file mode 100644
index 927befaf..00000000
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nuc123sd4an0.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# List of the ChibiOS generic NUC123SD4AN0 startup and CMSIS files.
-STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
-             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
-          
-STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
-
-STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC \
-             $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/NUC123SD4AN0 \
-             $(CHIBIOS)/os/common/ext/CMSIS/include \
-             $(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/Nuvoton/NUMICRO
-
-STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
diff --git a/os/hal/ports/NUMICRO/NUC123SD4AN0/platform.mk b/os/hal/ports/NUMICRO/NUC123SD4AN0/platform.mk
index 513addd6..ee94b4e0 100644
--- a/os/hal/ports/NUMICRO/NUC123SD4AN0/platform.mk
+++ b/os/hal/ports/NUMICRO/NUC123SD4AN0/platform.mk
@@ -1,22 +1,21 @@
-# Required platform files.
-PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
-               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0/hal_lld.c \
-               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0/system_NUC123.c
-
-# Required include directories.
-PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
-               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0 \
-               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD
-
-# Optional platform files.
-ifeq ($(USE_SMART_BUILD),yes)
-HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
-
-endif
-
-# Drivers compatible with the platform.
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/CLKv1/driver.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/GPIOv1/driver.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/TIMv1/driver.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/PWMv1/driver.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/USBv1/driver.mk
+# Required platform files.
+PLATFORMSRC := $(CHIBIOS)/os/hal/ports/common/ARMCMx/nvic.c \
+               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0/hal_lld.c \
+               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0/system_NUC123SD4AN0.c
+
+# Required include directories.
+PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
+               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/NUC123SD4AN0 \
+               $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD
+
+# Optional platform files.
+ifeq ($(USE_SMART_BUILD),yes)
+HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
+
+endif
+
+# Drivers compatible with the platform.
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/CLKv1/driver.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/GPIOv1/driver.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/TIMv1/driver.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NUMICRO/LLD/USBv1/driver.mk