Moving more Windows-specific header stuff over to the Windows-specific header file