diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
index f996e17e52..1324a65456 100644
--- a/components/esp_hw_support/CMakeLists.txt
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -51,8 +51,7 @@ if(NOT BOOTLOADER_BUILD)
     endif()
 
     # [refactor-todo]
-    list(APPEND priv_requires driver            # for UART (by sleep_modes)
-                              esp_driver_gpio   # for GPIO and RTC (by sleep_gpio and sleep_modes)
+    list(APPEND priv_requires esp_driver_gpio   # for GPIO and RTC (by sleep_gpio and sleep_modes)
                               esp_timer
                               esp_pm)
 
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index 6f8d6a07ef..e34526661e 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -37,8 +37,6 @@
 #include "hal/rtc_hal.h"
 #endif
 
-#include "driver/uart.h"
-
 #include "soc/rtc.h"
 #include "soc/soc_caps.h"
 #include "regi2c_ctrl.h"    //For `REGI2C_ANA_CALI_PD_WORKAROUND`, temp
@@ -49,8 +47,6 @@
 #include "hal/uart_hal.h"
 #if SOC_TOUCH_SENSOR_SUPPORTED
 #include "hal/touch_sensor_hal.h"
-#include "driver/touch_sensor.h"
-#include "driver/touch_sensor_common.h"
 #endif
 #include "hal/clk_gate_ll.h"
 
@@ -1423,9 +1419,8 @@ touch_pad_t esp_sleep_get_touchpad_wakeup_status(void)
         return TOUCH_PAD_MAX;
     }
     touch_pad_t pad_num;
-    esp_err_t ret = touch_pad_get_wakeup_status(&pad_num); //TODO 723diff commit id:fda9ada1b
-    assert(ret == ESP_OK && "wakeup reason is RTC_TOUCH_TRIG_EN but SENS_TOUCH_MEAS_EN is zero");
-    return (ret == ESP_OK) ? pad_num : TOUCH_PAD_MAX;
+    touch_hal_get_wakeup_status(&pad_num);
+    return pad_num;
 }
 
 #endif // SOC_TOUCH_SENSOR_SUPPORTED
diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt
index c63a27df0b..bee467e389 100644
--- a/components/esp_system/CMakeLists.txt
+++ b/components/esp_system/CMakeLists.txt
@@ -63,11 +63,11 @@ else()
                                     # [refactor-todo] requirements due to init code,
                                     # should be removable once using component init functions
                                     # link-time registration is used.
-                                    # [refactor-todo] requires "driver" for headers:
+                                    # [refactor-todo] requires "esp_driver_spi" for headers:
                                     # - spi_common_internal.h
                                     # [refactor-todo] esp_partition required for virtual efuse
                                     # init code. Move to esp_efuse component.
-                                    pthread bootloader_support efuse driver esp_partition
+                                    pthread bootloader_support efuse esp_driver_spi esp_partition
                         LDFRAGMENTS "linker.lf" "app.lf")
     add_subdirectory(port)
 
diff --git a/tools/test_apps/system/g1_components/CMakeLists.txt b/tools/test_apps/system/g1_components/CMakeLists.txt
index ef31eac5b8..894d696d9d 100644
--- a/tools/test_apps/system/g1_components/CMakeLists.txt
+++ b/tools/test_apps/system/g1_components/CMakeLists.txt
@@ -35,7 +35,7 @@ set(extra_components_which_shouldnt_be_included
     cxx
     # [refactor-todo]: driver is a dependency of esp_pm, spi_flash, vfs, esp_wifi
     #   all of these should be removed from G1 except for spi_flash.
-    driver esp_driver_gpio esp_driver_pcnt esp_driver_gptimer esp_driver_spi esp_driver_mcpwm
+    esp_driver_gpio esp_driver_spi
     # esp_app_format is dependency of bootloader_support, app_update
     esp_app_format
     # esp_bootloader_format is dependency of bootloader_support, app_update