fix some headers to compile with MSVC