Initial Windows Clean up

This is incomplete. It shows some windows header macro clean up that I consolidated and want review on.
I take it this is just temporary?