Fixed includes for MSVC