diff --git a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
index 182201c0a..0d3fd671f 100644
--- a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
+++ b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
@@ -89,6 +89,7 @@ if (MSVC)
     endif()
 
     configure_file(${CMAKE_CURRENT_LIST_DIR}/webrtc_cfg_win.bat_sample ${CMAKE_CURRENT_BINARY_DIR}/webrtc_cfg_win.bat)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/webrtc_copy_win.bat_sample ${CMAKE_CURRENT_BINARY_DIR}/webrtc_copy_win.bat)
 
     ExternalProject_Add(webrtc-src
       DOWNLOAD_COMMAND  ${WEBRTC_FETCH_CMD1}
@@ -110,10 +111,8 @@ if (MSVC)
       BUILD_COMMAND     ${CMAKE_CURRENT_BINARY_DIR}/webrtc_cfg_win.bat
       COMMAND           CALL ninja -v -C <INSTALL_DIR>\\lib\\debug teamtalk
       COMMAND           CALL ninja -v -C <INSTALL_DIR>\\lib\\release teamtalk
-      INSTALL_COMMAND   cd ${WEBRTC_SOURCE_ROOT}
-      COMMAND           DEL /S /Q ${WEBRTC_INSTALL_ROOT_NATIVE}\\include
-      COMMAND           XCOPY *.h /S ${WEBRTC_INSTALL_ROOT_NATIVE}\\include
-      COMMAND           XCOPY *.inc /S ${WEBRTC_INSTALL_ROOT_NATIVE}\\include
+      INSTALL_COMMAND   ${CMAKE_COMMAND} -E rm -rf ${WEBRTC_INSTALL_ROOT}/include
+      COMMAND           ${CMAKE_CURRENT_BINARY_DIR}/webrtc_copy_win.bat
       BUILD_BYPRODUCTS  <INSTALL_DIR>/lib/debug/obj/modules/audio_processing/teamtalk.lib
       <INSTALL_DIR>/lib/release/obj/modules/audio_processing/teamtalk.lib
       DEPENDS depot-tools
diff --git a/Library/TeamTalkLib/build/webrtc/depottools-win.bat_sample b/Library/TeamTalkLib/build/webrtc/depottools-win.bat_sample
index 8fee39d72..ad9619420 100644
--- a/Library/TeamTalkLib/build/webrtc/depottools-win.bat_sample
+++ b/Library/TeamTalkLib/build/webrtc/depottools-win.bat_sample
@@ -1,13 +1,11 @@
 SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
 IF NOT "%ERRORLEVEL%" == "0" GOTO fail
-SET PATH=%PATH%;@DEPOTTOOLS_DIR_NATIVE@
+SET PATH=@DEPOTTOOLS_DIR_NATIVE@;%PATH%
 IF NOT "%ERRORLEVEL%" == "0" GOTO fail
 CD @WEBRTC_FETCH_PATH_NATIVE@
 IF NOT "%ERRORLEVEL%" == "0" GOTO fail
 fetch.bat --nohooks webrtc
 IF NOT "%ERRORLEVEL%" == "0" GOTO fail
-gclient sync --with_branch_heads --with_tags
-IF NOT "%ERRORLEVEL%" == "0" GOTO fail
 
 cd @WEBRTC_SOURCE_ROOT_NATIVE@
 IF NOT "%ERRORLEVEL%" == "0" GOTO fail
diff --git a/Library/TeamTalkLib/build/webrtc/webrtc_cfg_win.bat_sample b/Library/TeamTalkLib/build/webrtc/webrtc_cfg_win.bat_sample
index c6f17693a..d81a7842b 100644
--- a/Library/TeamTalkLib/build/webrtc/webrtc_cfg_win.bat_sample
+++ b/Library/TeamTalkLib/build/webrtc/webrtc_cfg_win.bat_sample
@@ -1,2 +1,2 @@
 SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
-SET PATH=%PATH%;@DEPOTTOOLS_DIR_NATIVE@
+SET PATH=@DEPOTTOOLS_DIR_NATIVE@;%PATH%
diff --git a/Library/TeamTalkLib/build/webrtc/webrtc_copy_win.bat_sample b/Library/TeamTalkLib/build/webrtc/webrtc_copy_win.bat_sample
new file mode 100644
index 000000000..1c5ff3612
--- /dev/null
+++ b/Library/TeamTalkLib/build/webrtc/webrtc_copy_win.bat_sample
@@ -0,0 +1,9 @@
+ROBOCOPY @WEBRTC_SOURCE_ROOT_NATIVE@ @WEBRTC_INSTALL_ROOT_NATIVE@\include *.h /S
+IF NOT "%ERRORLEVEL%" == "1" GOTO fail
+ROBOCOPY @WEBRTC_SOURCE_ROOT_NATIVE@ @WEBRTC_INSTALL_ROOT_NATIVE@\include *.inc /S
+IF NOT "%ERRORLEVEL%" == "1" GOTO fail
+
+EXIT /B 0
+
+:fail
+EXIT /B 1