diff --git a/components/app_trace/app_trace.c b/components/app_trace/app_trace.c
index e9b832f0c..5a577a70d 100644
--- a/components/app_trace/app_trace.c
+++ b/components/app_trace/app_trace.c
@@ -160,8 +160,7 @@
 #include "soc/dport_reg.h"
 #include "eri.h"
 #include "trax.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "esp_app_trace.h"
 
diff --git a/components/app_trace/gcov/gcov_rtio.c b/components/app_trace/gcov/gcov_rtio.c
index 7798890c1..41306b288 100644
--- a/components/app_trace/gcov/gcov_rtio.c
+++ b/components/app_trace/gcov/gcov_rtio.c
@@ -18,8 +18,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "soc/cpu.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_app_trace.h"
 #include "esp_private/dbg_stubs.h"
 
diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c
index edc70ca6f..df6d8a906 100644
--- a/components/app_update/esp_ota_ops.c
+++ b/components/app_update/esp_ota_ops.c
@@ -34,7 +34,6 @@
 #include "esp_ota_ops.h"
 #include "sys/queue.h"
 #include "esp32/rom/crc.h"
-#include "soc/dport_reg.h"
 #include "esp_log.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_common.h"
diff --git a/components/bootloader_support/include/esp_flash_encrypt.h b/components/bootloader_support/include/esp_flash_encrypt.h
index 59eca33b2..fd8c9fed0 100644
--- a/components/bootloader_support/include/esp_flash_encrypt.h
+++ b/components/bootloader_support/include/esp_flash_encrypt.h
@@ -20,7 +20,7 @@
 #ifndef BOOTLOADER_BUILD
 #include "esp_spi_flash.h"
 #endif
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 /**
  * @file esp_partition.h
diff --git a/components/bootloader_support/include/esp_secure_boot.h b/components/bootloader_support/include/esp_secure_boot.h
index 17b405e4f..299c4959d 100644
--- a/components/bootloader_support/include/esp_secure_boot.h
+++ b/components/bootloader_support/include/esp_secure_boot.h
@@ -15,7 +15,7 @@
 
 #include <stdbool.h>
 #include <esp_err.h>
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "sdkconfig.h"
 
diff --git a/components/bootloader_support/src/bootloader_clock.c b/components/bootloader_support/src/bootloader_clock.c
index 2ab92d2af..fda86b207 100644
--- a/components/bootloader_support/src/bootloader_clock.c
+++ b/components/bootloader_support/src/bootloader_clock.c
@@ -16,8 +16,7 @@
 #include "soc/soc.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
 
 void bootloader_clock_configure()
 {
diff --git a/components/bootloader_support/src/bootloader_common.c b/components/bootloader_support/src/bootloader_common.c
index e584ea3df..ed0169a96 100644
--- a/components/bootloader_support/src/bootloader_common.c
+++ b/components/bootloader_support/src/bootloader_common.c
@@ -17,16 +17,13 @@
 #include "sdkconfig.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "esp32/rom/spi_flash.h"
 #include "esp32/rom/crc.h"
-#include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "esp_secure_boot.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_flash.h"
 #include "bootloader_common.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/rtc.h"
 #include "esp_image_format.h"
 #include "bootloader_sha.h"
diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c
index 0733f6f7e..cae9c57e5 100644
--- a/components/bootloader_support/src/bootloader_init.c
+++ b/components/bootloader_support/src/bootloader_init.c
@@ -33,12 +33,12 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
 #include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"
diff --git a/components/bootloader_support/src/bootloader_random.c b/components/bootloader_support/src/bootloader_random.c
index eb34d6add..4ea86df52 100644
--- a/components/bootloader_support/src/bootloader_random.c
+++ b/components/bootloader_support/src/bootloader_random.c
@@ -14,11 +14,11 @@
 #include "bootloader_random.h"
 #include "soc/cpu.h"
 #include "soc/wdev_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/syscon_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/i2s_periph.h"
 #include "esp_log.h"
 
 #ifndef BOOTLOADER_BUILD
diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c
index d35553181..4500c723a 100644
--- a/components/bootloader_support/src/bootloader_utility.c
+++ b/components/bootloader_support/src/bootloader_utility.c
@@ -33,12 +33,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 
 #include "sdkconfig.h"
 #include "esp_image_format.h"
diff --git a/components/bootloader_support/src/esp32/bootloader_sha.c b/components/bootloader_support/src/esp32/bootloader_sha.c
index 646a8d35a..f42c8b663 100644
--- a/components/bootloader_support/src/esp32/bootloader_sha.c
+++ b/components/bootloader_support/src/esp32/bootloader_sha.c
@@ -17,8 +17,7 @@
 #include <assert.h>
 #include <sys/param.h>
 #include "esp32/rom/sha.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "esp32/rom/ets_sys.h" // TO REMOVE
 
 static uint32_t words_hashed;
diff --git a/components/bootloader_support/src/esp32/secure_boot.c b/components/bootloader_support/src/esp32/secure_boot.c
index 5de905e3b..e0da11830 100644
--- a/components/bootloader_support/src/esp32/secure_boot.c
+++ b/components/bootloader_support/src/esp32/secure_boot.c
@@ -22,10 +22,8 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/secure_boot.h"
 
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "sdkconfig.h"
 
diff --git a/components/bootloader_support/src/flash_qio_mode.c b/components/bootloader_support/src/flash_qio_mode.c
index af8c71452..db486c73e 100644
--- a/components/bootloader_support/src/flash_qio_mode.c
+++ b/components/bootloader_support/src/flash_qio_mode.c
@@ -18,9 +18,8 @@
 #include "esp_err.h"
 #include "esp32/rom/spi_flash.h"
 #include "esp32/rom/efuse.h"
-#include "soc/spi_struct.h"
-#include "soc/spi_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/spi_periph.h"
+#include "soc/efuse_periph.h"
 #include "sdkconfig.h"
 
 /* SPI flash controller */
diff --git a/components/bt/bt.c b/components/bt/bt.c
index 96f968bc0..2c665f20a 100644
--- a/components/bt/bt.c
+++ b/components/bt/bt.c
@@ -40,7 +40,6 @@
 #include "esp_ipc.h"
 #include "driver/periph_ctrl.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/soc_memory_layout.h"
 #include "esp32/clk.h"
 #include "esp_coexist_internal.h"
diff --git a/components/driver/can.c b/components/driver/can.c
index 25b91ebaf..6001e65f2 100644
--- a/components/driver/can.c
+++ b/components/driver/can.c
@@ -21,8 +21,7 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_pm.h"
-#include "soc/dport_reg.h"
-#include "soc/can_struct.h"
+#include "soc/can_periph.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "driver/can.h"
diff --git a/components/driver/gpio.c b/components/driver/gpio.c
index eda39c3f3..2cb6512c5 100644
--- a/components/driver/gpio.c
+++ b/components/driver/gpio.c
@@ -13,15 +13,13 @@
 // limitations under the License.
 #include <esp_types.h>
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/gpio.h"
 #include "driver/rtc_io.h"
 #include "soc/soc.h"
-#include "esp_log.h"
 #include "soc/gpio_periph.h"
+#include "esp_log.h"
 
 static const char* GPIO_TAG = "gpio";
 #define GPIO_CHECK(a, str, ret_val) \
diff --git a/components/driver/i2c.c b/components/driver/i2c.c
index 2b3a48e63..c2f9e5ba7 100644
--- a/components/driver/i2c.c
+++ b/components/driver/i2c.c
@@ -23,9 +23,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/i2c_periph.h"
 #include "driver/i2c.h"
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
diff --git a/components/driver/i2s.c b/components/driver/i2s.c
index 5f83c21a5..02322b341 100644
--- a/components/driver/i2s.c
+++ b/components/driver/i2s.c
@@ -19,12 +19,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
 #include "soc/rtc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp32/rom/lldesc.h"
 
 #include "driver/gpio.h"
diff --git a/components/driver/include/driver/adc.h b/components/driver/include/driver/adc.h
index b5a9a9848..91eb18fd2 100644
--- a/components/driver/include/driver/adc.h
+++ b/components/driver/include/driver/adc.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <stdbool.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/adc_channel.h"
+#include "soc/adc_periph.h"
 
 typedef enum {
     ADC_ATTEN_DB_0   = 0,  /*!<The input voltage of ADC will be reduced to about 1/1 */
diff --git a/components/driver/include/driver/dac.h b/components/driver/include/driver/dac.h
index f921d98f1..1e60263c2 100644
--- a/components/driver/include/driver/dac.h
+++ b/components/driver/include/driver/dac.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #include <stdint.h>
 #include "esp_err.h"
-#include "soc/dac_channel.h"
+#include "soc/dac_periph.h"
 
 typedef enum {
     DAC_CHANNEL_1 = 1,  /*!< DAC channel 1 is GPIO25 */
diff --git a/components/driver/include/driver/i2s.h b/components/driver/include/driver/i2s.h
index 2160bcfcd..59c11978e 100644
--- a/components/driver/include/driver/i2s.h
+++ b/components/driver/include/driver/i2s.h
@@ -16,12 +16,10 @@
 #define _DRIVER_I2S_H_
 #include "esp_err.h"
 #include <esp_types.h>
-#include "soc/gpio_reg.h"
 #include "soc/soc.h"
-#include "soc/i2s_struct.h"
-#include "soc/i2s_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/gpio.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
diff --git a/components/driver/include/driver/mcpwm.h b/components/driver/include/driver/mcpwm.h
index 6e4edac45..03483cc4a 100644
--- a/components/driver/include/driver/mcpwm.h
+++ b/components/driver/include/driver/mcpwm.h
@@ -20,7 +20,6 @@
 #include "driver/gpio.h"
 #include "driver/periph_ctrl.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/driver/include/driver/pcnt.h b/components/driver/include/driver/pcnt.h
index ce32050e5..76202cf90 100644
--- a/components/driver/include/driver/pcnt.h
+++ b/components/driver/include/driver/pcnt.h
@@ -8,11 +8,8 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "soc/soc.h"
-#include "soc/pcnt_reg.h"
-#include "soc/pcnt_struct.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/pcnt_periph.h"
 #include "driver/gpio.h"
-#include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/driver/include/driver/periph_ctrl.h b/components/driver/include/driver/periph_ctrl.h
index 9689a8cb2..a659e793f 100644
--- a/components/driver/include/driver/periph_ctrl.h
+++ b/components/driver/include/driver/periph_ctrl.h
@@ -15,9 +15,6 @@
 #ifndef _DRIVER_PERIPH_CTRL_H_
 #define _DRIVER_PERIPH_CTRL_H_
 
-#include "esp_err.h"
-#include "soc/soc.h"
-#include "soc/dport_reg.h"
 #include "soc/periph_defs.h"
 
 #ifdef __cplusplus
diff --git a/components/driver/include/driver/rmt.h b/components/driver/include/driver/rmt.h
index 87916b375..f177c82b3 100644
--- a/components/driver/include/driver/rmt.h
+++ b/components/driver/include/driver/rmt.h
@@ -15,9 +15,7 @@
 #ifndef _DRIVER_RMT_CTRL_H_
 #define _DRIVER_RMT_CTRL_H_
 #include "esp_err.h"
-#include "soc/rmt_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/rmt_struct.h"
+#include "soc/rmt_periph.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
diff --git a/components/driver/include/driver/rtc_io.h b/components/driver/include/driver/rtc_io.h
index 4e84ea1da..c636f61cc 100644
--- a/components/driver/include/driver/rtc_io.h
+++ b/components/driver/include/driver/rtc_io.h
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include "esp_err.h"
 #include "driver/gpio.h"
-#include "soc/rtc_gpio_channel.h"
 #include "soc/rtc_periph.h"
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/driver/include/driver/sigmadelta.h b/components/driver/include/driver/sigmadelta.h
index 76237c193..93388f0de 100644
--- a/components/driver/include/driver/sigmadelta.h
+++ b/components/driver/include/driver/sigmadelta.h
@@ -15,8 +15,7 @@
 #ifndef __DRIVER_SIGMADELTA_H__
 #define __DRIVER_SIGMADELTA_H__
 #include <esp_types.h>
-#include "soc/gpio_sd_struct.h"
-#include "soc/gpio_sd_reg.h"
+#include "soc/sigmadelta_periph.h"
 #include "driver/gpio.h"
 
 #ifdef _cplusplus
diff --git a/components/driver/include/driver/timer.h b/components/driver/include/driver/timer.h
index 48e2b9890..cbf2a5bd2 100644
--- a/components/driver/include/driver/timer.h
+++ b/components/driver/include/driver/timer.h
@@ -17,8 +17,7 @@
 #include "esp_err.h"
 #include "esp_attr.h"
 #include "soc/soc.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/timer_periph.h"
 #include "esp_intr_alloc.h"
 
 #ifdef __cplusplus
diff --git a/components/driver/include/driver/touch_pad.h b/components/driver/include/driver/touch_pad.h
index 8d8c72040..0c3884ded 100644
--- a/components/driver/include/driver/touch_pad.h
+++ b/components/driver/include/driver/touch_pad.h
@@ -17,10 +17,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "esp_intr_alloc.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "soc/touch_channel.h"
+#include "soc/touch_periph.h"
 
 typedef enum {
     TOUCH_PAD_NUM0 = 0, /*!< Touch pad channel 0 is GPIO4 */
diff --git a/components/driver/include/driver/uart.h b/components/driver/include/driver/uart.h
index e716e5424..4f0c8c1ca 100644
--- a/components/driver/include/driver/uart.h
+++ b/components/driver/include/driver/uart.h
@@ -20,8 +20,7 @@
 extern "C" {
 #endif
 
-#include "soc/uart_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
@@ -32,7 +31,6 @@ extern "C" {
 #include "freertos/queue.h"
 #include "freertos/ringbuf.h"
 #include <esp_types.h>
-#include "soc/uart_channel.h"
 
 #define UART_FIFO_LEN           (128)        /*!< Length of the hardware FIFO buffers */
 #define UART_INTR_MASK          0x1ff        /*!< Mask of all UART interrupts */
diff --git a/components/driver/ledc.c b/components/driver/ledc.c
index 996e1dbbd..92a055cbc 100644
--- a/components/driver/ledc.c
+++ b/components/driver/ledc.c
@@ -13,15 +13,12 @@
 // limitations under the License.
 #include <esp_types.h>
 #include <string.h>
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "driver/ledc.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_log.h"
 
 static const char* LEDC_TAG = "ledc";
diff --git a/components/driver/mcpwm.c b/components/driver/mcpwm.c
index 761176ecf..714855ea5 100644
--- a/components/driver/mcpwm.c
+++ b/components/driver/mcpwm.c
@@ -15,16 +15,12 @@
 #include <stdio.h>
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/mcpwm_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/mcpwm.h"
 #include "driver/periph_ctrl.h"
 
diff --git a/components/driver/pcnt.c b/components/driver/pcnt.c
index b91cb5965..249a7f828 100644
--- a/components/driver/pcnt.c
+++ b/components/driver/pcnt.c
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "esp_intr_alloc.h"
 #include "driver/pcnt.h"
 #include "driver/periph_ctrl.h"
 
diff --git a/components/driver/periph_ctrl.c b/components/driver/periph_ctrl.c
index 522c8d587..65ece09e1 100644
--- a/components/driver/periph_ctrl.c
+++ b/components/driver/periph_ctrl.c
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <esp_types.h>
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
diff --git a/components/driver/rmt.c b/components/driver/rmt.c
index af345a494..10605d2e2 100644
--- a/components/driver/rmt.c
+++ b/components/driver/rmt.c
@@ -21,9 +21,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/rmt_struct.h"
+#include "soc/gpio_periph.h"
 #include "driver/periph_ctrl.h"
 #include "driver/rmt.h"
 #include "soc/soc_memory_layout.h"
diff --git a/components/driver/rtc_module.c b/components/driver/rtc_module.c
index 296c183c7..eae287199 100644
--- a/components/driver/rtc_module.c
+++ b/components/driver/rtc_module.c
@@ -17,14 +17,9 @@
 #include <ctype.h>
 #include "esp32/rom/ets_sys.h"
 #include "esp_log.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_io_struct.h"
-#include "soc/sens_reg.h"
-#include "soc/sens_struct.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_cntl_struct.h"
-#include "soc/syscon_reg.h"
-#include "soc/syscon_struct.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/syscon_periph.h"
 #include "soc/rtc.h"
 #include "rtc_io.h"
 #include "touch_pad.h"
diff --git a/components/driver/sdio_slave.c b/components/driver/sdio_slave.c
index 1e5814a17..1bd805c8e 100644
--- a/components/driver/sdio_slave.c
+++ b/components/driver/sdio_slave.c
@@ -91,10 +91,8 @@ The driver of FIFOs works as below:
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
-#include "soc/dport_access.h"
-#include "soc/dport_reg.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "freertos/semphr.h"
 #include "xtensa/core-macros.h"
 #include "driver/periph_ctrl.h"
diff --git a/components/driver/sdmmc_host.c b/components/driver/sdmmc_host.c
index ff3431fd8..7a8969fd2 100644
--- a/components/driver/sdmmc_host.c
+++ b/components/driver/sdmmc_host.c
@@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp32/rom/gpio.h"
 #include "driver/gpio.h"
 #include "driver/sdmmc_host.h"
diff --git a/components/driver/sdspi_transaction.c b/components/driver/sdspi_transaction.c
index 3e74a68b8..f8dec0a2e 100644
--- a/components/driver/sdspi_transaction.c
+++ b/components/driver/sdspi_transaction.c
@@ -16,8 +16,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "sys/lock.h"
-#include "soc/sdmmc_reg.h"
-#include "soc/sdmmc_periph.h"
 #include "driver/sdmmc_types.h"
 #include "driver/sdmmc_defs.h"
 #include "driver/sdmmc_host.h"
diff --git a/components/driver/sigmadelta.c b/components/driver/sigmadelta.c
index d68071bf7..bc2981315 100644
--- a/components/driver/sigmadelta.c
+++ b/components/driver/sigmadelta.c
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "esp_log.h"
-#include "soc/soc.h"
-#include "driver/periph_ctrl.h"
 #include "driver/sigmadelta.h"
 
 static const char* SIGMADELTA_TAG = "SIGMADELTA";
diff --git a/components/driver/spi_common.c b/components/driver/spi_common.c
index de786a61b..6677ef656 100644
--- a/components/driver/spi_common.c
+++ b/components/driver/spi_common.c
@@ -15,13 +15,10 @@
 
 #include <string.h>
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "soc/soc.h"
diff --git a/components/driver/spi_master.c b/components/driver/spi_master.c
index 94d875f90..90382fd01 100644
--- a/components/driver/spi_master.c
+++ b/components/driver/spi_master.c
@@ -121,13 +121,11 @@ We have two bits to control the interrupt:
 #include <string.h>
 #include "driver/spi_common.h"
 #include "driver/spi_master.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -135,12 +133,9 @@ We have two bits to control the interrupt:
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 #include "stdatomic.h"
 #include "sdkconfig.h"
diff --git a/components/driver/spi_slave.c b/components/driver/spi_slave.c
index b4a15c158..f9f792a28 100644
--- a/components/driver/spi_slave.c
+++ b/components/driver/spi_slave.c
@@ -18,13 +18,11 @@
 #include <soc/lldesc.h>
 #include "driver/spi_common.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "soc/spi_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_pm.h"
@@ -32,12 +30,9 @@
 #include "freertos/semphr.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
-#include "soc/soc.h"
 #include "soc/soc_memory_layout.h"
-#include "soc/dport_reg.h"
 #include "esp32/rom/lldesc.h"
 #include "driver/gpio.h"
-#include "driver/periph_ctrl.h"
 #include "esp_heap_caps.h"
 
 static const char *SPI_TAG = "spi_slave";
diff --git a/components/driver/test/test_i2c.c b/components/driver/test/test_i2c.c
index 48aea2a4b..e445c8b34 100644
--- a/components/driver/test/test_i2c.c
+++ b/components/driver/test/test_i2c.c
@@ -11,9 +11,8 @@
 #include "driver/i2c.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/i2c_struct.h"
-#include "soc/i2c_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2c_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 
diff --git a/components/driver/test/test_ledc.c b/components/driver/test/test_ledc.c
index 93632d8e5..d0e35851d 100644
--- a/components/driver/test/test_ledc.c
+++ b/components/driver/test/test_ledc.c
@@ -20,8 +20,7 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/ledc_reg.h"
-#include "soc/ledc_struct.h"
+#include "soc/ledc_periph.h"
 #include "esp_system.h"
 #include "driver/pcnt.h"
 #include "driver/ledc.h"
diff --git a/components/driver/test/test_pcnt.c b/components/driver/test/test_pcnt.c
index 35917363e..ae5656a84 100644
--- a/components/driver/test/test_pcnt.c
+++ b/components/driver/test/test_pcnt.c
@@ -20,7 +20,7 @@
 #include "driver/ledc.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
 
diff --git a/components/driver/test/test_pwm.c b/components/driver/test/test_pwm.c
index d64584880..b787f8e3a 100644
--- a/components/driver/test/test_pwm.c
+++ b/components/driver/test/test_pwm.c
@@ -20,8 +20,7 @@
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 #include "freertos/queue.h"
 #include "esp_attr.h"
 #include "esp_log.h"
diff --git a/components/driver/test/test_rmt.c b/components/driver/test/test_rmt.c
index 57c2247af..7b186b2c5 100644
--- a/components/driver/test/test_rmt.c
+++ b/components/driver/test/test_rmt.c
@@ -13,7 +13,7 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/periph_ctrl.h"
-#include "soc/rmt_reg.h"
+#include "soc/rmt_periph.h"
 
 static const char* TAG = "RMT";
 
diff --git a/components/driver/test/test_spi_master.c b/components/driver/test/test_spi_master.c
index 82b9fcc9e..22b1961cc 100644
--- a/components/driver/test/test_spi_master.c
+++ b/components/driver/test/test_spi_master.c
@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"
diff --git a/components/driver/test/test_spi_sio.c b/components/driver/test/test_spi_sio.c
index df9cff110..37d4065df 100644
--- a/components/driver/test/test_spi_sio.c
+++ b/components/driver/test/test_spi_sio.c
@@ -16,7 +16,6 @@
 #include "unity.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
-#include "soc/dport_reg.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
 #include "soc/spi_periph.h"
diff --git a/components/driver/timer.c b/components/driver/timer.c
index 8b1532fbd..6a82d87fa 100644
--- a/components/driver/timer.c
+++ b/components/driver/timer.c
@@ -15,7 +15,6 @@
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "driver/timer.h"
diff --git a/components/driver/uart.c b/components/driver/uart.c
index 411279e22..fffd727e7 100644
--- a/components/driver/uart.c
+++ b/components/driver/uart.c
@@ -15,7 +15,6 @@
 #include "esp_types.h"
 #include "esp_attr.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_err.h"
 #include "esp32/clk.h"
@@ -25,8 +24,7 @@
 #include "freertos/xtensa_api.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
-#include "soc/dport_reg.h"
-#include "soc/uart_struct.h"
+#include "soc/uart_periph.h"
 #include "driver/uart.h"
 #include "driver/gpio.h"
 #include "driver/uart_select.h"
diff --git a/components/efuse/src/esp_efuse_api.c b/components/efuse/src/esp_efuse_api.c
index d697a0d4c..57a71970a 100644
--- a/components/efuse/src/esp_efuse_api.c
+++ b/components/efuse/src/esp_efuse_api.c
@@ -14,7 +14,7 @@
 
 #include "esp_efuse.h"
 #include "esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "assert.h"
 #include "sdkconfig.h"
 #include "esp_efuse_table.h"
diff --git a/components/efuse/src/esp_efuse_fields.c b/components/efuse/src/esp_efuse_fields.c
index f9cb97799..a456d7a94 100644
--- a/components/efuse/src/esp_efuse_fields.c
+++ b/components/efuse/src/esp_efuse_fields.c
@@ -21,7 +21,7 @@
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "bootloader_random.h"
 
 const static char *TAG = "efuse";
diff --git a/components/efuse/src/esp_efuse_utility.c b/components/efuse/src/esp_efuse_utility.c
index a9401f163..03ea26084 100644
--- a/components/efuse/src/esp_efuse_utility.c
+++ b/components/efuse/src/esp_efuse_utility.c
@@ -14,7 +14,7 @@
 
 #include "esp_efuse_utility.h"
 
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_log.h"
 #include "assert.h"
 #include "sdkconfig.h"
diff --git a/components/efuse/test/test_efuse_coding_scheme.c b/components/efuse/test/test_efuse_coding_scheme.c
index 242702d9f..cccacb5d6 100644
--- a/components/efuse/test/test_efuse_coding_scheme.c
+++ b/components/efuse/test/test_efuse_coding_scheme.c
@@ -2,7 +2,7 @@
 #include <strings.h>
 #include "esp_efuse.h"
 #include "../src/esp_efuse_utility.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "unity.h"
 #include "bootloader_random.h"
 
diff --git a/components/esp32/brownout.c b/components/esp32/brownout.c
index 1e81768ef..35589330f 100644
--- a/components/esp32/brownout.c
+++ b/components/esp32/brownout.c
@@ -19,7 +19,7 @@
 #include "sdkconfig.h"
 #include "soc/soc.h"
 #include "soc/cpu.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/ets_sys.h"
 #include "esp_private/system_internal.h"
 #include "driver/rtc_cntl.h"
diff --git a/components/esp32/cache_err_int.c b/components/esp32/cache_err_int.c
index fd17edf65..079812023 100644
--- a/components/esp32/cache_err_int.c
+++ b/components/esp32/cache_err_int.c
@@ -29,7 +29,6 @@
 #include "esp_attr.h"
 #include "soc/dport_reg.h"
 #include "sdkconfig.h"
-#include "esp32/dport_access.h"
 
 void esp_cache_err_int_init()
 {
diff --git a/components/esp32/clk.c b/components/esp32/clk.c
index 02a8caa17..6aa2bffa7 100644
--- a/components/esp32/clk.c
+++ b/components/esp32/clk.c
@@ -25,10 +25,11 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/rtc.h"
 #include "soc/soc.h"
+#include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/i2s_periph.h"
 #include "driver/periph_ctrl.h"
 #include "xtensa/core-macros.h"
 #include "bootloader_clock.h"
diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index f4bac3bb2..e8e110099 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -26,11 +26,10 @@
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/rtc_wdt.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 
 #include "driver/rtc_io.h"
 
@@ -48,7 +47,6 @@
 #include "esp_event.h"
 #include "esp_spi_flash.h"
 #include "esp_ipc.h"
-#include "esp32/dport_access.h"
 #include "esp_private/crosscore_int.h"
 #include "esp_log.h"
 #include "esp_vfs_dev.h"
diff --git a/components/esp32/crosscore_int.c b/components/esp32/crosscore_int.c
index 986deb284..746060e44 100644
--- a/components/esp32/crosscore_int.c
+++ b/components/esp32/crosscore_int.c
@@ -17,15 +17,14 @@
 #include "esp_attr.h"
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/uart.h"
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/rtc_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
diff --git a/components/esp32/dport_access.c b/components/esp32/dport_access.c
index 1f1a4dda1..de828eb06 100644
--- a/components/esp32/dport_access.c
+++ b/components/esp32/dport_access.c
@@ -31,7 +31,7 @@
 
 #include "soc/cpu.h"
 #include "soc/dport_reg.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
diff --git a/components/esp32/gdbstub.c b/components/esp32/gdbstub.c
index 5c33045f1..08623dce4 100644
--- a/components/esp32/gdbstub.c
+++ b/components/esp32/gdbstub.c
@@ -20,8 +20,8 @@
 
 #include <string.h>
 #include "esp32/rom/ets_sys.h"
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "esp_private/gdbstub.h"
 #include "esp_debug_helpers.h"
 #include "driver/gpio.h"
diff --git a/components/esp32/int_wdt.c b/components/esp32/int_wdt.c
index b384dceba..f42b98773 100644
--- a/components/esp32/int_wdt.c
+++ b/components/esp32/int_wdt.c
@@ -26,8 +26,7 @@
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"
 #include "esp_int_wdt.h"
diff --git a/components/esp32/intr_alloc.c b/components/esp32/intr_alloc.c
index 856cebb55..b74c4f929 100644
--- a/components/esp32/intr_alloc.c
+++ b/components/esp32/intr_alloc.c
@@ -28,7 +28,6 @@
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
 #include "esp_attr.h"
-#include "esp_intr_alloc.h"
 #include "esp_ipc.h"
 #include <limits.h>
 #include <assert.h>
diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index f27d45720..b66ba9437 100644
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -22,12 +22,11 @@
 #include "freertos/task.h"
 #include "freertos/xtensa_api.h"
 
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"
diff --git a/components/esp32/pm_trace.c b/components/esp32/pm_trace.c
index b4cebf85f..02a636211 100644
--- a/components/esp32/pm_trace.c
+++ b/components/esp32/pm_trace.c
@@ -15,7 +15,6 @@
 
 #include "esp_private/pm_trace.h"
 #include "driver/gpio.h"
-#include "soc/gpio_reg.h"
 
 /* GPIOs to use for tracing of esp_pm events.
  * Two entries in the array for each type, one for each CPU.
diff --git a/components/esp32/reset_reason.c b/components/esp32/reset_reason.c
index f9cc0062f..0b291b12c 100644
--- a/components/esp32/reset_reason.c
+++ b/components/esp32/reset_reason.c
@@ -15,7 +15,7 @@
 #include "esp_system.h"
 #include "esp32/rom/rtc.h"
 #include "esp_private/system_internal.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 
 static void esp_reset_reason_clear_hint();
 
diff --git a/components/esp32/sleep_modes.c b/components/esp32/sleep_modes.c
index 25d5c8594..04179d379 100644
--- a/components/esp32/sleep_modes.c
+++ b/components/esp32/sleep_modes.c
@@ -27,10 +27,7 @@
 #include "esp32/rom/uart.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/spi_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/spi_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc_wdt.h"
 #include "soc/soc_memory_layout.h"
diff --git a/components/esp32/spiram_psram.c b/components/esp32/spiram_psram.c
index f7d88c859..56fa95632 100644
--- a/components/esp32/spiram_psram.c
+++ b/components/esp32/spiram_psram.c
@@ -29,10 +29,8 @@
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/cache.h"
 #include "esp32/rom/efuse.h"
-#include "soc/io_mux_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "driver/gpio.h"
 #include "driver/spi_common.h"
 #include "driver/periph_ctrl.h"
diff --git a/components/esp32/spiram_psram.h b/components/esp32/spiram_psram.h
index 34c6e9f38..5a5f147bf 100644
--- a/components/esp32/spiram_psram.h
+++ b/components/esp32/spiram_psram.h
@@ -15,7 +15,7 @@
 
 #ifndef _PSRAM_H
 #define _PSRAM_H
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 #include "esp_err.h"
 #include "sdkconfig.h"
 
diff --git a/components/esp32/system_api.c b/components/esp32/system_api.c
index ce52e96fe..bd81a82db 100644
--- a/components/esp32/system_api.c
+++ b/components/esp32/system_api.c
@@ -24,11 +24,10 @@
 #include "esp32/rom/cache.h"
 #include "esp32/rom/uart.h"
 #include "soc/dport_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
-#include "soc/timer_group_struct.h"
+#include "soc/gpio_periph.h"
+#include "soc/efuse_periph.h"
+#include "soc/rtc_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_wdt.h"
diff --git a/components/esp32/task_wdt.c b/components/esp32/task_wdt.c
index d7edf732a..86610be94 100644
--- a/components/esp32/task_wdt.c
+++ b/components/esp32/task_wdt.c
@@ -26,11 +26,9 @@
 #include <esp_types.h>
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
 #include "esp_freertos_hooks.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_log.h"
 #include "driver/timer.h"
 #include "driver/periph_ctrl.h"
diff --git a/components/esp32/test/test_aes_sha_rsa.c b/components/esp32/test/test_aes_sha_rsa.c
index 93210b877..8453b68f5 100644
--- a/components/esp32/test/test_aes_sha_rsa.c
+++ b/components/esp32/test/test_aes_sha_rsa.c
@@ -13,7 +13,7 @@
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
 #include "esp32/rom/sha.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 #include "esp_log.h"
diff --git a/components/esp32/test/test_ahb_arb.c b/components/esp32/test/test_ahb_arb.c
index c6bf622fb..185bbb3dd 100644
--- a/components/esp32/test/test_ahb_arb.c
+++ b/components/esp32/test/test_ahb_arb.c
@@ -14,12 +14,10 @@
 
 #include "unity.h"
 
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 
diff --git a/components/esp32/test/test_dport.c b/components/esp32/test/test_dport.c
index 212c5d82b..ac8498631 100644
--- a/components/esp32/test/test_dport.c
+++ b/components/esp32/test/test_dport.c
@@ -11,7 +11,7 @@
 #include "unity.h"
 #include "test_utils.h"
 #include "esp32/rom/uart.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
 
diff --git a/components/esp32/test/test_fastbus.c b/components/esp32/test/test_fastbus.c
index 5a1ace8e1..626e92595 100644
--- a/components/esp32/test/test_fastbus.c
+++ b/components/esp32/test/test_fastbus.c
@@ -9,9 +9,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 
diff --git a/components/esp32/test/test_intr_alloc.c b/components/esp32/test/test_intr_alloc.c
index 4439f9bca..8255388e9 100644
--- a/components/esp32/test/test_intr_alloc.c
+++ b/components/esp32/test/test_intr_alloc.c
@@ -12,9 +12,9 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/gpio_periph.h"
 #include "esp_intr_alloc.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
@@ -334,4 +334,4 @@ TEST_CASE("alloc and free isr handle on different core", "[esp32]")
     isr_alloc_free_test();
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/components/esp32/test/test_pm.c b/components/esp32/test/test_pm.c
index ba3850daa..cf031ab59 100644
--- a/components/esp32/test/test_pm.c
+++ b/components/esp32/test/test_pm.c
@@ -13,9 +13,7 @@
 #include "driver/timer.h"
 #include "driver/rtc_io.h"
 #include "esp32/ulp.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_gpio_channel.h"
+#include "soc/rtc_periph.h"
 
 TEST_CASE("Can dump power management lock stats", "[pm]")
 {
diff --git a/components/esp32/test/test_reset_reason.c b/components/esp32/test/test_reset_reason.c
index 07b1b29f1..9d57a7f4c 100644
--- a/components/esp32/test/test_reset_reason.c
+++ b/components/esp32/test/test_reset_reason.c
@@ -2,7 +2,7 @@
 #include "esp_system.h"
 #include "esp_task_wdt.h"
 #include "esp_attr.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "driver/timer.h"
 #include "esp32/rom/rtc.h"
 #include "esp_sleep.h"
diff --git a/components/esp32/test/test_sleep.c b/components/esp32/test/test_sleep.c
index fbda5f6da..8712bdfd0 100644
--- a/components/esp32/test/test_sleep.c
+++ b/components/esp32/test/test_sleep.c
@@ -4,15 +4,14 @@
 #include "esp_sleep.h"
 #include "esp32/clk.h"
 #include "driver/rtc_io.h"
-#include "soc/gpio_reg.h"
-#include "soc/rtc.h"
-#include "soc/uart_reg.h"
 #include "esp32/rom/uart.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
+#include "soc/gpio_periph.h"
+#include "soc/uart_periph.h"
 #include "soc/rtc.h"            // for wakeup trigger defines
-#include "soc/rtc_cntl_reg.h"   // for read rtc registers directly (cause)
+#include "soc/rtc_periph.h"     // for read rtc registers directly (cause)
 #include "soc/soc.h"            // for direct register read macros
 #include "esp32/rom/rtc.h"
 #include "esp_newlib.h"
diff --git a/components/esp32/test/test_spiram_cache_flush.c b/components/esp32/test/test_spiram_cache_flush.c
index 92116c3fd..6e984be6c 100644
--- a/components/esp32/test/test_spiram_cache_flush.c
+++ b/components/esp32/test/test_spiram_cache_flush.c
@@ -11,8 +11,6 @@ This code tests the interaction between PSRAM and SPI flash routines.
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/components/esp32/test/test_tsens.c b/components/esp32/test/test_tsens.c
index bff507848..1e311c6bc 100644
--- a/components/esp32/test/test_tsens.c
+++ b/components/esp32/test/test_tsens.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include "unity.h"
 #include "esp32/rom/ets_sys.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 
 TEST_CASE("can control TSENS using registers", "[rtc][ignore]")
 {
diff --git a/components/esp32/test/test_unal_dma.c b/components/esp32/test/test_unal_dma.c
index 7e67a89f5..91c22c6c4 100644
--- a/components/esp32/test/test_unal_dma.c
+++ b/components/esp32/test/test_unal_dma.c
@@ -14,12 +14,9 @@
 #include "freertos/xtensa_api.h"
 #include "unity.h"
 
-#include "soc/uart_reg.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/gpio_reg.h"
-#include "soc/i2s_reg.h"
+#include "soc/gpio_periph.h"
+#include "soc/i2s_periph.h"
 
 
 #define DPORT_I2S0_CLK_EN   (BIT(4))
diff --git a/components/esp_adc_cal/esp_adc_cal.c b/components/esp_adc_cal/esp_adc_cal.c
index 66cae9fed..f71c08637 100644
--- a/components/esp_adc_cal/esp_adc_cal.c
+++ b/components/esp_adc_cal/esp_adc_cal.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include "esp_types.h"
 #include "driver/adc.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "esp_err.h"
 #include "assert.h"
 #include "esp_adc_cal.h"
diff --git a/components/esp_event/test/test_event.c b/components/esp_event/test/test_event.c
index c5dcc868d..d6d9beab7 100644
--- a/components/esp_event/test/test_event.c
+++ b/components/esp_event/test/test_event.c
@@ -9,7 +9,6 @@
 #include "freertos/task.h"
 #include "freertos/portmacro.h"
 #include "esp_log.h"
-#include "soc/timer_group_struct.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 
diff --git a/components/esp_rom/include/esp32/rom/uart.h b/components/esp_rom/include/esp32/rom/uart.h
index a010bfbca..49d0e8cf7 100644
--- a/components/esp_rom/include/esp32/rom/uart.h
+++ b/components/esp_rom/include/esp32/rom/uart.h
@@ -19,7 +19,7 @@
 #include "esp_attr.h"
 #include "ets_sys.h"
 #include "soc/soc.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c
index 8bc8eba22..b36b5754f 100644
--- a/components/esp_wifi/src/phy_init.c
+++ b/components/esp_wifi/src/phy_init.c
@@ -22,7 +22,6 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/rtc.h"
 #include "soc/rtc.h"
-#include "soc/dport_reg.h"
 
 #include "esp_err.h"
 #include "esp_phy_init.h"
diff --git a/components/espcoredump/src/core_dump_uart.c b/components/espcoredump/src/core_dump_uart.c
index dfc62d9a8..d3afbe5d0 100644
--- a/components/espcoredump/src/core_dump_uart.c
+++ b/components/espcoredump/src/core_dump_uart.c
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <string.h>
-#include "soc/uart_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/uart_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/gpio.h"
 #include "esp32/clk.h"
 #include "esp_core_dump_priv.h"
diff --git a/components/ethernet/emac_dev.c b/components/ethernet/emac_dev.c
index 9a56dcd3f..51b6f918d 100644
--- a/components/ethernet/emac_dev.c
+++ b/components/ethernet/emac_dev.c
@@ -19,12 +19,8 @@
 #include "esp32/rom/gpio.h"
 
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
-#include "soc/gpio_sig_map.h"
-#include "soc/emac_reg_v2.h"
-#include "soc/emac_ex_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 
 #include "esp_log.h"
 #include "driver/gpio.h"
diff --git a/components/ethernet/emac_dev.h b/components/ethernet/emac_dev.h
index 3d686cf88..1c44f4366 100644
--- a/components/ethernet/emac_dev.h
+++ b/components/ethernet/emac_dev.h
@@ -20,7 +20,7 @@ extern "C" {
 #endif
 
 #include "esp_types.h"
-#include "soc/emac_reg_v2.h"
+#include "soc/emac_periph.h"
 
 #define EMAC_INTR_ENABLE_BIT (EMAC_DMAIN_TIE | EMAC_DMAIN_RIE | EMAC_DMAIN_RBUE | EMAC_DMAIN_NISE)
 
diff --git a/components/ethernet/emac_main.c b/components/ethernet/emac_main.c
index 7b087772d..89046e889 100644
--- a/components/ethernet/emac_main.c
+++ b/components/ethernet/emac_main.c
@@ -19,13 +19,10 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/gpio.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/gpio_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/emac_ex_reg.h"
-#include "soc/emac_reg_v2.h"
 #include "soc/soc.h"
 
 #include "tcpip_adapter.h"
diff --git a/components/freemodbus/port/portserial.c b/components/freemodbus/port/portserial.c
index 43bc887e4..54bbe8318 100644
--- a/components/freemodbus/port/portserial.c
+++ b/components/freemodbus/port/portserial.c
@@ -44,7 +44,7 @@
 #include "port.h"
 #include "driver/uart.h"
 #include "freertos/queue.h" // for queue support
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "driver/gpio.h"
 #include "esp_log.h"        // for esp_log
 #include "esp_err.h"        // for ESP_ERROR_CHECK macro
diff --git a/components/freertos/test/test_freertos.c b/components/freertos/test/test_freertos.c
index b760ba229..5925b6487 100644
--- a/components/freertos/test/test_freertos.c
+++ b/components/freertos/test/test_freertos.c
@@ -12,9 +12,8 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "driver/gpio.h"
 
 
diff --git a/components/freertos/test/test_newlib_reent.c b/components/freertos/test/test_newlib_reent.c
index 4719d40bd..ea723b70a 100644
--- a/components/freertos/test/test_newlib_reent.c
+++ b/components/freertos/test/test_newlib_reent.c
@@ -13,10 +13,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 volatile static int done;
 volatile static int error;
diff --git a/components/freertos/test/test_panic.c b/components/freertos/test/test_panic.c
index 336bfea37..295e0486f 100644
--- a/components/freertos/test/test_panic.c
+++ b/components/freertos/test/test_panic.c
@@ -12,10 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
-
 
 TEST_CASE("Panic handler", "[freertos][ignore]")
 {
diff --git a/components/freertos/test/test_spinlocks.c b/components/freertos/test/test_spinlocks.c
index 3a99ebe2b..a54908f33 100644
--- a/components/freertos/test/test_spinlocks.c
+++ b/components/freertos/test/test_spinlocks.c
@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "soc/cpu.h"
 
 #include "test_utils.h"
diff --git a/components/freertos/xtensa_vectors.S b/components/freertos/xtensa_vectors.S
index e5e63bcf1..3ddad261d 100644
--- a/components/freertos/xtensa_vectors.S
+++ b/components/freertos/xtensa_vectors.S
@@ -94,7 +94,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "esp_private/panic_reason.h"
 #include "sdkconfig.h"
 #include "soc/soc.h"
-#include "soc/dport_reg.h"
 
 /*
   Define for workaround: pin no-cpu-affinity tasks to a cpu when fpu is used.
diff --git a/components/heap/test/test_malloc.c b/components/heap/test/test_malloc.c
index bffb498d1..1ed67ce50 100644
--- a/components/heap/test/test_malloc.c
+++ b/components/heap/test/test_malloc.c
@@ -12,9 +12,6 @@
 #include "freertos/queue.h"
 #include "freertos/xtensa_api.h"
 #include "unity.h"
-#include "soc/uart_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/io_mux_reg.h"
 #include "esp_heap_caps.h"
 
 #include "esp_debug_helpers.h"
diff --git a/components/mbedtls/port/esp32/aes.c b/components/mbedtls/port/esp32/aes.c
index 631ed24fe..0cf6c4257 100644
--- a/components/mbedtls/port/esp32/aes.c
+++ b/components/mbedtls/port/esp32/aes.c
@@ -29,8 +29,7 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/platform_util.h"
 #include "esp32/aes.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include <sys/lock.h>
 
 #include <freertos/FreeRTOS.h>
diff --git a/components/mbedtls/port/esp32/sha.c b/components/mbedtls/port/esp32/sha.c
index 0f8a4ca0a..7b7a0f415 100644
--- a/components/mbedtls/port/esp32/sha.c
+++ b/components/mbedtls/port/esp32/sha.c
@@ -35,8 +35,7 @@
 
 #include "esp32/sha.h"
 #include "esp32/rom/ets_sys.h"
-#include "soc/dport_reg.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "driver/periph_ctrl.h"
 
 inline static uint32_t SHA_LOAD_REG(esp_sha_type sha_type) {
diff --git a/components/mbedtls/port/esp_bignum.c b/components/mbedtls/port/esp_bignum.c
index 3f748efb3..843c40d9b 100644
--- a/components/mbedtls/port/esp_bignum.c
+++ b/components/mbedtls/port/esp_bignum.c
@@ -28,17 +28,14 @@
 #include <stdlib.h>
 #include <sys/param.h>
 #include "esp32/rom/bigint.h"
-#include "soc/hwcrypto_reg.h"
+#include "soc/hwcrypto_periph.h"
 #include "esp_system.h"
 #include "esp_log.h"
 #include "esp_intr_alloc.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
 
 #include <mbedtls/bignum.h>
 
-#include "soc/dport_reg.h"
-
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
diff --git a/components/mbedtls/test/test_apb_dport_access.c b/components/mbedtls/test/test_apb_dport_access.c
index 6cd763f94..392effc91 100644
--- a/components/mbedtls/test/test_apb_dport_access.c
+++ b/components/mbedtls/test/test_apb_dport_access.c
@@ -6,7 +6,7 @@
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/uart_reg.h"
+#include "soc/uart_periph.h"
 #include "test_apb_dport_access.h"
 #include "test_utils.h"
 
diff --git a/components/newlib/test/test_time.c b/components/newlib/test/test_time.c
index 213e42c3f..92f1bf899 100644
--- a/components/newlib/test/test_time.c
+++ b/components/newlib/test/test_time.c
@@ -4,7 +4,6 @@
 #include "driver/adc.h"
 #include <time.h>
 #include <sys/time.h>
-#include "soc/rtc_cntl_reg.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
diff --git a/components/newlib/time.c b/components/newlib/time.c
index 4458a2e66..2eb8b4b27 100644
--- a/components/newlib/time.c
+++ b/components/newlib/time.c
@@ -29,7 +29,6 @@
 #include "esp_timer.h"
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/frc_timer_reg.h"
 #include "esp32/rom/ets_sys.h"
 #include "freertos/FreeRTOS.h"
diff --git a/components/sdmmc/test/test_sd.c b/components/sdmmc/test/test_sd.c
index 07965960a..b1b418c95 100644
--- a/components/sdmmc/test/test_sd.c
+++ b/components/sdmmc/test/test_sd.c
@@ -20,7 +20,6 @@
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
 #include "driver/sdmmc_defs.h"
-#include "soc/gpio_reg.h"
 #include "sdmmc_cmd.h"
 #include "esp_log.h"
 #include "esp_heap_caps.h"
diff --git a/components/sdmmc/test/test_sdio.c b/components/sdmmc/test/test_sdio.c
index f4eae0598..56213d713 100644
--- a/components/sdmmc/test/test_sdio.c
+++ b/components/sdmmc/test/test_sdio.c
@@ -23,7 +23,6 @@
 #include "driver/sdmmc_host.h"
 #include "driver/sdmmc_defs.h"
 #include "sdmmc_cmd.h"
-#include "soc/gpio_reg.h"
 #include "unity.h"
 
 /* Second ESP32 board attached as follows:
diff --git a/components/soc/esp32/cpu_util.c b/components/soc/esp32/cpu_util.c
index bc052af98..83ae830b9 100644
--- a/components/soc/esp32/cpu_util.c
+++ b/components/soc/esp32/cpu_util.c
@@ -15,7 +15,7 @@
 #include "esp_attr.h"
 #include "soc/cpu.h"
 #include "soc/soc.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "sdkconfig.h"
 
 void IRAM_ATTR esp_cpu_stall(int cpu_id)
diff --git a/components/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h
index 12f65caf9..4dd0db6e2 100644
--- a/components/soc/esp32/include/soc/rtc.h
+++ b/components/soc/esp32/include/soc/rtc.h
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "soc/soc.h"
+#include "soc/rtc_periph.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/soc/esp32/rtc_clk.c b/components/soc/esp32/rtc_clk.c
index 596ccf274..80a749b22 100644
--- a/components/soc/esp32/rtc_clk.c
+++ b/components/soc/esp32/rtc_clk.c
@@ -21,11 +21,10 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/gpio.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/efuse_periph.h"
 #include "soc/apb_ctrl_reg.h"
 #include "i2c_rtc_clk.h"
 #include "soc_log.h"
diff --git a/components/soc/esp32/rtc_clk_init.c b/components/soc/esp32/rtc_clk_init.c
index ef1485311..e62846d19 100644
--- a/components/soc/esp32/rtc_clk_init.c
+++ b/components/soc/esp32/rtc_clk_init.c
@@ -21,11 +21,9 @@
 #include "esp32/rom/uart.h"
 #include "esp32/rom/gpio.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/efuse_periph.h"
 #include "soc/apb_ctrl_reg.h"
 #include "i2c_rtc_clk.h"
 #include "soc_log.h"
diff --git a/components/soc/esp32/rtc_init.c b/components/soc/esp32/rtc_init.c
index 7236225d4..e0cd4ba4a 100644
--- a/components/soc/esp32/rtc_init.c
+++ b/components/soc/esp32/rtc_init.c
@@ -16,10 +16,10 @@
 
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "soc/dport_reg.h"
-#include "soc/efuse_reg.h"
-#include "soc/gpio_reg.h"
+#include "soc/efuse_periph.h"
+#include "soc/gpio_periph.h"
 
 
 void rtc_init(rtc_config_t cfg)
diff --git a/components/soc/esp32/rtc_pm.c b/components/soc/esp32/rtc_pm.c
index e5e737725..f951ee107 100644
--- a/components/soc/esp32/rtc_pm.c
+++ b/components/soc/esp32/rtc_pm.c
@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <assert.h>
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 
 typedef enum {
     PM_LIGHT_SLEEP = BIT(2),        /*!< WiFi PD, memory in light sleep */
diff --git a/components/soc/esp32/rtc_sleep.c b/components/soc/esp32/rtc_sleep.c
index 6b8897ae2..d903dc70a 100644
--- a/components/soc/esp32/rtc_sleep.c
+++ b/components/soc/esp32/rtc_sleep.c
@@ -15,11 +15,10 @@
 #include <stdint.h>
 #include "soc/soc.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
 #include "soc/dport_reg.h"
 #include "soc/rtc.h"
-#include "soc/i2s_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/i2s_periph.h"
+#include "soc/timer_periph.h"
 #include "soc/bb_reg.h"
 #include "soc/nrx_reg.h"
 #include "soc/fe_reg.h"
diff --git a/components/soc/esp32/rtc_time.c b/components/soc/esp32/rtc_time.c
index 5160f8602..e64477564 100644
--- a/components/soc/esp32/rtc_time.c
+++ b/components/soc/esp32/rtc_time.c
@@ -15,8 +15,7 @@
 #include <stdint.h>
 #include "esp32/rom/ets_sys.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "soc_log.h"
 
 #define MHZ (1000000)
diff --git a/components/soc/esp32/sdio_slave_periph.c b/components/soc/esp32/sdio_slave_periph.c
index e7bd9d84b..10f0c547b 100644
--- a/components/soc/esp32/sdio_slave_periph.c
+++ b/components/soc/esp32/sdio_slave_periph.c
@@ -14,8 +14,7 @@
 
 #include <stdint.h>
 #include "soc/sdio_slave_periph.h"
-#include "soc/io_mux_reg.h"
-#include "soc/sdio_slave_pins.h"
+#include "soc/gpio_periph.h"
 
 // I/O slot of sdio slave:
 // 0: GPIO 6, 11, 7, 8, 9, 10,
diff --git a/components/soc/esp32/test/test_rtc_clk.c b/components/soc/esp32/test/test_rtc_clk.c
index 3f8e87699..698303558 100644
--- a/components/soc/esp32/test/test_rtc_clk.c
+++ b/components/soc/esp32/test/test_rtc_clk.c
@@ -3,10 +3,9 @@
 #include "esp32/rom/ets_sys.h"
 #include "esp32/rom/uart.h"
 #include "soc/rtc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/sens_reg.h"
-#include "soc/io_mux_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
+#include "soc/gpio_periph.h"
 #include "driver/rtc_io.h"
 #include "test_utils.h"
 #include "freertos/FreeRTOS.h"
diff --git a/components/spi_flash/spi_flash_rom_patch.c b/components/spi_flash/spi_flash_rom_patch.c
index aacc62a7f..e00452585 100644
--- a/components/spi_flash/spi_flash_rom_patch.c
+++ b/components/spi_flash/spi_flash_rom_patch.c
@@ -16,7 +16,7 @@
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/spi_flash.h"
 #include "sdkconfig.h"
-#include "soc/spi_reg.h"
+#include "soc/spi_periph.h"
 
 
 #define SPI_IDX   1
diff --git a/components/spi_flash/test/test_large_flash_writes.c b/components/spi_flash/test/test_large_flash_writes.c
index 3a96ac458..f530ca378 100644
--- a/components/spi_flash/test/test_large_flash_writes.c
+++ b/components/spi_flash/test/test_large_flash_writes.c
@@ -27,8 +27,7 @@
 #include <esp_log.h>
 #include <esp32/rom/spi_flash.h>
 #include "../cache_utils.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 
 static const uint8_t large_const_buffer[16400] = {
     203, // first byte
diff --git a/components/spi_flash/test/test_read_write.c b/components/spi_flash/test/test_read_write.c
index e46480f61..ecc7e23c4 100644
--- a/components/spi_flash/test/test_read_write.c
+++ b/components/spi_flash/test/test_read_write.c
@@ -25,8 +25,7 @@
 #include <esp_spi_flash.h>
 #include <esp32/rom/spi_flash.h>
 #include "../cache_utils.h"
-#include "soc/timer_group_struct.h"
-#include "soc/timer_group_reg.h"
+#include "soc/timer_periph.h"
 #include "esp_heap_caps.h"
 
 /* Base offset in flash for tests. */
diff --git a/components/vfs/test/test_vfs_select.c b/components/vfs/test/test_vfs_select.c
index 341dec1c5..c8ff500da 100644
--- a/components/vfs/test/test_vfs_select.c
+++ b/components/vfs/test/test_vfs_select.c
@@ -17,7 +17,6 @@
 #include <sys/fcntl.h>
 #include <sys/param.h>
 #include "unity.h"
-#include "soc/uart_struct.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/uart.h"
 #include "esp_vfs.h"
diff --git a/components/vfs/test/test_vfs_uart.c b/components/vfs/test/test_vfs_uart.c
index 62a639aa6..d46c7cb75 100644
--- a/components/vfs/test/test_vfs_uart.c
+++ b/components/vfs/test/test_vfs_uart.c
@@ -20,7 +20,6 @@
 #include <sys/errno.h>
 #include "unity.h"
 #include "esp32/rom/uart.h"
-#include "soc/uart_struct.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
diff --git a/components/vfs/vfs_uart.c b/components/vfs/vfs_uart.c
index fd0b028d5..147c54cb7 100644
--- a/components/vfs/vfs_uart.c
+++ b/components/vfs/vfs_uart.c
@@ -22,7 +22,6 @@
 #include "esp_vfs.h"
 #include "esp_vfs_dev.h"
 #include "esp_attr.h"
-#include "soc/uart_struct.h"
 #include "driver/uart.h"
 #include "sdkconfig.h"
 #include "driver/uart_select.h"
diff --git a/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c b/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
index 3fc02e6da..58fe18889 100644
--- a/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_basic_config/main/mcpwm_basic_config_example.c
@@ -21,8 +21,7 @@
 #include "esp_attr.h"
 #include "soc/rtc.h"
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define MCPWM_EN_CARRIER 0   //Make this 1 to test carrier submodule of mcpwm, set high frequency carrier parameters
 #define MCPWM_EN_DEADTIME 0  //Make this 1 to test deadtime submodule of mcpwm, set deadtime value and deadtime mode
diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c b/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
index 58c4b06cb..ecef139cc 100644
--- a/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_bldc_control/main/mcpwm_bldc_control_hall_sensor_example.c
@@ -23,8 +23,7 @@
 #include "esp_attr.h"
 #include "soc/rtc.h"
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define INITIAL_DUTY 10.0   //initial duty cycle is 10.0%
 #define MCPWM_GPIO_INIT 0   //select which function to use to initialize gpio signals
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
index 00b5ddd06..2c721e77a 100644
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/mcpwm_brushed_dc_control_example.c
@@ -20,8 +20,7 @@
 #include "esp_attr.h"
 
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 #define GPIO_PWM0A_OUT 15   //Set GPIO 15 as PWM0A
 #define GPIO_PWM0B_OUT 16   //Set GPIO 16 as PWM0B
@@ -93,4 +92,4 @@ void app_main()
 {
     printf("Testing brushed motor...\n");
     xTaskCreate(mcpwm_example_brushed_motor_control, "mcpwm_examlpe_brushed_motor_control", 4096, NULL, 5, NULL);
-}
\ No newline at end of file
+}
diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c b/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
index 1a7557379..2a944e5da 100644
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
+++ b/examples/peripherals/mcpwm/mcpwm_servo_control/main/mcpwm_servo_control_example.c
@@ -13,8 +13,7 @@
 #include "esp_attr.h"
 
 #include "driver/mcpwm.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
+#include "soc/mcpwm_periph.h"
 
 //You can get these value from the datasheet of servo you use, in general pulse width varies between 1000 to 2000 mocrosecond
 #define SERVO_MIN_PULSEWIDTH 1000 //Minimum pulse width in microsecond
@@ -75,4 +74,4 @@ void app_main()
 {
     printf("Testing servo motor.......\n");
     xTaskCreate(mcpwm_example_servo_control, "mcpwm_example_servo_control", 4096, NULL, 5, NULL);
-}
\ No newline at end of file
+}
diff --git a/examples/peripherals/pcnt/main/pcnt_example_main.c b/examples/peripherals/pcnt/main/pcnt_example_main.c
index 3a37c55fd..f734501fc 100644
--- a/examples/peripherals/pcnt/main/pcnt_example_main.c
+++ b/examples/peripherals/pcnt/main/pcnt_example_main.c
@@ -20,7 +20,6 @@
 #include "driver/pcnt.h"
 #include "esp_attr.h"
 #include "esp_log.h"
-#include "soc/gpio_sig_map.h"
 
 /**
  * TEST CODE BRIEF
diff --git a/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c b/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
index ae20b070f..cebffbcae 100644
--- a/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
+++ b/examples/peripherals/rmt_nec_tx_rx/main/infrared_nec_main.c
@@ -15,8 +15,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/rmt.h"
-#include "driver/periph_ctrl.h"
-#include "soc/rmt_reg.h"
 
 static const char* NEC_TAG = "NEC";
 
diff --git a/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c b/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
index cbe3fe266..fdfaa291e 100644
--- a/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
+++ b/examples/peripherals/sdio/host/components/esp_slave/esp_slave.c
@@ -15,7 +15,7 @@
 #include "esp_slave.h"
 #include "esp_log.h"
 #include "freertos/task.h"
-#include "soc/host_reg.h"
+#include "soc/sdio_slave_periph.h"
 
 static const char TAG[] = "esp_slave";
 
diff --git a/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h b/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
index 56deab0f7..c2d4d31d2 100644
--- a/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
+++ b/examples/peripherals/sdio/host/components/esp_slave/include/esp_slave.h
@@ -14,7 +14,7 @@
 
 #include "sdmmc_cmd.h"
 #include "driver/sdmmc_defs.h"
-#include "soc/host_reg.h"
+#include "soc/sdio_slave_periph.h"
 
 /*
  * NOTE: This component is for example purpose only. Assertion fails if any of
diff --git a/examples/peripherals/sdio/host/main/app_main.c b/examples/peripherals/sdio/host/main/app_main.c
index 23245a3fc..5015048f7 100644
--- a/examples/peripherals/sdio/host/main/app_main.c
+++ b/examples/peripherals/sdio/host/main/app_main.c
@@ -17,13 +17,13 @@
 #include "freertos/queue.h"
 
 #include "soc/sdmmc_periph.h"
+#include "soc/sdio_slave_periph.h"
 #include "esp_log.h"
 #include "esp_attr.h"
 #include "esp_slave.h"
 #include "sdkconfig.h"
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
-#include "soc/sdio_slave_pins.h"
 
 /*
  * For SDIO master-slave board, we have 3 pins controlling power of 3 different
diff --git a/examples/peripherals/sdio/slave/main/app_main.c b/examples/peripherals/sdio/slave/main/app_main.c
index 410209bb2..dd7a73a61 100644
--- a/examples/peripherals/sdio/slave/main/app_main.c
+++ b/examples/peripherals/sdio/slave/main/app_main.c
@@ -11,7 +11,6 @@
 #include "esp32/rom/lldesc.h"
 #include "sys/queue.h"
 #include "soc/soc.h"
-#include "soc/sdio_slave_periph.h"
 #include "freertos/task.h"
 #include "freertos/ringbuf.h"
 #include "sdkconfig.h"
diff --git a/examples/peripherals/spi_master/main/spi_master_example_main.c b/examples/peripherals/spi_master/main/spi_master_example_main.c
index 346488bd4..3d4d304ea 100644
--- a/examples/peripherals/spi_master/main/spi_master_example_main.c
+++ b/examples/peripherals/spi_master/main/spi_master_example_main.c
@@ -13,7 +13,6 @@
 #include "freertos/task.h"
 #include "esp_system.h"
 #include "driver/spi_master.h"
-#include "soc/gpio_struct.h"
 #include "driver/gpio.h"
 
 #include "pretty_effect.h"
diff --git a/examples/peripherals/spi_slave/receiver/main/app_main.c b/examples/peripherals/spi_slave/receiver/main/app_main.c
index 3c7aef495..c5362dd97 100644
--- a/examples/peripherals/spi_slave/receiver/main/app_main.c
+++ b/examples/peripherals/spi_slave/receiver/main/app_main.c
@@ -26,7 +26,7 @@
 #include "esp_event.h"
 #include "esp_event_loop.h"
 #include "nvs_flash.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/cache.h"
 #include "driver/spi_slave.h"
 #include "esp_log.h"
diff --git a/examples/peripherals/spi_slave/sender/main/app_main.c b/examples/peripherals/spi_slave/sender/main/app_main.c
index dc16bd556..af7dc2275 100644
--- a/examples/peripherals/spi_slave/sender/main/app_main.c
+++ b/examples/peripherals/spi_slave/sender/main/app_main.c
@@ -26,13 +26,12 @@
 #include "esp_event.h"
 #include "esp_event_loop.h"
 #include "nvs_flash.h"
-#include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_periph.h"
 #include "esp32/rom/cache.h"
 #include "driver/spi_master.h"
 #include "esp_log.h"
 #include "esp_spi_flash.h"
 
-#include "soc/gpio_reg.h"
 #include "driver/gpio.h"
 #include "esp_intr_alloc.h"
 
diff --git a/examples/peripherals/timer_group/main/timer_group_example_main.c b/examples/peripherals/timer_group/main/timer_group_example_main.c
index 0e1ee36fc..572e35e61 100644
--- a/examples/peripherals/timer_group/main/timer_group_example_main.c
+++ b/examples/peripherals/timer_group/main/timer_group_example_main.c
@@ -12,7 +12,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
-#include "soc/timer_group_struct.h"
 #include "driver/periph_ctrl.h"
 #include "driver/timer.h"
 
diff --git a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
index e3e3cbf21..1ed6bcabd 100644
--- a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
+++ b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c
@@ -12,8 +12,8 @@
 #include "esp_log.h"
 
 #include "driver/touch_pad.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 
 static const char* TAG = "Touch pad";
 #define TOUCH_THRESH_NO_USE   (0)
diff --git a/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c b/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
index 988640a9c..1933b0621 100644
--- a/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
+++ b/examples/peripherals/uart/uart_async_rxtxtasks/main/uart_async_rxtxtasks_main.c
@@ -11,7 +11,6 @@
 #include "esp_system.h"
 #include "esp_log.h"
 #include "driver/uart.h"
-#include "soc/uart_struct.h"
 #include "string.h"
 #include "driver/gpio.h"
 
diff --git a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
index 05b5fb9cf..22204b73f 100644
--- a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
+++ b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c
@@ -16,7 +16,6 @@
 #include "driver/uart.h"
 #include "freertos/queue.h"
 #include "esp_log.h"
-#include "soc/uart_struct.h"
 
 /**
  * This is a example example which echos any data it receives on UART back to the sender.
diff --git a/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c b/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
index cff05f51b..bedeeb35c 100644
--- a/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
+++ b/examples/system/app_trace_to_host/main/app_trace_to_host_example_main.c
@@ -12,8 +12,8 @@
 #include "freertos/task.h"
 #include "esp_app_trace.h"
 #include "esp_log.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/rtc_periph.h"
+#include "soc/sens_periph.h"
 #include "driver/adc.h"
 #include "driver/dac.h"
 
diff --git a/examples/system/console/components/cmd_system/cmd_system.c b/examples/system/console/components/cmd_system/cmd_system.c
index aae2ee6c4..50fe5ec09 100644
--- a/examples/system/console/components/cmd_system/cmd_system.c
+++ b/examples/system/console/components/cmd_system/cmd_system.c
@@ -20,7 +20,6 @@
 #include "argtable3/argtable3.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "soc/rtc_cntl_reg.h"
 #include "esp32/rom/uart.h"
 #include "cmd_system.h"
 #include "sdkconfig.h"
diff --git a/examples/system/deep_sleep/main/deep_sleep_example_main.c b/examples/system/deep_sleep/main/deep_sleep_example_main.c
index 5e3866d6e..5843e64aa 100644
--- a/examples/system/deep_sleep/main/deep_sleep_example_main.c
+++ b/examples/system/deep_sleep/main/deep_sleep_example_main.c
@@ -20,8 +20,7 @@
 #include "driver/touch_pad.h"
 #include "driver/adc.h"
 #include "driver/rtc_io.h"
-#include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
+#include "soc/sens_periph.h"
 #include "soc/rtc.h"
 
 static RTC_DATA_ATTR struct timeval sleep_enter_time;
diff --git a/tools/unit-test-app/components/test_utils/ref_clock.c b/tools/unit-test-app/components/test_utils/ref_clock.c
index 3a25a6227..c66ff28b9 100644
--- a/tools/unit-test-app/components/test_utils/ref_clock.c
+++ b/tools/unit-test-app/components/test_utils/ref_clock.c
@@ -31,14 +31,12 @@
  */
 
 #include "test_utils.h"
-#include "soc/rmt_struct.h"
-#include "soc/pcnt_struct.h"
-#include "soc/pcnt_reg.h"
-#include "soc/gpio_sig_map.h"
+#include "soc/rmt_periph.h"
+#include "soc/pcnt_periph.h"
+#include "soc/gpio_periph.h"
 #include "soc/dport_reg.h"
 #include "esp32/rom/gpio.h"
 #include "esp32/rom/ets_sys.h"
-#include "driver/gpio.h"
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "driver/periph_ctrl.h"