[libvirt] [PATCH 4/6] Clean up headers in src/util/virutil.h