diff --git a/cpu/k60/Makefile b/cpu/k60/Makefile
index a8496360bf..12ba41f9cf 100644
--- a/cpu/k60/Makefile
+++ b/cpu/k60/Makefile
@@ -2,6 +2,6 @@
 MODULE = cpu
 
 # add a list of subdirectories, that should also be build
-DIRS = periph $(RIOTCPU)/cortexm_common devio $(KINETIS_COMMON)
+DIRS = periph $(RIOTCPU)/cortexm_common $(KINETIS_COMMON)
 
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/k60/Makefile.include b/cpu/k60/Makefile.include
index ed505d0a34..0ac444baf4 100644
--- a/cpu/k60/Makefile.include
+++ b/cpu/k60/Makefile.include
@@ -1,32 +1,16 @@
 # define the CPU architecture for the k60
 export CPU_ARCH = cortex-m4
 
-# this CPU implementation is using the explicit core/CPU interface
-export CFLAGS += -DCOREIF_NG=1
-
-# export the peripheral drivers to be linked into the final binary
-export USEMODULE += periph
-
-# Posix device I/O interface
-export USEMODULE += devio
-
-# tell the build system that the CPU depends on the Cortex-M common files
-export USEMODULE += cortexm_common
-
 # tell the build system that the CPU depends on the Kinetis common files
 export USEMODULE += kinetis_common
 
 # define path to kinetis module, which is needed for this CPU
 export KINETIS_COMMON = $(RIOTCPU)/kinetis_common/
-
-# CPU depends on the cortex-m common module, so include it
-include $(RIOTCPU)/cortexm_common/Makefile.include
-
 # CPU depends on the kinetis module, so include it
 include $(KINETIS_COMMON)Makefile.include
 
+export LINKFLAGS += -L$(RIOTCPU)/kinetis_common/ldscripts
 # define the linker script to use for this CPU
-export LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts
 export LINKERSCRIPT = $(CPU_MODEL).ld
 
 #export the CPU model and architecture
@@ -35,10 +19,11 @@ export CFLAGS += -DCPU_MODEL_$(MODEL)
 ARCH = $(shell echo $(CPU_ARCH) | tr 'a-z-' 'A-Z_')
 export CFLAGS += -DCPU_ARCH_$(ARCH)
 
-# include CPU specific includes
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
+# this CPU implementation is using kinetis common startup
+export COMMON_STARTUP = $(KINETIS_COMMON)
 
 # add the CPU specific system calls implementations for the linker
-export UNDEF += $(BINDIR)cpu/syscalls.o
-export UNDEF += $(BINDIR)cpu/ssp.o
 export UNDEF += $(BINDIR)cpu/interrupt_vector.o
+export UNDEF += $(BINDIR)cpu/ssp.o
+
+include $(RIOTCPU)/Makefile.include.cortexm_common
diff --git a/cpu/k60/devio/Makefile b/cpu/k60/devio/Makefile
deleted file mode 100644
index b99e0bff11..0000000000
--- a/cpu/k60/devio/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = devio
-
-include $(RIOTBASE)/Makefile.base