diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5aefab592..fa9e8cfb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,13 +68,27 @@ include(CTest)
 
 if (ESP_PLATFORM)
        include_directories(
-       ${IDF_PATH}/components/freertos/port/xtensa/include/
-       ${IDF_PATH}/components/hal/include
-       ${IDF_PATH}/components/soc/${CONFIG_IDF_TARGET}/include/ 
-       ${IDF_PATH}/components/soc/include/ 
-       ${IDF_PATH}/components/esp_hw_support/include
-       ${IDF_PATH}/components/hal/${CONFIG_IDF_TARGET}/include/
-       )
+		$ENV{IDF_PATH}/components/esp_hw_support/include/soc/
+		$ENV{IDF_PATH}/components/freertos/include/
+		$ENV{IDF_PATH}/components/xtensa/${CONFIG_IDF_TARGET}/include/
+		$ENV{IDF_PATH}/components/freertos/include/esp_additions
+		$ENV{IDF_PATH}/components/hal/include
+		$ENV{IDF_PATH}/components/soc/${CONFIG_IDF_TARGET}/include/
+		$ENV{IDF_PATH}/components/soc/include/
+		$ENV{IDF_PATH}/components/esp_hw_support/include
+		$ENV{IDF_PATH}/components/hal/${CONFIG_IDF_TARGET}/include/
+	)
+
+	if (CONFIG_IDF_TARGET_ARCH_RISCV)
+                include_directories(
+                       $ENV{IDF_PATH}/components/freertos/port/riscv/include
+                       $ENV{IDF_PATH}/components/riscv/include)
+        else()
+                include_directories(
+                       $ENV{IDF_PATH}/components/freertos/port/xtensa/include
+                       $ENV{IDF_PATH}/components/xtensa/include)
+        endif()
+
 endif()
 
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5dec214a1..7dcc05c3b 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -39,40 +39,38 @@ if (LWS_PLAT_FREERTOS)
 	add_subdir_include_dirs(plat/freertos)
 	if (ESP_PLATFORM)
 		include_directories($ENV{IDF_PATH}/components/freertos/include
-			    $ENV{IDF_PATH}/components/freertos/xtensa/include
-			    $ENV{IDF_PATH}/components/xtensa/include
-			    $ENV{IDF_PATH}/components/xtensa/esp32/include
-			    $ENV{IDF_PATH}/components/esp_common/include
-			    $ENV{IDF_PATH}/components/esp_timer/include
-			    $ENV{IDF_PATH}/components/soc/include
-			    $ENV{IDF_PATH}/components/soc/src/esp32/include
-			    $ENV{IDF_PATH}/components/lwip/port/esp32/include
-			    $ENV{IDF_PATH}/components/lwip/lwip/src/include
-			    $ENV{IDF_PATH}/components/lwip/port/esp32/include
-			    ${CMAKE_BINARY_DIR}/config
-			    $ENV{IDF_PATH}/components/esp_rom/include
-			    $ENV{IDF_PATH}/components/esp_system/include
-			    $ENV{IDF_PATH}/components/lwip/include/apps/sntp
-			    $ENV{IDF_PATH}/components/soc/soc/esp32/include
-			    $ENV{IDF_PATH}/components/heap/include
-			    $ENV{IDF_PATH}/components/mbedtls/mbedtls/include
-			    $ENV{IDF_PATH}/components/mbedtls/port/include
-			    $ENV{IDF_PATH}/components/esp_wifi/include
-			    $ENV{IDF_PATH}/components/esp_event/include
-			    $ENV{IDF_PATH}/components/esp_netif/include
-			    $ENV{IDF_PATH}/components/esp_eth/include
-			    $ENV{IDF_PATH}/components/driver/include
-			    $ENV{IDF_PATH}/components/soc/soc/include
-			    $ENV{IDF_PATH}/components/tcpip_adapter/include
-			    $ENV{IDF_PATH}/components/lwip/include/apps
-			    $ENV{IDF_PATH}/components/nvs_flash/include
-			    $ENV{IDF_PATH}/components/esp32/include
-			    $ENV{IDF_PATH}/components/spi_flash/include
-			    $ENV{IDF_PATH}/components/mdns/include
-			    $ENV{IDF_PATH}/components/lwip/lwip/src/include/lwip
-			    $ENV{IDF_PATH}/components/lwip/lwip/src/include
-			    $ENV{IDF_PATH}/components/lwip/lwip/src/include/lwip
-			    $ENV{IDF_PATH}/components/newlib/platform_include )
+		    $ENV{IDF_PATH}/components/esp_hw_support/include/soc/
+		    $ENV{IDF_PATH}/components/esp_common/include
+		    $ENV{IDF_PATH}/components/esp_timer/include
+		    $ENV{IDF_PATH}/components/soc/include
+		    $ENV{IDF_PATH}/components/soc/src/esp32/include
+		    $ENV{IDF_PATH}/components/lwip/port/esp32/include
+		    $ENV{IDF_PATH}/components/lwip/lwip/src/include
+		    $ENV{IDF_PATH}/components/lwip/port/esp32/include
+		    ${CMAKE_BINARY_DIR}/config
+		    $ENV{IDF_PATH}/components/esp_rom/include
+		    $ENV{IDF_PATH}/components/esp_system/include
+		    $ENV{IDF_PATH}/components/lwip/include/apps/sntp
+		    $ENV{IDF_PATH}/components/soc/soc/esp32/include
+		    $ENV{IDF_PATH}/components/heap/include
+		    $ENV{IDF_PATH}/components/mbedtls/mbedtls/include
+		    $ENV{IDF_PATH}/components/mbedtls/port/include
+		    $ENV{IDF_PATH}/components/esp_wifi/include
+		    $ENV{IDF_PATH}/components/esp_event/include
+		    $ENV{IDF_PATH}/components/esp_netif/include
+		    $ENV{IDF_PATH}/components/esp_eth/include
+		    $ENV{IDF_PATH}/components/driver/include
+		    $ENV{IDF_PATH}/components/soc/soc/include
+		    $ENV{IDF_PATH}/components/tcpip_adapter/include
+		    $ENV{IDF_PATH}/components/lwip/include/apps
+		    $ENV{IDF_PATH}/components/nvs_flash/include
+		    $ENV{IDF_PATH}/components/esp32/include
+		    $ENV{IDF_PATH}/components/spi_flash/include
+		    $ENV{IDF_PATH}/components/mdns/include
+		    $ENV{IDF_PATH}/components/lwip/lwip/src/include/lwip
+		    $ENV{IDF_PATH}/components/lwip/lwip/src/include
+		    $ENV{IDF_PATH}/components/lwip/lwip/src/include/lwip
+		    $ENV{IDF_PATH}/components/newlib/platform_include )
 	endif()
 	
 else()