diff --git a/kernel/Makefile b/kernel/Makefile
index 917b839de34..7b3596f1b6e 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,3 +1,2 @@
 obj-y = nanokernel/
 obj-$(CONFIG_MICROKERNEL) += microkernel/
-obj-y += common/
diff --git a/kernel/common/Makefile b/kernel/common/Makefile
deleted file mode 100644
index da0c2380d8c..00000000000
--- a/kernel/common/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += bsp/
-obj-y += version.o
-obj-$(CONFIG_ENHANCED_SECURITY) += string_s.o
diff --git a/kernel/common/bsp/Makefile b/kernel/common/bsp/Makefile
deleted file mode 100644
index 65c02e35fec..00000000000
--- a/kernel/common/bsp/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y  = init.o
-obj-y += ctors.o
diff --git a/kernel/nanokernel/Makefile b/kernel/nanokernel/Makefile
index 8b21c30a5b5..3c270151c2b 100644
--- a/kernel/nanokernel/Makefile
+++ b/kernel/nanokernel/Makefile
@@ -6,8 +6,10 @@ EXTRA_AFLAGS := ${EXTRA_CFLAGS}
 
 obj-y = nanofiber.o nano_lifo.o nano_context_data.o\
 	nano_mwfifo.o nano_stack.o nano_timer.o \
-	nanocontextentry.o nanoinit.o nano_sema.o
+	nanocontextentry.o nanoinit.o nano_sema.o \
+	version.o init.o ctors.o
 
+obj-$(CONFIG_ENHANCED_SECURITY) += string_s.o
 obj-$(CONFIG_STACK_CANARIES) += compiler_stack_protect.o
 obj-$(CONFIG_INT_LATENCY_BENCHMARK) += int_latency_bench.o
 obj-$(CONFIG_PERFORMANCE_METRICS) += nanometrics.o