diff --git a/components/bootloader_support/src/bootloader_random_esp32.c b/components/bootloader_support/src/bootloader_random_esp32.c
index 7b9c819aa3..558ca0df31 100644
--- a/components/bootloader_support/src/bootloader_random_esp32.c
+++ b/components/bootloader_support/src/bootloader_random_esp32.c
@@ -6,8 +6,8 @@
 #include "sdkconfig.h"
 #include "bootloader_random.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
-#include "soc/syscon_periph.h"
+#include "soc/sens_reg.h"
+#include "soc/syscon_reg.h"
 #include "soc/dport_reg.h"
 #include "soc/i2s_periph.h"
 #include "esp_log.h"
diff --git a/components/bootloader_support/src/bootloader_random_esp32s2.c b/components/bootloader_support/src/bootloader_random_esp32s2.c
index a750bc58e4..9d1474f550 100644
--- a/components/bootloader_support/src/bootloader_random_esp32s2.c
+++ b/components/bootloader_support/src/bootloader_random_esp32s2.c
@@ -6,9 +6,9 @@
 #include "sdkconfig.h"
 #include "bootloader_random.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
-#include "soc/syscon_periph.h"
+#include "soc/sens_reg.h"
 #include "soc/dport_reg.h"
+#include "soc/syscon_reg.h"
 #include "soc/i2s_periph.h"
 #include "esp_log.h"
 #include "soc/io_mux_reg.h"
diff --git a/components/esp_hw_support/port/esp32/rtc_clk.c b/components/esp_hw_support/port/esp32/rtc_clk.c
index bab0bdb3ce..92d5550af6 100644
--- a/components/esp_hw_support/port/esp32/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32/rtc_clk.c
@@ -11,7 +11,7 @@
 #include "soc/rtc.h"
 #include "esp_private/rtc_clk.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
+#include "soc/sens_reg.h"
 #include "soc/soc_caps.h"
 #include "soc/chip_revision.h"
 #include "hal/efuse_ll.h"
diff --git a/components/esp_hw_support/port/esp32/rtc_clk_init.c b/components/esp_hw_support/port/esp32/rtc_clk_init.c
index 63017c2cce..75e6fa8987 100644
--- a/components/esp_hw_support/port/esp32/rtc_clk_init.c
+++ b/components/esp_hw_support/port/esp32/rtc_clk_init.c
@@ -13,7 +13,6 @@
 #include "esp_cpu.h"
 #include "soc/rtc.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
 #include "hal/clk_tree_ll.h"
 #include "hal/regi2c_ctrl_ll.h"
 #include "esp_hw_log.h"
diff --git a/components/esp_hw_support/port/esp32s2/rtc_clk_init.c b/components/esp_hw_support/port/esp32s2/rtc_clk_init.c
index 00c66edaa6..c6f82576ad 100644
--- a/components/esp_hw_support/port/esp32s2/rtc_clk_init.c
+++ b/components/esp_hw_support/port/esp32s2/rtc_clk_init.c
@@ -12,7 +12,6 @@
 #include "esp_rom_uart.h"
 #include "soc/rtc.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
 #include "soc/syscon_reg.h"
 #include "hal/regi2c_ctrl_ll.h"
 #include "esp_hw_log.h"
diff --git a/components/esp_hw_support/rtc_module.c b/components/esp_hw_support/rtc_module.c
index b9d5c63490..62674a9add 100644
--- a/components/esp_hw_support/rtc_module.c
+++ b/components/esp_hw_support/rtc_module.c
@@ -10,7 +10,6 @@
 #include "esp_types.h"
 #include "esp_log.h"
 #include "soc/rtc_periph.h"
-#include "soc/syscon_periph.h"
 #include "soc/rtc.h"
 #include "soc/periph_defs.h"
 #include "freertos/FreeRTOS.h"
diff --git a/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c b/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
index bd41fefff0..ff8fe0b099 100644
--- a/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
+++ b/components/esp_hw_support/test_apps/rtc_clk/main/test_rtc_clk.c
@@ -12,7 +12,7 @@
 #include "soc/rtc.h"
 #include "soc/rtc_periph.h"
 #if SOC_ADC_RTC_CTRL_SUPPORTED
-#include "soc/sens_periph.h"
+#include "soc/sens_reg.h"
 #endif
 #include "soc/gpio_periph.h"
 #include "hal/gpio_ll.h"
diff --git a/components/soc/esp32/pcnt_periph.c b/components/soc/esp32/pcnt_periph.c
index e2f98ff64c..f11beee6c9 100644
--- a/components/soc/esp32/pcnt_periph.c
+++ b/components/soc/esp32/pcnt_periph.c
@@ -6,6 +6,7 @@
 
 #include "soc/pcnt_periph.h"
 #include "soc/gpio_sig_map.h"
+#include "soc/soc.h"
 
 const pcnt_signal_conn_t pcnt_periph_signals = {
     .groups = {
diff --git a/components/soc/include/soc/ana_cmpr_periph.h b/components/soc/include/soc/ana_cmpr_periph.h
index 9f3f3c36c1..9418b15578 100644
--- a/components/soc/include/soc/ana_cmpr_periph.h
+++ b/components/soc/include/soc/ana_cmpr_periph.h
@@ -8,18 +8,22 @@
 
 #include <stdint.h>
 #include "soc/soc_caps.h"
+#if SOC_ANA_CMPR_SUPPORTED
 #include "soc/ana_cmpr_channel.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_ANA_CMPR_SUPPORTED
 typedef struct {
     int src_gpio;
     int ext_ref_gpio;
 } ana_cmpr_conn_t;
 
 extern const ana_cmpr_conn_t ana_cmpr_io_map[SOC_ANA_CMPR_NUM];
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/components/soc/include/soc/chip_revision.h b/components/soc/include/soc/chip_revision.h
index d944d71cf1..868bb1f58c 100644
--- a/components/soc/include/soc/chip_revision.h
+++ b/components/soc/include/soc/chip_revision.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "esp_assert.h"
 #include "sdkconfig.h"
 
 #ifdef __cplusplus
@@ -33,7 +34,7 @@ extern "C" {
 #define ESP_CHIP_REV_ABOVE(rev, min_rev) ((min_rev) <= (rev))
 #define ESP_CHIP_REV_MAJOR_AND_ABOVE(rev, min_rev) (((rev) / 100 == (min_rev) / 100) && ((rev) >= (min_rev)))
 
-_Static_assert(CONFIG_ESP_REV_MIN_FULL <= CONFIG_ESP_REV_MAX_FULL);
+ESP_STATIC_ASSERT(CONFIG_ESP_REV_MIN_FULL <= CONFIG_ESP_REV_MAX_FULL);
 
 #ifdef __cplusplus
 }
diff --git a/components/soc/include/soc/dac_periph.h b/components/soc/include/soc/dac_periph.h
index 336d7c8251..9e9a27a486 100644
--- a/components/soc/include/soc/dac_periph.h
+++ b/components/soc/include/soc/dac_periph.h
@@ -1,16 +1,12 @@
 /*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
 
-#include "soc/sens_reg.h"
-#include "soc/sens_struct.h"
-#include "soc/rtc_io_reg.h"
-#include "soc/rtc_io_struct.h"
-#include "soc/rtc.h"
+#include <stdint.h>
 #include "soc/soc_caps.h"
 
 #ifdef __cplusplus
@@ -18,12 +14,16 @@ extern "C"
 {
 #endif
 
+#if SOC_DAC_SUPPORTED
+
 typedef struct {
     const uint8_t dac_channel_io_num[SOC_DAC_CHAN_NUM];
 } dac_signal_conn_t;
 
 extern const dac_signal_conn_t dac_periph_signal;
 
+#endif // SOC_DAC_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/gdma_periph.h b/components/soc/include/soc/gdma_periph.h
index d8f17dda1b..707c6a256c 100644
--- a/components/soc/include/soc/gdma_periph.h
+++ b/components/soc/include/soc/gdma_periph.h
@@ -13,6 +13,7 @@
 extern "C" {
 #endif
 
+#if SOC_GDMA_SUPPORTED
 typedef struct {
     struct {
         const periph_module_t module;
@@ -25,6 +26,8 @@ typedef struct {
 
 extern const gdma_signal_conn_t gdma_periph_signals;
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/i2s_periph.h b/components/soc/include/soc/i2s_periph.h
index e6e8cc29d7..d1e83b91f1 100644
--- a/components/soc/include/soc/i2s_periph.h
+++ b/components/soc/include/soc/i2s_periph.h
@@ -7,14 +7,18 @@
 #pragma once
 #include "soc/soc.h"
 #include "soc/periph_defs.h"
+#include "soc/soc_caps.h"
+
+#if SOC_I2S_SUPPORTED
 #include "soc/i2s_struct.h"
 #include "soc/i2s_reg.h"
-#include "soc/soc_caps.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_I2S_SUPPORTED
 /*
  Stores a bunch of per-I2S-peripheral data.
 */
@@ -51,6 +55,8 @@ typedef struct {
 
 extern const i2s_signal_conn_t i2s_periph_signal[SOC_I2S_NUM];
 
+#endif // SOC_I2S_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/lcd_periph.h b/components/soc/include/soc/lcd_periph.h
index 7bb7c530cf..801e5ffb74 100644
--- a/components/soc/include/soc/lcd_periph.h
+++ b/components/soc/include/soc/lcd_periph.h
@@ -34,6 +34,7 @@ typedef struct {
     } panels[SOC_LCD_RGB_PANELS];
 } lcd_signal_conn_t;
 
+extern const lcd_signal_conn_t lcd_periph_signals;
 #endif // SOC_LCDCAM_SUPPORTED
 
 #if SOC_I2S_LCD_I80_VARIANT
@@ -45,9 +46,9 @@ typedef struct {
         const int wr_sig;
     } buses[SOC_LCD_I80_BUSES];
 } lcd_signal_conn_t;
-#endif // SOC_I2S_LCD_I80_VARIANT
 
 extern const lcd_signal_conn_t lcd_periph_signals;
+#endif // SOC_I2S_LCD_I80_VARIANT
 
 #ifdef __cplusplus
 }
diff --git a/components/soc/include/soc/lldesc.h b/components/soc/include/soc/lldesc.h
index 8975154bb4..2ca5f672ca 100644
--- a/components/soc/include/soc/lldesc.h
+++ b/components/soc/include/soc/lldesc.h
@@ -6,7 +6,6 @@
 
 #pragma once
 #include <stdbool.h>
-#include "sdkconfig.h"
 #include "esp_rom_lldesc.h"
 
 //the size field has 12 bits, but 0 not for 4096.
@@ -18,6 +17,10 @@
 #define LLDESC_MAX_NUM_PER_DESC_16B_ALIGNED (4096 - 16)
 #define LLDESC_MAX_NUM_PER_DESC_32B_ALIGNED (4096 - 32)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Generate a linked list pointing to a (huge) buffer in an descriptor array.
  *
@@ -75,3 +78,7 @@ static inline int lldesc_get_required_num_constrained(int data_size, int max_des
  * @return Numbers required.
  */
 #define lldesc_get_required_num(data_size) lldesc_get_required_num_constrained(data_size, LLDESC_MAX_NUM_PER_DESC)
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/soc/include/soc/mcpwm_periph.h b/components/soc/include/soc/mcpwm_periph.h
index a07bb49cb2..9ce4e06592 100644
--- a/components/soc/include/soc/mcpwm_periph.h
+++ b/components/soc/include/soc/mcpwm_periph.h
@@ -6,15 +6,15 @@
 
 #pragma once
 
+#include <stdint.h>
 #include "soc/soc_caps.h"
-#include "soc/mcpwm_reg.h"
-#include "soc/mcpwm_struct.h"
 #include "soc/periph_defs.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_MCPWM_SUPPORTED
 typedef struct {
     struct {
         const periph_module_t module; // Peripheral module
@@ -37,6 +37,7 @@ typedef struct {
 } mcpwm_signal_conn_t;
 
 extern const mcpwm_signal_conn_t mcpwm_periph_signals;
+#endif // SOC_MCPWM_SUPPORTED
 
 #ifdef __cplusplus
 }
diff --git a/components/soc/include/soc/mpi_periph.h b/components/soc/include/soc/mpi_periph.h
index b2a289ea4e..db1caa9121 100644
--- a/components/soc/include/soc/mpi_periph.h
+++ b/components/soc/include/soc/mpi_periph.h
@@ -14,9 +14,13 @@ extern "C"
 {
 #endif
 
+#if SOC_MPI_SUPPORTED
+
 extern const uint32_t MPI_LL_BLOCK_BASES[SOC_MPI_MEM_BLOCKS_NUM];
 extern const uint32_t MPI_LL_OPERATIONS[SOC_MPI_OPERATIONS_NUM];
 
+#endif // SOC_MPI_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/parlio_periph.h b/components/soc/include/soc/parlio_periph.h
index bd248901bf..c9781a048f 100644
--- a/components/soc/include/soc/parlio_periph.h
+++ b/components/soc/include/soc/parlio_periph.h
@@ -9,13 +9,16 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 #include "soc/periph_defs.h"
+#if SOC_PARLIO_SUPPORTED
 #include "soc/parl_io_reg.h"
 #include "soc/parl_io_struct.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_PARLIO_SUPPORTED
 typedef struct {
     struct {
         struct {
@@ -36,6 +39,8 @@ typedef struct {
 
 extern const parlio_signal_conn_t parlio_periph_signals;
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/pcnt_periph.h b/components/soc/include/soc/pcnt_periph.h
index f6e5a179cc..f73aefcd82 100644
--- a/components/soc/include/soc/pcnt_periph.h
+++ b/components/soc/include/soc/pcnt_periph.h
@@ -9,13 +9,13 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 #include "soc/periph_defs.h"
-#include "soc/pcnt_reg.h"
-#include "soc/pcnt_struct.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_PCNT_SUPPORTED
+
 typedef struct {
     struct {
         struct {
@@ -31,6 +31,8 @@ typedef struct {
 
 extern const pcnt_signal_conn_t pcnt_periph_signals;
 
+#endif // SOC_PCNT_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/rmt_periph.h b/components/soc/include/soc/rmt_periph.h
index bf98c6b0eb..b87de3605e 100644
--- a/components/soc/include/soc/rmt_periph.h
+++ b/components/soc/include/soc/rmt_periph.h
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#if SOC_RMT_SUPPORTED
+
 typedef struct {
     struct {
         const int irq;
@@ -28,6 +30,8 @@ typedef struct {
 
 extern const rmt_signal_conn_t rmt_periph_signals;
 
+#endif // SOC_RMT_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/sdio_slave_periph.h b/components/soc/include/soc/sdio_slave_periph.h
index 0f748ae12e..0d7be36f35 100644
--- a/components/soc/include/soc/sdio_slave_periph.h
+++ b/components/soc/include/soc/sdio_slave_periph.h
@@ -1,30 +1,22 @@
-// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 #include <stdint.h>
 //include soc related (generated) definitions
 #include "soc/soc_caps.h"
 #include "soc/soc_pins.h"
-#ifdef SOC_SDIO_SLAVE_SUPPORTED
+#if SOC_SDIO_SLAVE_SUPPORTED
 #include "soc/slc_reg.h"
 #include "soc/slc_struct.h"
-#endif
 #include "soc/host_reg.h"
 #include "soc/host_struct.h"
 #include "soc/hinf_reg.h"
 #include "soc/hinf_struct.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/soc/include/soc/sdm_periph.h b/components/soc/include/soc/sdm_periph.h
index 26323c515b..2e9cd75efe 100644
--- a/components/soc/include/soc/sdm_periph.h
+++ b/components/soc/include/soc/sdm_periph.h
@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+#if SOC_SDM_SUPPORTED
+
 typedef struct {
     struct {
         const int sd_sig;
@@ -20,6 +22,8 @@ typedef struct {
 
 extern const sigma_delta_signal_conn_t sigma_delta_periph_signals;
 
+#endif // SOC_SDM_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/sdmmc_periph.h b/components/soc/include/soc/sdmmc_periph.h
index c1d38fa29b..e44f1d10fb 100644
--- a/components/soc/include/soc/sdmmc_periph.h
+++ b/components/soc/include/soc/sdmmc_periph.h
@@ -1,30 +1,26 @@
-// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 #include <stdint.h>
 //include soc related (generated) definitions
 #include "soc/soc_caps.h"
 #include "soc/soc_pins.h"
+#if SOC_SDMMC_HOST_SUPPORTED
 #include "soc/sdmmc_reg.h"
 #include "soc/sdmmc_struct.h"
 #include "soc/gpio_sig_map.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if SOC_SDMMC_HOST_SUPPORTED
+
 /**
  * Common SDMMC slot info, doesn't depend on SOC_SDMMC_USE_{IOMUX,GPIO_MATRIX}
  */
@@ -69,7 +65,7 @@ extern const sdmmc_slot_io_info_t sdmmc_slot_gpio_num[SOC_SDMMC_NUM_SLOTS];
 extern const sdmmc_slot_io_info_t sdmmc_slot_gpio_sig[SOC_SDMMC_NUM_SLOTS];
 
 #endif // SOC_SDMMC_USE_{IOMUX,GPIO_MATRIX}
-
+#endif // SOC_SDMMC_HOST_SUPPORTED
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/sens_periph.h b/components/soc/include/soc/sens_periph.h
index 38b7657537..09e67e9bdb 100644
--- a/components/soc/include/soc/sens_periph.h
+++ b/components/soc/include/soc/sens_periph.h
@@ -1,17 +1,13 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
+
+#include "sdkconfig.h"
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 #include "soc/sens_reg.h"
 #include "soc/sens_struct.h"
+#endif // CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
diff --git a/components/soc/include/soc/syscon_periph.h b/components/soc/include/soc/syscon_periph.h
deleted file mode 100644
index 4f96aec6e5..0000000000
--- a/components/soc/include/soc/syscon_periph.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-// ESP32-C6 ESP32-H2 TODO: IDF-5721
-#if !CONFIG_IDF_TARGET_ESP32C6 && !CONFIG_IDF_TARGET_ESP32H2
-#include "soc/syscon_reg.h"
-#include "soc/syscon_struct.h"
-#endif
diff --git a/components/soc/include/soc/touch_sensor_periph.h b/components/soc/include/soc/touch_sensor_periph.h
index 2b27b97d20..fa9229f930 100644
--- a/components/soc/include/soc/touch_sensor_periph.h
+++ b/components/soc/include/soc/touch_sensor_periph.h
@@ -7,14 +7,14 @@
 #pragma once
 
 #include "soc/soc_caps.h"
+#if SOC_TOUCH_SENSOR_SUPPORTED
 #include "soc/touch_sensor_channel.h"
 #include "soc/rtc_cntl_reg.h"
 #include "soc/rtc_cntl_struct.h"
 #include "soc/sens_reg.h"
 #include "soc/sens_struct.h"
-#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
 #include "soc/rtc_io_struct.h"
-#endif
+#endif // SOC_TOUCH_SENSOR_SUPPORTED
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/soc/include/soc/twai_periph.h b/components/soc/include/soc/twai_periph.h
index e97eb0e064..72a37210a2 100644
--- a/components/soc/include/soc/twai_periph.h
+++ b/components/soc/include/soc/twai_periph.h
@@ -14,6 +14,8 @@
 extern "C" {
 #endif
 
+#if SOC_TWAI_SUPPORTED
+
 typedef struct {
     struct {
         const periph_module_t module;  // peripheral module
@@ -28,6 +30,8 @@ typedef struct {
 
 extern const twai_controller_signal_conn_t twai_controller_periph_signals;
 
+#endif // SOC_TWAI_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/soc/include/soc/uhci_periph.h b/components/soc/include/soc/uhci_periph.h
index f75807c817..34a5290b72 100644
--- a/components/soc/include/soc/uhci_periph.h
+++ b/components/soc/include/soc/uhci_periph.h
@@ -1,18 +1,8 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+/*
+ * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
-#include "soc/uhci_reg.h"
-#include "soc/uhci_struct.h"
 #include "soc/periph_defs.h"
diff --git a/components/soc/include/soc/usb_periph.h b/components/soc/include/soc/usb_periph.h
index 1f0adb36b5..9ebd683baf 100644
--- a/components/soc/include/soc/usb_periph.h
+++ b/components/soc/include/soc/usb_periph.h
@@ -9,12 +9,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "soc/soc_pins.h"
+#include "soc/soc_caps.h"
 #include "soc/gpio_sig_map.h"
+#if SOC_USB_OTG_SUPPORTED
 #include "soc/usb_reg.h"
 #include "soc/usb_types.h"
 #include "soc/usb_struct.h"
 #include "soc/usb_wrap_reg.h"
 #include "soc/usb_wrap_struct.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/tp_interrupt_main.c b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/tp_interrupt_main.c
index 58e3da4f9d..9a70d51d11 100644
--- a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/tp_interrupt_main.c
+++ b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/tp_interrupt_main.c
@@ -13,7 +13,6 @@
 
 #include "driver/touch_pad.h"
 #include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
 
 static const char *TAG = "Touch pad";
 
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/tp_interrupt_main.c b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/tp_interrupt_main.c
index a852a069e0..10837efb7c 100644
--- a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/tp_interrupt_main.c
+++ b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/tp_interrupt_main.c
@@ -11,8 +11,6 @@
 #include "freertos/queue.h"
 #include "esp_log.h"
 #include "driver/touch_pad.h"
-#include "soc/rtc_periph.h"
-#include "soc/sens_periph.h"
 
 static const char *TAG = "Touch pad";
 
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
index bd410d309b..b527e58f50 100644
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@@ -966,10 +966,6 @@ components/soc/include/soc/gpio_periph.h
 components/soc/include/soc/i2c_periph.h
 components/soc/include/soc/interrupts.h
 components/soc/include/soc/ledc_periph.h
-components/soc/include/soc/sdio_slave_periph.h
-components/soc/include/soc/sdmmc_periph.h
-components/soc/include/soc/sens_periph.h
-components/soc/include/soc/uhci_periph.h
 components/soc/lldesc.c
 components/soc/soc_include_legacy_warn.c
 components/spi_flash/cache_utils.h
diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt
index 25cbc39b67..cc3291d247 100644
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@@ -18,7 +18,6 @@ components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/
 components/log/include/esp_log_internal.h
 
 components/hal/
-components/soc/include/soc/
 
 components/esp_rom/include/esp32s2/rom/rsa_pss.h