diff --git a/misc/Kconfig b/misc/Kconfig
index e9a45354ee5..9f998fbcd6b 100644
--- a/misc/Kconfig
+++ b/misc/Kconfig
@@ -129,12 +129,6 @@ config TOOLCHAIN_VARIANT
 
 endmenu
 
-config CPLUSPLUS
-	bool "Enable C++ support for the application"
-	default n
-	help
-	This option enables the use of applications built with C++.
-
 config GDB_INFO
 	bool
 	prompt "Task-aware debugging with GDB"
diff --git a/misc/Makefile b/misc/Makefile
index 69f2e2e3ee5..787b7375d7c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,7 +1,4 @@
 
-obj-$(CONFIG_CPLUSPLUS) += cpp_virtual.o cpp_vtable.o               \
-                           cpp_init_array.o cpp_ctors.o cpp_dtors.o
-
 obj-$(CONFIG_PRINTK) += printk.o
 
 obj-$(CONFIG_REBOOT) += reboot.o
diff --git a/subsys/Kconfig b/subsys/Kconfig
index cd6b11316ea..4966a0b8114 100644
--- a/subsys/Kconfig
+++ b/subsys/Kconfig
@@ -1,25 +1,26 @@
 # Kconfig - Subsystem configuration options
 #
-# Copyright (c) 2016 Intel Corporation
+# Copyright (c) 2016-2017 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-source "subsys/fs/Kconfig"
-
-source "subsys/usb/Kconfig"
-
 source "subsys/bluetooth/Kconfig"
 
 source "subsys/console/Kconfig"
 
-source "subsys/disk/Kconfig"
-
-source "subsys/net/Kconfig"
-
-source "subsys/logging/Kconfig"
+source "subsys/cpp/Kconfig"
 
 source "subsys/debug/Kconfig"
 
+source "subsys/disk/Kconfig"
+
+source "subsys/fs/Kconfig"
+
+source "subsys/logging/Kconfig"
+
+source "subsys/net/Kconfig"
+
 source "subsys/shell/Kconfig"
 
+source "subsys/usb/Kconfig"
diff --git a/subsys/Makefile b/subsys/Makefile
index 50d7b79e6bf..343b84ffd47 100644
--- a/subsys/Makefile
+++ b/subsys/Makefile
@@ -5,5 +5,6 @@ obj-$(CONFIG_NET_BUF) += net/
 obj-$(CONFIG_CONSOLE_SHELL) += shell/
 obj-$(CONFIG_CONSOLE_PULL) += console/
 obj-$(CONFIG_DISK_ACCESS) += disk/
+obj-$(CONFIG_CPLUSPLUS) += cpp/
 obj-y += logging/
 obj-y += debug/
diff --git a/subsys/cpp/Kconfig b/subsys/cpp/Kconfig
new file mode 100644
index 00000000000..e562582e47b
--- /dev/null
+++ b/subsys/cpp/Kconfig
@@ -0,0 +1,7 @@
+
+config CPLUSPLUS
+	bool "Enable C++ support for the application"
+	default n
+	help
+	This option enables the use of applications built with C++.
+
diff --git a/subsys/cpp/Makefile b/subsys/cpp/Makefile
new file mode 100644
index 00000000000..dd7c4f59b38
--- /dev/null
+++ b/subsys/cpp/Makefile
@@ -0,0 +1,7 @@
+
+obj-y += cpp_virtual.o \
+	cpp_vtable.o  \
+	cpp_init_array.o \
+	cpp_ctors.o \
+	cpp_dtors.o
+
diff --git a/misc/cpp_ctors.c b/subsys/cpp/cpp_ctors.c
similarity index 100%
rename from misc/cpp_ctors.c
rename to subsys/cpp/cpp_ctors.c
diff --git a/misc/cpp_dtors.c b/subsys/cpp/cpp_dtors.c
similarity index 100%
rename from misc/cpp_dtors.c
rename to subsys/cpp/cpp_dtors.c
diff --git a/misc/cpp_init_array.c b/subsys/cpp/cpp_init_array.c
similarity index 100%
rename from misc/cpp_init_array.c
rename to subsys/cpp/cpp_init_array.c
diff --git a/misc/cpp_virtual.c b/subsys/cpp/cpp_virtual.c
similarity index 100%
rename from misc/cpp_virtual.c
rename to subsys/cpp/cpp_virtual.c
diff --git a/misc/cpp_vtable.cpp b/subsys/cpp/cpp_vtable.cpp
similarity index 100%
rename from misc/cpp_vtable.cpp
rename to subsys/cpp/cpp_vtable.cpp