diff --git a/components/driver/i2c/i2c.c b/components/driver/i2c/i2c.c
index 7a8fc826597..5e849ae1e8e 100644
--- a/components/driver/i2c/i2c.c
+++ b/components/driver/i2c/i2c.c
@@ -21,7 +21,7 @@
 #include "soc/soc_memory_layout.h"
 #include "hal/i2c_hal.h"
 #include "hal/gpio_hal.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "driver/i2c_types_legacy.h"
 #include "esp_private/periph_ctrl.h"
 #include "esp_rom_gpio.h"
diff --git a/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c b/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c
index 9de8145efc5..6caf72da90f 100644
--- a/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c
+++ b/components/driver/test_apps/legacy_i2c_driver/main/test_i2c.c
@@ -12,7 +12,7 @@
 #include "esp_attr.h"
 #include "esp_log.h"
 #include "soc/gpio_periph.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "esp_system.h"
 #include "soc/uart_struct.h"
 #include "esp_private/periph_ctrl.h"
diff --git a/components/esp_driver_i2c/i2c_common.c b/components/esp_driver_i2c/i2c_common.c
index 8880bdcfd5f..c938adc1118 100644
--- a/components/esp_driver_i2c/i2c_common.c
+++ b/components/esp_driver_i2c/i2c_common.c
@@ -23,7 +23,7 @@
 #include "i2c_private.h"
 #include "driver/gpio.h"
 #include "soc/clk_tree_defs.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "esp_clk_tree.h"
 #include "clk_ctrl_os.h"
 #include "esp_private/gpio.h"
diff --git a/components/esp_driver_i2c/i2c_master.c b/components/esp_driver_i2c/i2c_master.c
index 023122659f2..4f88363389a 100644
--- a/components/esp_driver_i2c/i2c_master.c
+++ b/components/esp_driver_i2c/i2c_master.c
@@ -21,7 +21,7 @@
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "esp_private/periph_ctrl.h"
 #include "esp_private/esp_clk.h"
 #include "esp_rom_gpio.h"
diff --git a/components/esp_hal_i2c/esp32/i2c_periph.c b/components/esp_hal_i2c/esp32/i2c_periph.c
index 4a440fca4df..243279b51b2 100644
--- a/components/esp_hal_i2c/esp32/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h
index b8ea21965c8..564bd1f7997 100644
--- a/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32/include/hal/i2c_ll.h
@@ -10,7 +10,7 @@
 
 #include <stdbool.h>
 #include "hal/misc.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/i2c_struct.h"
 #include "soc/clk_tree_defs.h"
 #include "soc/dport_reg.h"
diff --git a/components/esp_hal_i2c/esp32c2/i2c_periph.c b/components/esp_hal_i2c/esp32c2/i2c_periph.c
index 4df019865be..528bdec9640 100644
--- a/components/esp_hal_i2c/esp32c2/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32c2/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h
index b5a02817afd..b2a20de0bc8 100644
--- a/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32c2/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "hal/i2c_types.h"
diff --git a/components/esp_hal_i2c/esp32c3/i2c_periph.c b/components/esp_hal_i2c/esp32c3/i2c_periph.c
index 6f18557a3ac..a4a8e1881b0 100644
--- a/components/esp_hal_i2c/esp32c3/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32c3/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h
index 687ea77e6b7..6bb29f24b2e 100644
--- a/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32c3/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include "stdbool.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "hal/i2c_types.h"
diff --git a/components/esp_hal_i2c/esp32c5/i2c_periph.c b/components/esp_hal_i2c/esp32c5/i2c_periph.c
index 4436a046c5a..c2d5a00a827 100644
--- a/components/esp_hal_i2c/esp32c5/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32c5/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 #define LP_I2C_MUX_FUNC  (3)
diff --git a/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h
index a13d5962a27..9e583ad05c5 100644
--- a/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32c5/include/hal/i2c_ll.h
@@ -12,7 +12,7 @@
 #include "soc/soc_caps.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
diff --git a/components/esp_hal_i2c/esp32c6/i2c_periph.c b/components/esp_hal_i2c/esp32c6/i2c_periph.c
index 2d03a38dbe7..a51c5b821cb 100644
--- a/components/esp_hal_i2c/esp32c6/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32c6/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/regdma.h"
 #include "soc/i2c_reg.h"
diff --git a/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h
index 571034b0506..70feb45eea6 100644
--- a/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32c6/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
diff --git a/components/esp_hal_i2c/esp32c61/i2c_periph.c b/components/esp_hal_i2c/esp32c61/i2c_periph.c
index 63369e2810a..951b665d031 100644
--- a/components/esp_hal_i2c/esp32c61/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32c61/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h
index 5e50d96967b..0f23e2f418d 100644
--- a/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32c61/include/hal/i2c_ll.h
@@ -12,7 +12,7 @@
 #include "soc/soc_caps.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
diff --git a/components/esp_hal_i2c/esp32h2/i2c_periph.c b/components/esp_hal_i2c/esp32h2/i2c_periph.c
index 7c629655b5a..b39d28e18b5 100644
--- a/components/esp_hal_i2c/esp32h2/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32h2/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/regdma.h"
 #include "soc/i2c_reg.h"
diff --git a/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h
index e0e8334f934..51689ac1c98 100644
--- a/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32h2/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
diff --git a/components/esp_hal_i2c/esp32h21/i2c_periph.c b/components/esp_hal_i2c/esp32h21/i2c_periph.c
index 5633761438d..bc8a9bdffd8 100644
--- a/components/esp_hal_i2c/esp32h21/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32h21/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h
index 903a77fec6d..9d98296b303 100644
--- a/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32h21/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/i2c_types.h"
diff --git a/components/esp_hal_i2c/esp32h4/i2c_periph.c b/components/esp_hal_i2c/esp32h4/i2c_periph.c
index 30662b6b27c..73f672d978d 100644
--- a/components/esp_hal_i2c/esp32h4/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32h4/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/regdma.h"
 #include "soc/i2c_reg.h"
diff --git a/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h
index a1d0bb9a98d..47bea5c9700 100644
--- a/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32h4/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/pcr_struct.h"
diff --git a/components/esp_hal_i2c/esp32p4/i2c_periph.c b/components/esp_hal_i2c/esp32p4/i2c_periph.c
index 6bf7b354821..e4365e6b41b 100644
--- a/components/esp_hal_i2c/esp32p4/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32p4/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/lp_gpio_sig_map.h"
 
diff --git a/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h
index db62795bbb0..403ef151197 100644
--- a/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32p4/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "hal/i2c_types.h"
diff --git a/components/esp_hal_i2c/esp32s2/i2c_periph.c b/components/esp_hal_i2c/esp32s2/i2c_periph.c
index 4a440fca4df..243279b51b2 100644
--- a/components/esp_hal_i2c/esp32s2/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32s2/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h
index 0949cb39397..28831bc8a82 100644
--- a/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32s2/include/hal/i2c_ll.h
@@ -8,7 +8,7 @@
 
 #pragma once
 #include <stdbool.h>
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/i2c_struct.h"
 #include "soc/clk_tree_defs.h"
 #include "soc/system_reg.h"
diff --git a/components/esp_hal_i2c/esp32s3/i2c_periph.c b/components/esp_hal_i2c/esp32s3/i2c_periph.c
index 4a440fca4df..243279b51b2 100644
--- a/components/esp_hal_i2c/esp32s3/i2c_periph.c
+++ b/components/esp_hal_i2c/esp32s3/i2c_periph.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/gpio_sig_map.h"
 
 /*
diff --git a/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h b/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h
index 6b172a7702d..20ccff5a198 100644
--- a/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h
+++ b/components/esp_hal_i2c/esp32s3/include/hal/i2c_ll.h
@@ -11,7 +11,7 @@
 #include "stdbool.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
-#include "soc/i2c_periph.h"
+#include "hal/i2c_periph.h"
 #include "soc/soc_caps.h"
 #include "soc/i2c_struct.h"
 #include "soc/clk_tree_defs.h"
diff --git a/components/esp_hal_i2c/include/soc/i2c_periph.h b/components/esp_hal_i2c/include/hal/i2c_periph.h
similarity index 100%
rename from components/esp_hal_i2c/include/soc/i2c_periph.h
rename to components/esp_hal_i2c/include/hal/i2c_periph.h