diff --git a/components/esp_hal_emac/CMakeLists.txt b/components/esp_hal_emac/CMakeLists.txt
index 02dfc13edb..ca29fe10c9 100644
--- a/components/esp_hal_emac/CMakeLists.txt
+++ b/components/esp_hal_emac/CMakeLists.txt
@@ -17,4 +17,4 @@ endif()
 
 idf_component_register(SRCS ${srcs}
                        INCLUDE_DIRS ${includes}
-                       REQUIRES soc hal)
+                       REQUIRES soc hal esp_hal_gpio)
diff --git a/components/soc/esp32/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32/include/soc/gpio_num.h
index 2a0846958c..aee5ab6693 100644
--- a/components/soc/esp32/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32c2/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32c2/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32c2/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32c2/include/soc/gpio_num.h
index e6a9970604..b698115636 100644
--- a/components/soc/esp32c2/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32c2/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32c3/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32c3/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32c3/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32c3/include/soc/gpio_num.h
index a6a9a1e053..fb860d334e 100644
--- a/components/soc/esp32c3/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32c3/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32c5/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32c5/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32c5/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32c5/include/soc/gpio_num.h
index e59acefbd8..256292846d 100644
--- a/components/soc/esp32c5/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32c5/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32c6/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32c6/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32c6/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32c6/include/soc/gpio_num.h
index b4e0125382..320a3d7052 100644
--- a/components/soc/esp32c6/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32c6/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32c61/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32c61/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32c61/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32c61/include/soc/gpio_num.h
index 4d74baa1f5..687a239b3a 100644
--- a/components/soc/esp32c61/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32c61/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32h2/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32h2/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32h2/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32h2/include/soc/gpio_num.h
index ec3646af07..87134fd294 100644
--- a/components/soc/esp32h2/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32h2/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32h21/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32h21/include/soc/gpio_num.h
similarity index 97%
rename from components/soc/esp32h21/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32h21/include/soc/gpio_num.h
index 2a321182c1..66d592a91b 100644
--- a/components/soc/esp32h21/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32h21/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32h4/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32h4/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32h4/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32h4/include/soc/gpio_num.h
index 0fb9d69b00..18aede6ae6 100644
--- a/components/soc/esp32h4/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32h4/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32p4/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32p4/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32p4/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32p4/include/soc/gpio_num.h
index 31d3f1e435..943a1813d0 100644
--- a/components/soc/esp32p4/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32p4/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32s2/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32s2/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32s2/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32s2/include/soc/gpio_num.h
index c53c7416b2..163f407781 100644
--- a/components/soc/esp32s2/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32s2/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32s3/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32s3/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32s3/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32s3/include/soc/gpio_num.h
index 678e96b231..15768dd23a 100644
--- a/components/soc/esp32s3/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32s3/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/esp32s31/include/soc/gpio_num.h b/components/esp_hal_gpio/esp32s31/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/esp32s31/include/soc/gpio_num.h
rename to components/esp_hal_gpio/esp32s31/include/soc/gpio_num.h
index f9b54be07a..03a849bcef 100644
--- a/components/soc/esp32s31/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/esp32s31/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
diff --git a/components/soc/linux/include/soc/gpio_num.h b/components/esp_hal_gpio/linux/include/soc/gpio_num.h
similarity index 98%
rename from components/soc/linux/include/soc/gpio_num.h
rename to components/esp_hal_gpio/linux/include/soc/gpio_num.h
index aa99fee7c7..5fd21f753f 100644
--- a/components/soc/linux/include/soc/gpio_num.h
+++ b/components/esp_hal_gpio/linux/include/soc/gpio_num.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
  *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /*
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 540d4c0cb0..2fa6a14864 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -172,6 +172,7 @@ INPUT = \
     $(PROJECT_PATH)/components/esp_hal_ana_conv/include/hal/dac_types.h \
     $(PROJECT_PATH)/components/esp_hal_ana_conv/include/hal/temperature_sensor_types.h \
     $(PROJECT_PATH)/components/esp_hal_emac/include/hal/eth_types.h \
+    $(PROJECT_PATH)/components/esp_hal_gpio/$(IDF_TARGET)/include/soc/gpio_num.h \
     $(PROJECT_PATH)/components/esp_hal_gpio/include/hal/gpio_types.h \
     $(PROJECT_PATH)/components/esp_hal_gpio/include/hal/rtc_io_types.h \
     $(PROJECT_PATH)/components/esp_hal_gpio/include/hal/sdm_types.h \
@@ -323,7 +324,6 @@ INPUT = \
     $(PROJECT_PATH)/components/soc/include/soc/soc_caps_eval.h \
     $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/adc_channel.h \
     $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/clk_tree_defs.h \
-    $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/gpio_num.h \
     $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/soc_caps.h \
     $(PROJECT_PATH)/components/soc/$(IDF_TARGET)/include/soc/uart_pins.h \
     $(PROJECT_PATH)/components/spi_flash/include/esp_flash_spi_init.h \