More removal of Requires where the XS build system is poorly factored.

Also reinstitute the patch in xcp-idl to disable the message switch

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>