more header fixes
msvc fixes