msvc: Fix compilation errors due to header include order.