The second one, for msvc mode (which vlc doesn't need anyway), isn't necessary now that llvm has been patched to emit calls properly using the msvc helper function names.
Build using the master branch instead of 3.9. By building using cmake, we don't need to build the files that require an upper case Windows.h.