I used a command like this to update the paths: perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"` Changes since last attempt: Some system headers were moved back to their original location since on Windows compilation breaks otherwise. BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True TBR=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2966523003 Cr-Commit-Position: refs/heads/master@{#18868}