[libvirt PATCH 0/6] Clean up some includes