diff --git a/Kconfig b/Kconfig
index d20c362fa9..a9e4cb04e0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -229,7 +229,6 @@ endchoice # Build configuration
 config BUILD_2PASS
 	bool "Two pass build"
 	default n
-	depends on !BUILD_KERNEL
 	---help---
 		Enables the two pass build options.
 
diff --git a/libs/libc/builtin/Kconfig b/libs/libc/builtin/Kconfig
index b2939a6106..ad94cedee1 100644
--- a/libs/libc/builtin/Kconfig
+++ b/libs/libc/builtin/Kconfig
@@ -6,7 +6,7 @@
 config BUILTIN
 	bool "Support Builtin Applications"
 	default n
-	depends on !BUILD_KERNEL || EXPERIMENTAL
+	depends on !BUILD_KERNEL
 	---help---
 		Enable support for builtin applications.  This features assigns a string
 		name to an application and in addition if FS_BINFS is defined, retaining
diff --git a/libs/libc/dlfcn/Kconfig b/libs/libc/dlfcn/Kconfig
index fd4b3b3ec7..79a351f99b 100644
--- a/libs/libc/dlfcn/Kconfig
+++ b/libs/libc/dlfcn/Kconfig
@@ -10,12 +10,9 @@ config LIBC_DLFCN
 	default n
 	select LIBC_MODLIB if !BUILD_FLAT
 	select MODULE if BUILD_FLAT
-	depends on EXPERIMENTAL || !BUILD_KERNEL
 	---help---
 		Enabled support for user-space shared libraries.
 
-		A work in progress, hence, marked EXPERIMENTAL
-
 if LIBC_DLFCN
 
 config LDPATH_INITIAL
diff --git a/libs/libc/wqueue/Kconfig b/libs/libc/wqueue/Kconfig
index 1fd1bfebf0..b9afc34581 100644
--- a/libs/libc/wqueue/Kconfig
+++ b/libs/libc/wqueue/Kconfig
@@ -4,7 +4,7 @@
 #
 
 menu "User Work Queue Support"
-	depends on BUILD_PROTECTED || BUILD_KERNEL
+	depends on !BUILD_FLAT
 
 config LIB_USRWORK
 	bool "User mode worker thread"
diff --git a/mm/Kconfig b/mm/Kconfig
index 02caa03112..e4b81707f6 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -6,7 +6,7 @@
 config MM_KERNEL_HEAP
 	bool "Support a protected, kernel heap"
 	default y
-	depends on BUILD_PROTECTED || BUILD_KERNEL
+	depends on !BUILD_FLAT
 	---help---
 		Partition heap memory into two parts:  (1) a protected, kernel-mode
 		heap accessible only by the NuttX kernel, and (2) an unprotected
diff --git a/sched/Kconfig b/sched/Kconfig
index 17532866ab..9367a59bf3 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -341,8 +341,8 @@ endif # SMP
 choice
 	prompt "Initialization Task"
 	default INIT_ENTRYPOINT if !BUILD_KERNEL
-	default INIT_FILEPATH if BUILD_KERNEL && !BINFMT_DISABLE
-	default INIT_NONE if BUILD_KERNEL && BINFMT_DISABLE
+	default INIT_FILEPATH if !BINFMT_DISABLE
+	default INIT_NONE if BINFMT_DISABLE
 
 config INIT_NONE
 	bool "None"
@@ -388,7 +388,7 @@ config INIT_SYMTAB
 	string "Symbol table"
 	default "NULL" if !EXECFUNCS_HAVE_SYMTAB
 	default EXECFUNCS_SYMTAB_ARRAY if EXECFUNCS_HAVE_SYMTAB
-	depends on !BUILD_PROTECTED && !BUILD_KERNEL
+	depends on BUILD_FLAT
 	---help---
 		The name of other global array that holds the exported symbol table.
 		The special string "NULL" may be provided if there is no symbol
@@ -402,7 +402,7 @@ config INIT_NEXPORTS
 	string "Symbol table size"
 	default "0" if !EXECFUNCS_HAVE_SYMTAB
 	default EXECFUNCS_NSYMBOLS_VAR if EXECFUNCS_HAVE_SYMTAB
-	depends on !BUILD_PROTECTED && !BUILD_KERNEL
+	depends on BUILD_FLAT
 	---help---
 		The size of the symbol table.  NOTE that is is logically a numeric
 		value but is represent by a string.  That allows you to put