diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 6c8bb9498c..7ea968bb58 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -44,7 +44,7 @@
 #include "libvirtd-config.h"
 
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "remote_driver.h"
 #include "viralloc.h"
 #include "virconf.h"
@@ -53,7 +53,6 @@
 #include "remote.h"
 #include "remote_driver.h"
 #include "virhook.h"
-#include "uuid.h"
 #include "viraudit.h"
 #include "locking/lock_manager.h"
 
diff --git a/daemon/remote.c b/daemon/remote.c
index eec43d3433..31a8377b13 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -37,7 +37,7 @@
 #include "virlog.h"
 #include "virutil.h"
 #include "stream.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "libvirt/libvirt-qemu.h"
 #include "vircommand.h"
 #include "intprops.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index e77d48127e..e8fd56ec18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/uuid.c util/uuid.h				\
 		util/viralloc.c util/viralloc.h			\
 		util/virarch.h util/virarch.c			\
 		util/viratomic.h util/viratomic.c		\
@@ -116,6 +115,7 @@ UTIL_SOURCES =							\
 		util/virusb.c util/virusb.h			\
 		util/viruri.h util/viruri.c			\
 		util/virutil.c util/virutil.h			\
+		util/viruuid.c util/viruuid.h			\
 		$(NULL)
 
 EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index e786e69e81..ad9951b402 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -29,7 +29,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "cpu_conf.h"
 #include "virterror_internal.h"
 
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 4efafc4d86..ecfaf30840 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -25,7 +25,7 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "device_conf.h"
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 8919e620f9..7082804552 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -28,7 +28,7 @@
 
 #include "domain_audit.h"
 #include "viraudit.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virlog.h"
 #include "viralloc.h"
 
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4fb63e6cb0..a807c4d03e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -37,7 +37,7 @@
 #include "viralloc.h"
 #include "verify.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "virlog.h"
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index e4b088a674..6a53bda0eb 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -29,7 +29,7 @@
 
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 42f3593e71..01a6f2e3e9 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -39,7 +39,7 @@
 #include "netdev_vlan_conf.h"
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "c-ctype.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 12819c8686..67d743ec56 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -35,7 +35,7 @@
 #include "xml.h"
 #include "virutil.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virrandom.h"
 
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 09a9d1cefa..810de6c8e5 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -38,7 +38,7 @@
 
 #include "internal.h"
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index a65cf92d67..2abb95a9e6 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "virutil.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECRET
 
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 810d2bf32a..3ad74d6a05 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -43,7 +43,7 @@
 #include "snapshot_conf.h"
 #include "virstoragefile.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "xml.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 38bb47146f..4239e493ae 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -39,7 +39,7 @@
 #include "virstoragefile.h"
 
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virutil.h"
 #include "viralloc.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 139c37c91a..8ea54fafab 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -34,7 +34,7 @@
 #include "virutil.h"
 #include "xml.h"
 #include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/datatypes.c b/src/datatypes.c
index 07aefcc057..038c47daff 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -26,7 +26,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 7cc6ac0d89..f6c85ba5e4 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_device_monitor.h"
 #include "esx_vi.h"
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 8e24e80a56..1366c81379 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "virtypedparam.h"
 #include "esx_driver.h"
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 524886fc4e..53c179b94d 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "interface_conf.h"
 #include "virsocketaddr.h"
 #include "esx_private.h"
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 0fc2603d07..48763d4317 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "network_conf.h"
 #include "esx_private.h"
 #include "esx_network_driver.h"
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index ecee0fb560..c59929cb62 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_nwfilter_driver.h"
 #include "esx_vi.h"
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 722d3f7507..92cbb14cde 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -27,7 +27,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_secret_driver.h"
 #include "esx_vi.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 3c3ab7d93d..e09fa55980 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
 #include "esx_storage_backend_iscsi.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index c57e070f04..f965b4f77f 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -34,7 +34,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
 #include "esx_storage_backend_vmfs.h"
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index 1324469585..5fb4e1f697 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "storage_conf.h"
 #include "esx_private.h"
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 9b2e576057..4d2019b34d 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "esx_private.h"
 #include "esx_util.h"
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 2cc80022b7..92ac8f86c1 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -30,7 +30,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "xml.h"
 #include "esx_vi.h"
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 7ffca559d6..2279e62833 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -26,7 +26,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_vi_methods.h"
 #include "esx_util.h"
 
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 10d559f7ce..43ee1fcae9 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_device_monitor.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index d777bd808a..601a85aaa4 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -30,7 +30,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_driver.h"
 #include "hyperv_interface_driver.h"
 #include "hyperv_network_driver.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index af37de3eea..7dd6912056 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_interface_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index cafc956288..f34a451a8e 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_network_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 46c57b7c1b..c6125ec51d 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_nwfilter_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index ea8fa7e936..b830e4e6b9 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_secret_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 75498018fe..38385a03ba 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_storage_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 69a57c664a..9bc5b814cb 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -27,7 +27,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_private.h"
 #include "hyperv_util.h"
 
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index f4afdce496..e029028846 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -30,7 +30,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "hyperv_private.h"
 #include "hyperv_wmi.h"
diff --git a/src/libvirt.c b/src/libvirt.c
index 5654d530e2..e06b643c28 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -50,7 +50,7 @@
 #include "datatypes.h"
 #include "driver.h"
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "configmake.h"
 #include "intprops.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 9117c9b6a9..8a1b21e5a3 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -37,7 +37,7 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "capabilities.h"
 #include "libxl_driver.h"
 #include "libxl_conf.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 4db2614004..c62ec3d6e2 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -37,7 +37,7 @@
 #include "datatypes.h"
 #include "virfile.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vircommand.h"
 #include "libxl.h"
 #include "libxl_driver.h"
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 0ae9750092..0354e26cdb 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -23,7 +23,7 @@
 
 #include "domain_lock.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index df9923ef13..a445b2e5a5 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -44,7 +44,7 @@
 #include "rpc/virnetserver.h"
 #include "virrandom.h"
 #include "virhash.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #include "locking/lock_daemon_dispatch.h"
 #include "locking/lock_protocol.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 547db8502e..9c7ce6d9a4 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -25,7 +25,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "virterror_internal.h"
diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index cf0f49a3bc..e8e9917ed6 100644
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -24,7 +24,7 @@
 #include "lock_driver_nop.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 
 static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED,
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index d73e184902..1b888389c4 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -27,7 +27,7 @@
 #include "virlog.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #if HAVE_DLFCN_H
 # include <dlfcn.h>
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index ede79d154f..866718caba 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -32,7 +32,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "configmake.h"
 #include "lxc_container.h"
 #include "virnodesuspend.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index ca741f9c5a..6769d335b3 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -59,7 +59,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virnetdevveth.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "virusb.h"
 #include "vircommand.h"
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 2f89452f29..91d09c455c 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -50,7 +50,7 @@
 #include "virnetdevbridge.h"
 #include "virnetdevveth.h"
 #include "nodeinfo.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virstatslinux.h"
 #include "virhook.h"
 #include "virfile.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index da72562a30..4bf8a2bfea 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -55,7 +55,7 @@
 #include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viriptables.h"
 #include "virlog.h"
 #include "virdnsmasq.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 257a363724..8ee816b041 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -34,7 +34,7 @@
 #include "driver.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virlog.h"
 #include "node_device_driver.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index d350955b40..61e5a0e2ff 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -34,7 +34,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "virpci.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 4b1e25835a..b5a5c87134 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -45,7 +45,7 @@
 #include "virterror_internal.h"
 #include "openvz_conf.h"
 #include "openvz_util.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index bfb6ed1a34..df15253fed 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -52,7 +52,7 @@
 #include "driver.h"
 #include "libvirt/libvirt.h"
 #include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "storage_conf.h"
 #include "nodeinfo.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 37ca58d426..836834470f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -34,7 +34,7 @@
 #include "virarch.h"
 #include "virutil.h"
 #include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "c-ctype.h"
 #include "domain_nwfilter.h"
 #include "domain_audit.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c8e5d53aa2..8a21703643 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -39,7 +39,7 @@
 #include "qemu_command.h"
 #include "qemu_capabilities.h"
 #include "qemu_bridge_filter.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
 #include "virutil.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3e1081ae29..46b765606c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -32,7 +32,7 @@
 #include "virterror_internal.h"
 #include "c-ctype.h"
 #include "cpu/cpu.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "domain_event.h"
 #include "virtime.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2d8f3f421e..3832a6c5c2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -67,7 +67,7 @@
 #include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "node_device_conf.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index d1cba02d7c..6cd16e7189 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -43,7 +43,7 @@
 #include "virfile.h"
 #include "datatypes.h"
 #include "fdstream.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virtime.h"
 #include "locking/domain_lock.h"
 #include "rpc/virnetsocket.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ad144d01af..2dd2416f4c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -64,7 +64,7 @@
 #include "domain_nwfilter.h"
 #include "locking/domain_lock.h"
 #include "network/bridge_driver.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virprocess.h"
 #include "virtime.h"
 #include "virnetdevtap.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 8dfd921da7..1784feaf20 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -38,7 +38,7 @@
 #include "secret_driver.h"
 #include "virthread.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "virfile.h"
 #include "configmake.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 2754301140..3eb1e6583c 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -42,7 +42,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virusb.h"
 #include "virfile.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index e21e98cd5e..900e284101 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -49,7 +49,7 @@
 #include "security_apparmor.h"
 #include "domain_conf.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virusb.h"
 #include "virpci.h"
 #include "virfile.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 29272f145f..f98a7c0e62 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -51,7 +51,7 @@
 #include "viralloc.h"
 #include "internal.h"
 #include "secret_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virstoragefile.h"
 #include "storage_backend.h"
 #include "virlog.h"
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index ffa3234571..7dc46b0052 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "base64.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "rados/librados.h"
 #include "rbd/librbd.h"
 
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4c0b1ab500..1f2718c018 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -37,7 +37,7 @@
 #include "test_driver.h"
 #include "virbuffer.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "capabilities.h"
 #include "viralloc.h"
 #include "network_conf.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 38afbb9bb8..31a44905b7 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -35,7 +35,7 @@
 #include <arpa/inet.h>
 
 #include "uml_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
 #include "virutil.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 05fb7f2662..448d292a88 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -52,7 +52,7 @@
 #include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "datatypes.h"
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 953d76b818..720a48a288 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -58,7 +58,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
 
 # include "viralloc.h"
 # include "virlog.h"
-# include "uuid.h"
+# include "viruuid.h"
 # include "virfile.h"
 # include "virnetlink.h"
 # include "virnetdev.h"
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index cc106b857b..940c0e9402 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -24,7 +24,7 @@
 # define __VIR_NETDEV_VPORT_PROFILE_H__
 
 # include "internal.h"
-# include "uuid.h"
+# include "viruuid.h"
 # include "virutil.h"
 # include "virmacaddr.h"
 
diff --git a/src/util/uuid.c b/src/util/viruuid.c
similarity index 98%
rename from src/util/uuid.c
rename to src/util/viruuid.c
index 57cfaa6c43..0cd70d1f2a 100644
--- a/src/util/uuid.c
+++ b/src/util/viruuid.c
@@ -1,4 +1,6 @@
 /*
+ * viruuid.h: helper APIs for dealing with UUIDs
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +23,7 @@
 
 #include <config.h>
 
-#include "uuid.h"
+#include "viruuid.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/util/uuid.h b/src/util/viruuid.h
similarity index 96%
rename from src/util/uuid.h
rename to src/util/viruuid.h
index d90fd2eada..bebd338161 100644
--- a/src/util/uuid.h
+++ b/src/util/viruuid.h
@@ -1,4 +1,6 @@
 /*
+ * viruuid.h: helper APIs for dealing with UUIDs
+ *
  * Copyright (C) 2007, 2011, 2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index cb1698f9b0..597a7c53d5 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -48,7 +48,7 @@
 #include "domain_event.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "virlog.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 6c8e9249ef..2cbdd7cd07 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "vmx.h"
 
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 12195bf7d7..67cdc8888e 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -29,7 +29,7 @@
 #include "virfile.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vircommand.h"
 #include "vmx.h"
 #include "vmware_conf.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 4d55f0b442..552f5788db 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -30,7 +30,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "viruri.h"
 
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 2b8496c77b..4cbe827bdf 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -58,7 +58,7 @@
 #include "viralloc.h"
 #include "node_device_conf.h"
 #include "virpci.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "fdstream.h"
 #include "virfile.h"
 #include "viruri.h"
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 35a625ceae..4cce25a004 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -37,7 +37,7 @@
 #include "xen_inotify.h"
 #include "xend_internal.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 
 #include "xm_internal.h" /* for xenXMDomainConfigParse */
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 7ffc5bb7fc..120e2379da 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -38,7 +38,7 @@
 #include "virsexpr.h"
 #include "xen_sxpr.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "xen_driver.h"
 #include "xen_hypervisor.h"
 #include "xs_internal.h" /* To extract VNC port & Serial console TTY */
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index e3206ebb9e..0806e7729a 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -44,7 +44,7 @@
 #include "xen_xm.h"
 #include "virhash.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index e414966075..20332df12a 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -46,7 +46,7 @@
 #include "driver.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "xen_driver.h"
 #include "xs_internal.h"
 #include "xen_hypervisor.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 49a8a74f72..4df6c5b1e4 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -32,7 +32,7 @@
 #include "datatypes.h"
 #include "virauth.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"
 #include "viruri.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 15be403329..5c53b691ed 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"
 #include "virlog.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b28c538798..b83ac58080 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -31,7 +31,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virlog.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index f48326440f..d965d79940 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -30,7 +30,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virsexpr.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"