diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e247ac52..a82da5ebd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ set(LWS_WITH_POLL 1)
 
 if (ESP_PLATFORM)
 	set(LWS_ESP_PLATFORM 1)
-	set(CMAKE_TOOLCHAIN_FILE contrib/cross-esp32.cmake)
+	#set(CMAKE_TOOLCHAIN_FILE contrib/cross-esp32.cmake)
 	set(LWIP_PROVIDE_ERRNO 1)
 endif()
 
@@ -66,6 +66,18 @@ endif()
 project(libwebsockets C CXX)
 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/
+       )
+endif()
+
+
 #
 # Select features recommended for PC distro packaging
 #