Fixed header dependencies to be fully compatible with the Windows