diff --git a/examples/mtdpart/CMakeLists.txt b/examples/mtdpart/CMakeLists.txt
index 8d3c295be..c845869e2 100644
--- a/examples/mtdpart/CMakeLists.txt
+++ b/examples/mtdpart/CMakeLists.txt
@@ -19,5 +19,5 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_MTDPART)
-  nuttx_add_application(NAME mtdpart)
+  nuttx_add_application(NAME mtdpart SRCS mtdpart_main.c)
 endif()
diff --git a/examples/mtdrwb/CMakeLists.txt b/examples/mtdrwb/CMakeLists.txt
index a0a4ace32..c6f545ef9 100644
--- a/examples/mtdrwb/CMakeLists.txt
+++ b/examples/mtdrwb/CMakeLists.txt
@@ -19,5 +19,6 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_MTDRWB)
-  nuttx_add_application(NAME mtdrwb)
+  nuttx_add_application(NAME ${CONFIG_EXAMPLES_MTDRWB_PROGNAME} SRCS
+                        mtdrwb_main.c)
 endif()
diff --git a/examples/nettest/host/CMakeLists.txt b/examples/nettest/host/CMakeLists.txt
index 625d25639..b0f87c8de 100644
--- a/examples/nettest/host/CMakeLists.txt
+++ b/examples/nettest/host/CMakeLists.txt
@@ -21,8 +21,8 @@
 cmake_minimum_required(VERSION 3.16)
 project(nuttx_tools LANGUAGES C)
 
-set(NUTTX_ACTIVE_DEFCONFIG ${NUTTX_BINARY_DIR}/.config)
-include(${NUTTX_DIR}/cmake/kconfig.cmake)
+include(${NUTTX_DIR}/cmake/nuttx_kconfig.cmake)
+nuttx_export_kconfig(${NUTTX_BINARY_DIR}/.config)
 
 set(HOST_SRCS ../nettest_host.c)
 if(CONFIG_EXAMPLES_NETTEST_SERVER)
diff --git a/examples/usrsocktest/CMakeLists.txt b/examples/usrsocktest/CMakeLists.txt
index 0b1690818..6a07dd6a7 100644
--- a/examples/usrsocktest/CMakeLists.txt
+++ b/examples/usrsocktest/CMakeLists.txt
@@ -19,5 +19,40 @@
 # ##############################################################################
 
 if(CONFIG_EXAMPLES_USRSOCKTEST)
-  nuttx_add_application(NAME usrsocktest)
+
+  # USRSOCK Test built-in application info
+
+  nuttx_add_application(
+    NAME
+    ${CONFIG_EXAMPLES_USRSOCKTEST_PROGNAME}
+    SRCS
+    usrsocktest_main.c
+    STACKSIZE
+    ${CONFIG_EXAMPLES_USRSOCKTEST_STACKSIZE}
+    PRIORITY
+    ${CONFIG_EXAMPLES_USRSOCKTEST_PRIORITY})
+
+  # NuttX USRSOCK Test
+
+  set(CSRCS
+      usrsocktest_daemon.c
+      usrsocktest_basic_connect.c
+      usrsocktest_basic_daemon.c
+      usrsocktest_basic_getsockname.c
+      usrsocktest_basic_getsockopt.c
+      usrsocktest_basic_send.c
+      usrsocktest_basic_setsockopt.c
+      usrsocktest_block_recv.c
+      usrsocktest_block_send.c
+      usrsocktest_chardev.c
+      usrsocktest_multi_thread.c
+      usrsocktest_noblock_connect.c
+      usrsocktest_noblock_recv.c
+      usrsocktest_noblock_send.c
+      usrsocktest_nodaemon.c
+      usrsocktest_poll.c
+      usrsocktest_remote_disconnect.c
+      usrsocktest_wake_with_signal.c)
+
+  target_sources(apps PRIVATE ${CSRCS})
 endif()
diff --git a/fsutils/flash_eraseall/CMakeLists.txt b/fsutils/flash_eraseall/CMakeLists.txt
index 89b40fc47..16c2f4b7b 100644
--- a/fsutils/flash_eraseall/CMakeLists.txt
+++ b/fsutils/flash_eraseall/CMakeLists.txt
@@ -19,5 +19,5 @@
 # ##############################################################################
 
 if(CONFIG_FSUTILS_FLASH_ERASEALL)
-  nuttx_add_application(NAME flash_eraseall SRCS flash_eraseall.c)
+  target_sources(apps PRIVATE flash_eraseall.c)
 endif()
diff --git a/fsutils/mksmartfs/CMakeLists.txt b/fsutils/mksmartfs/CMakeLists.txt
index 6dd7b6bfc..d592c1593 100644
--- a/fsutils/mksmartfs/CMakeLists.txt
+++ b/fsutils/mksmartfs/CMakeLists.txt
@@ -19,5 +19,5 @@
 # ##############################################################################
 
 if(CONFIG_FSUTILS_MKSMARTFS)
-  nuttx_add_application(NAME mksmartfs SRCS mksmartfs.c)
+  target_sources(apps PRIVATE mksmartfs.c)
 endif()
diff --git a/netutils/iperf/CMakeLists.txt b/netutils/iperf/CMakeLists.txt
index 9272b718a..feea71ea6 100644
--- a/netutils/iperf/CMakeLists.txt
+++ b/netutils/iperf/CMakeLists.txt
@@ -19,5 +19,20 @@
 # ##############################################################################
 
 if(CONFIG_NETUTILS_IPERF)
-  nuttx_add_application(NAME iperf SRCS iperf_main.c iperf.c)
+
+  # iperf example! built-in application info
+
+  nuttx_add_application(
+    NAME
+    ${CONFIG_NETUTILS_IPERF_PROGNAME}
+    SRCS
+    iperf_main.c
+    STACKSIZE
+    ${CONFIG_NETUTILS_IPERF_STACKSIZE}
+    PRIORITY
+    ${CONFIG_NETUTILS_IPERF_PRIORITY})
+
+  # Iperf Example
+
+  target_sources(apps PRIVATE iperf.c)
 endif()
diff --git a/system/nxplayer/CMakeLists.txt b/system/nxplayer/CMakeLists.txt
index 89549adb4..7faf55d2e 100644
--- a/system/nxplayer/CMakeLists.txt
+++ b/system/nxplayer/CMakeLists.txt
@@ -19,9 +19,15 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_NXPLAYER)
+  # NxPlayer Library
+
   if(CONFIG_NXPLAYER_COMMAND_LINE)
     nuttx_add_application(NAME nxplayer SRCS nxplayer_main.c STACKSIZE
                           ${CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE})
   endif()
   target_sources(apps PRIVATE nxplayer.c)
+
+  set(CSRCS nxplayer.c nxplayer_common.c nxplayer_mp3.c)
+
+  target_sources(apps PRIVATE ${CSRCS})
 endif()
diff --git a/testing/fstest/CMakeLists.txt b/testing/fstest/CMakeLists.txt
new file mode 100644
index 000000000..6445c256b
--- /dev/null
+++ b/testing/fstest/CMakeLists.txt
@@ -0,0 +1,31 @@
+# ##############################################################################
+# apps/testing/fstest/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_FSTEST)
+  nuttx_add_application(
+    NAME
+    ${CONFIG_TESTING_FSTEST_PROGNAME}
+    SRCS
+    fstest_main.c
+    STACKSIZE
+    ${CONFIG_TESTING_FSTEST_STACKSIZE}
+    PRIORITY
+    ${CONFIG_TESTING_FSTEST_PRIORITY})
+endif()
diff --git a/testing/nxffs/CMakeLists.txt b/testing/nxffs/CMakeLists.txt
new file mode 100644
index 000000000..208acb83e
--- /dev/null
+++ b/testing/nxffs/CMakeLists.txt
@@ -0,0 +1,23 @@
+# ##############################################################################
+# apps/testing/nxffs/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_TESTING_NXFFS)
+  nuttx_add_application(NAME nxffs SRCS nxffs_main.c)
+endif()
diff --git a/wireless/bluetooth/CMakeLists.txt b/wireless/bluetooth/CMakeLists.txt
new file mode 100644
index 000000000..ef322d1da
--- /dev/null
+++ b/wireless/bluetooth/CMakeLists.txt
@@ -0,0 +1,23 @@
+# ##############################################################################
+# apps/wireless/bluetooth/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+nuttx_add_subdirectory()
+
+nuttx_generate_kconfig(MENUDESC "Bluetooth applications")
diff --git a/wireless/bluetooth/btsak/CMakeLists.txt b/wireless/bluetooth/btsak/CMakeLists.txt
new file mode 100644
index 000000000..d392e6346
--- /dev/null
+++ b/wireless/bluetooth/btsak/CMakeLists.txt
@@ -0,0 +1,41 @@
+# ##############################################################################
+# apps/examples/usrsocktest/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_BTSAK)
+
+  # Application info
+
+  nuttx_add_application(
+    NAME
+    ${CONFIG_BTSAK_PROGNAME}
+    SRCS
+    btsak_main.c
+    STACKSIZE
+    ${CONFIG_BTSAK_STACKSIZE}
+    PRIORITY
+    ${CONFIG_BTSAK_PRIORITY})
+
+  # Bluetooth SAK (swiss army knife)
+
+  set(CSRCS btsak_advertise.c btsak_features.c btsak_gatt.c btsak_info.c
+            btsak_scan.c btsak_security.c)
+
+  target_sources(apps PRIVATE ${CSRCS})
+endif()