Fix header issues with MSVC debug builds