diff --git a/freemodbus/port/portserial.c b/freemodbus/port/portserial.c
index dbc148d..6689674 100644
--- a/freemodbus/port/portserial.c
+++ b/freemodbus/port/portserial.c
@@ -37,9 +37,8 @@
 #include "driver/uart.h"
 #include "port.h"
 #include "driver/uart.h"
+#include "hal/uart_types.h"
 #include "freertos/queue.h" // for queue support
-#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/freemodbus/port/portserial_m.c b/freemodbus/port/portserial_m.c
index 1be6b8a..18296ee 100644
--- a/freemodbus/port/portserial_m.c
+++ b/freemodbus/port/portserial_m.c
@@ -35,11 +35,11 @@
  */
 
 #include <string.h>
-#include "driver/uart.h"
-#include "soc/dport_access.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
+#include "driver/uart.h"
+#include "hal/uart_types.h"
 #include "esp_log.h"
 #include "sdkconfig.h"
 
@@ -290,7 +290,7 @@ BOOL xMBMasterPortSerialInit( UCHAR ucPORT, ULONG ulBaudRate, UCHAR ucDataBits,
         .stop_bits = UART_STOP_BITS_1,
         .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
         .rx_flow_ctrl_thresh = 2,
-        .source_clk = UART_SCLK_APB,
+        .source_clk = UART_SCLK_APB
     };
     // Set UART config
     xErr = uart_param_config(ucUartNumber, &xUartConfig);
diff --git a/test/serial/mb_serial_slave/main/Kconfig.projbuild b/test/serial/mb_serial_slave/main/Kconfig.projbuild
index 884a1b8..1f60916 100644
--- a/test/serial/mb_serial_slave/main/Kconfig.projbuild
+++ b/test/serial/mb_serial_slave/main/Kconfig.projbuild
@@ -4,8 +4,8 @@ menu "Modbus Example Configuration"
         int "UART port number"
         range 0 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3
         default 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3
-        range 0 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3
-        default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3
+        range 0 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
         help
             UART communication port number for Modbus example.
 
@@ -22,8 +22,8 @@ menu "Modbus Example Configuration"
         default 22 if IDF_TARGET_ESP32
         range 0 46 if IDF_TARGET_ESP32S2
         range 0 47 if IDF_TARGET_ESP32S3
-        range 0 19 if IDF_TARGET_ESP32C3
-        default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
+        range 0 19 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
         help
             GPIO number for UART RX pin. See UART documentation for more information
             about available pin numbers for UART.
@@ -34,8 +34,8 @@ menu "Modbus Example Configuration"
         default 23 if IDF_TARGET_ESP32
         range 0 46 if IDF_TARGET_ESP32S2
         range 0 47 if IDF_TARGET_ESP32S3
-        range 0 19 if IDF_TARGET_ESP32C3
-        default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
+        range 0 19 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
         help
             GPIO number for UART TX pin. See UART documentation for more information
             about available pin numbers for UART.
@@ -46,8 +46,8 @@ menu "Modbus Example Configuration"
         default 18 if IDF_TARGET_ESP32
         range 0 46 if IDF_TARGET_ESP32S2
         range 0 47 if IDF_TARGET_ESP32S3
-        range 0 19 if IDF_TARGET_ESP32C3
-        default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
+        range 0 19 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
+        default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2
         help
             GPIO number for UART RTS pin. This pin is connected to
             ~RE/DE pin of RS485 transceiver to switch direction.