refinements to windows headers