diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 9fe432a..dec147a 100644
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -87,6 +87,7 @@ SET(WebKit2_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/runtime"
     "${WTF_DIR}"
     "${DERIVED_SOURCES_DIR}"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${DERIVED_SOURCES_WEBKIT2_DIR}"
     "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
@@ -492,6 +493,49 @@ SET(WebKit2_MESSAGES_IN_FILES
     WebProcess/WebPage/WebPage.messages.in
 )

+SET(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+    Shared/API/c
+    UIProcess/API/C
+    WebProcess
+)
+
+SET(WebCore_FORWARDING_HEADERS_DIRECTORIES
+    ${WEBCORE_DIR}/Modules/geolocation
+    ${WEBCORE_DIR}/Modules/webdatabase
+    ${WEBCORE_DIR}/accessibility
+    ${WEBCORE_DIR}/bindings/js
+    ${WEBCORE_DIR}/bridge
+    ${WEBCORE_DIR}/css
+    ${WEBCORE_DIR}/dom
+    ${WEBCORE_DIR}/editing
+    ${WEBCORE_DIR}/history
+    ${WEBCORE_DIR}/html
+    ${WEBCORE_DIR}/inspector
+    ${WEBCORE_DIR}/loader
+    ${WEBCORE_DIR}/loader/appcache
+    ${WEBCORE_DIR}/loader/archive
+    ${WEBCORE_DIR}/loader/cache
+    ${WEBCORE_DIR}/loader/icon
+    ${WEBCORE_DIR}/notifications
+    ${WEBCORE_DIR}/page
+    ${WEBCORE_DIR}/page/animation
+    ${WEBCORE_DIR}/platform
+    ${WEBCORE_DIR}/platform/graphics
+    ${WEBCORE_DIR}/platform/graphics/transforms
+    ${WEBCORE_DIR}/platform/network
+    ${WEBCORE_DIR}/platform/mock
+    ${WEBCORE_DIR}/platform/text
+    ${WEBCORE_DIR}/plugins
+    ${WEBCORE_DIR}/storage
+    ${WEBCORE_DIR}/rendering
+)
+
+SET(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
+    ${JAVASCRIPTCORE_DIR}/heap
+    ${JAVASCRIPTCORE_DIR}/parser
+    ${JAVASCRIPTCORE_DIR}/runtime
+)
+
 # Create JavaScript C++ code given an IDL input
 FOREACH (_file ${WebKit2_MESSAGES_IN_FILES})
     GET_FILENAME_COMPONENT (_name ${_file} NAME_WE)
@@ -519,17 +563,17 @@ SET(WebProcess_LIBRARIES
     ${WebKit2_LIBRARY_NAME}
 )

-SET(ForwardingHeaders_NAME )
-SET(ForwardingNetworkHeaders_NAME )
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()

+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit2 DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
+WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
+WEBKIT_CREATE_FORWARDING_HEADERS(JavaScriptCore DIRECTORIES ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
+
 ADD_DEFINITIONS(-DBUILDING_WEBKIT)
 INCLUDE_DIRECTORIES(${WebKit2_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})

 ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
-ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingHeaders_NAME})
-ADD_DEPENDENCIES(${WebKit2_LIBRARY_NAME} ${ForwardingNetworkHeaders_NAME})
 TARGET_LINK_LIBRARIES(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARIES})
 SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES FOLDER "WebKit")
 SET_TARGET_PROPERTIES(${WebKit2_LIBRARY_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "")
diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index 665b672..e6af065 100644
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -113,12 +113,12 @@ LIST (APPEND WebProcess_LIBRARIES
     ${SQLITE_LIBRARIES}
 )

-ADD_CUSTOM_TARGET(forwarding-headerEfl
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
+LIST(APPEND WebKit2_FORWARDING_HEADERS_DIRECTORIES
+    Shared/API/c/efl
 )
-SET(ForwardingHeaders_NAME forwarding-headerEfl)

-ADD_CUSTOM_TARGET(forwarding-headerSoup
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
+LIST(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
+    ${WEBCORE_DIR}/platform/cairo
+    ${WEBCORE_DIR}/platform/graphics/cairo
+    ${WEBCORE_DIR}/platform/network/soup
 )
-SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)