Moved includes out to the windows libs