consolidate the windows specific header trickery we need to do
2 files changed