Added additional headers files for msvc compatability.