The v2 patch would not compile under a fresh build due to a missing include that was being masked by installed files at the BSP install location. This resolves that issue and ensures that this builds from a completely fresh build.