Test include fixes for MSVC