diff --git a/components/esp_hw_support/linker.lf b/components/esp_hw_support/linker.lf
index b785ec786a..9abbe07e38 100644
--- a/components/esp_hw_support/linker.lf
+++ b/components/esp_hw_support/linker.lf
@@ -2,6 +2,8 @@
 archive: libesp_hw_support.a
 entries:
     cpu_util (noflash_text)
+    if IDF_TARGET_ESP32S2 = y:
+        regi2c_ctrl (noflash)
     rtc_clk (noflash)
     rtc_init:rtc_vddsdio_set_config (noflash)
     rtc_periph (noflash_text)
diff --git a/components/esp_hw_support/port/esp32s2/regi2c_ctrl.c b/components/esp_hw_support/port/esp32s2/regi2c_ctrl.c
index 88ec4fa0f9..d7439bc97e 100644
--- a/components/esp_hw_support/port/esp32s2/regi2c_ctrl.c
+++ b/components/esp_hw_support/port/esp32s2/regi2c_ctrl.c
@@ -12,12 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "esp_err.h"
 #include "soc/soc.h"
 #include "soc/apb_ctrl_reg.h"
 #include "regi2c_ctrl.h"
 #include "regi2c_brownout.h"
-#include "esp_log.h"
 
 #define I2C_RTC_WIFI_CLK_EN (APB_CTRL_WIFI_CLK_EN_REG)