Revert "change include order on windows"

This reverts commit c1ed5356be1bad3c93b58afb15f76b079dbd8c87.