Revert "Fix include order with Xdmcp on WIN32"