diff --git a/toolchain/Config.in b/toolchain/Config.in
index 94133002400b2a1cb02192ad40aa6d72778f1f72..05cc350f2e8d63bb79fe598388d9c37a29c5e87e 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -164,19 +164,22 @@ comment "C Library"
 
 choice
 	prompt "C Library implementation" if TOOLCHAINOPTS
-	default USE_UCLIBC
+	default LIBC_USE_UCLIBC
 	help
 	  Select the C library implementation.
 
-	config USE_EGLIBC
+	config LIBC_USE_EGLIBC
 		bool "Use eglibc"
+		select USE_EGLIBC
 		depends on !avr32
-	
-	config USE_UCLIBC
+
+	config LIBC_USE_UCLIBC
+		select USE_UCLIBC
 		bool "Use uClibc"
 
-	config USE_MUSL
+	config LIBC_USE_MUSL
 		bool "Use musl"
+		select USE_MUSL
 		depends on !(mips64 || mips64el)
 
 endchoice
@@ -204,10 +207,16 @@ config INSIGHT
 	help
 		Enable if you want to build insight-gdb
 
+config USE_EGLIBC
+	bool
+
 config USE_UCLIBC
 	bool
 	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
 
+config USE_MUSL
+	bool
+
 config USE_EXTERNAL_LIBC
 	bool
 	default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN