diff --git a/components/app_trace/CMakeLists.txt b/components/app_trace/CMakeLists.txt
index 56ad26369..711a50e50 100644
--- a/components/app_trace/CMakeLists.txt
+++ b/components/app_trace/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(COMPONENT_SRCS "app_trace.c"
                    "app_trace_util.c"
-                   "gcov/gcov_rtio.c"
-                   "host_file_io.c")
+                   "host_file_io.c"
+                   "gcov/gcov_rtio.c")
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 
 if(CONFIG_SYSVIEW_ENABLE)
@@ -10,10 +10,10 @@ if(CONFIG_SYSVIEW_ENABLE)
         sys_view/SEGGER
         sys_view/Sample/OS)
 
-    set(COMPONENT_SRCS "SEGGER/SEGGER_SYSVIEW.c"
-                    "esp32/SEGGER_RTT_esp32.c"
-                    "Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
-                    "Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c")
+    list(APPEND COMPONENT_SRCS "sys_view/SEGGER/SEGGER_SYSVIEW.c"
+                   "sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
+                   "sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c"
+                   "sys_view/esp32/SEGGER_RTT_esp32.c")
 endif()
 
 set(COMPONENT_REQUIRES)
diff --git a/components/console/CMakeLists.txt b/components/console/CMakeLists.txt
index 1aa4ce020..31fb1ed97 100644
--- a/components/console/CMakeLists.txt
+++ b/components/console/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(COMPONENT_ADD_INCLUDEDIRS .)
-set(COMPONENT_SRCS "argtable3/argtable3.c"
-                   "commands.c"
-                   "linenoise/linenoise.c"
-                   "split_argv.c")
+set(COMPONENT_SRCS "commands.c"
+                   "split_argv.c"
+                   "argtable3/argtable3.c"
+                   "linenoise/linenoise.c")
 
 set(COMPONENT_REQUIRES)
 
diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
index 8bfad700b..5a71175e1 100644
--- a/components/esp32/CMakeLists.txt
+++ b/components/esp32/CMakeLists.txt
@@ -37,8 +37,6 @@ else()
                    "freertos_hooks.c"
                    "gdbstub.c"
                    "hw_random.c"
-                   "hwcrypto/aes.c"
-                   "hwcrypto/sha.c"
                    "int_wdt.c"
                    "intr_alloc.c"
                    "ipc.c"
@@ -56,7 +54,9 @@ else()
                    "system_api.c"
                    "task_wdt.c"
                    "wifi_init.c"
-                   "wifi_os_adapter.c")
+                   "wifi_os_adapter.c"
+                   "hwcrypto/aes.c"
+                   "hwcrypto/sha.c")
     set(COMPONENT_ADD_INCLUDEDIRS "include")
 
     set(COMPONENT_REQUIRES driver tcpip_adapter)
diff --git a/components/heap/CMakeLists.txt b/components/heap/CMakeLists.txt
index f71ed9d84..6492aefd5 100644
--- a/components/heap/CMakeLists.txt
+++ b/components/heap/CMakeLists.txt
@@ -4,7 +4,7 @@ set(COMPONENT_SRCS "heap_caps.c"
                    "multi_heap.c")
 
 if(NOT CONFIG_HEAP_POISONING_DISABLED)
-    set(COMPONENT_SRCS ${COMPONENT_SRCS} multi_heap_poisoning.c)
+    list(APPEND COMPONENT_SRCS "multi_heap_poisoning.c")
 endif()
 
 set(COMPONENT_ADD_INCLUDEDIRS "include")
diff --git a/components/libsodium/CMakeLists.txt b/components/libsodium/CMakeLists.txt
index 8dd652344..52e058426 100644
--- a/components/libsodium/CMakeLists.txt
+++ b/components/libsodium/CMakeLists.txt
@@ -79,11 +79,11 @@ set(COMPONENT_SRCS "${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly
                    "port/randombytes_esp32.c")
 
 if(CONFIG_LIBSODIUM_USE_MBEDTLS_SHA)
-    set(COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
+    list(APPEND COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
                    "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
 else()
-    set(COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
-                   "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
+    list(APPEND COMPONENT_SRCS "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
+                   "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c")
 endif()
 
 set(COMPONENT_ADD_INCLUDEDIRS ${SRC}/include port_include)
diff --git a/components/spiffs/CMakeLists.txt b/components/spiffs/CMakeLists.txt
index c0903655d..17e5a5587 100644
--- a/components/spiffs/CMakeLists.txt
+++ b/components/spiffs/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_PRIV_INCLUDEDIRS "." "spiffs/src")
 set(COMPONENT_SRCS "esp_spiffs.c"
+                   "spiffs_api.c"
                    "spiffs/src/spiffs_cache.c"
                    "spiffs/src/spiffs_check.c"
                    "spiffs/src/spiffs_gc.c"
                    "spiffs/src/spiffs_hydrogen.c"
-                   "spiffs/src/spiffs_nucleus.c"
-                   "spiffs_api.c")
+                   "spiffs/src/spiffs_nucleus.c")
 
 set(COMPONENT_REQUIRES spi_flash)
 set(COMPONENT_PRIV_REQUIRES bootloader_support)
diff --git a/examples/wifi/simple_wifi/main/CMakeLists.txt b/examples/wifi/simple_wifi/main/CMakeLists.txt
deleted file mode 100644
index e7c00ec94..000000000
--- a/examples/wifi/simple_wifi/main/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "simple_wifi.c")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()