Merge pull request #2678 from reaperhulk/windows-hacks

consolidate the windows specific header trickery we need to do