diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c
index 0cdb3b1d72..ee9427ea18 100644
--- a/src/bhyve/bhyve_conf.c
+++ b/src/bhyve/bhyve_conf.c
@@ -43,7 +43,7 @@ static int virBhyveConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virBhyveConfig)
+VIR_ONCE_GLOBAL_INIT(virBhyveConfig);
 
 virBhyveDriverConfigPtr
 virBhyveDriverConfigNew(void)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index be39b35da2..716ac6e2e7 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -63,7 +63,7 @@ static int virCapabilitiesOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virCapabilities)
+VIR_ONCE_GLOBAL_INIT(virCapabilities);
 
 /**
  * virCapabilitiesNew:
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index d002ddb502..6352eda343 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -49,7 +49,7 @@ static int virDomainCapsOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virDomainCaps)
+VIR_ONCE_GLOBAL_INIT(virDomainCaps);
 
 
 static void
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1df536f6e7..1fc4c8a35a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1067,7 +1067,7 @@ static int virDomainObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainObj)
+VIR_ONCE_GLOBAL_INIT(virDomainObj);
 
 
 static void
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 1bba4a2520..b33589f472 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -338,7 +338,7 @@ virDomainEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainEvents)
+VIR_ONCE_GLOBAL_INIT(virDomainEvents);
 
 
 static void
diff --git a/src/conf/network_event.c b/src/conf/network_event.c
index e3d2f2b6b3..41cabe340a 100644
--- a/src/conf/network_event.c
+++ b/src/conf/network_event.c
@@ -64,7 +64,7 @@ virNetworkEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetworkEvents)
+VIR_ONCE_GLOBAL_INIT(virNetworkEvents);
 
 static void
 virNetworkEventDispose(void *obj)
diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c
index e85bcbba0d..c6915be593 100644
--- a/src/conf/node_device_event.c
+++ b/src/conf/node_device_event.c
@@ -78,7 +78,7 @@ virNodeDeviceEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents)
+VIR_ONCE_GLOBAL_INIT(virNodeDeviceEvents);
 
 static void
 virNodeDeviceEventDispose(void *obj)
diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 667852fe22..5d84598d59 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -99,7 +99,7 @@ virObjectEventOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virObjectEvent)
+VIR_ONCE_GLOBAL_INIT(virObjectEvent);
 
 /**
  * virClassForObjectEvent:
diff --git a/src/conf/secret_event.c b/src/conf/secret_event.c
index 3395aa128d..1c34dcfbc9 100644
--- a/src/conf/secret_event.c
+++ b/src/conf/secret_event.c
@@ -77,7 +77,7 @@ virSecretEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virSecretEvents)
+VIR_ONCE_GLOBAL_INIT(virSecretEvents);
 
 static void
 virSecretEventDispose(void *obj)
diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c
index 32a12eb63f..de36ec3af9 100644
--- a/src/conf/storage_event.c
+++ b/src/conf/storage_event.c
@@ -78,7 +78,7 @@ virStoragePoolEventsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents)
+VIR_ONCE_GLOBAL_INIT(virStoragePoolEvents);
 
 static void
 virStoragePoolEventDispose(void *obj)
diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 384d97d768..0e943d0a6c 100644
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -60,7 +60,7 @@ static int virDomainObjListOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDomainObjList)
+VIR_ONCE_GLOBAL_INIT(virDomainObjList);
 
 virDomainObjListPtr virDomainObjListNew(void)
 {
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index 028d699b32..c8d931a4b6 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -67,7 +67,7 @@ virInterfaceObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virInterfaceObj)
+VIR_ONCE_GLOBAL_INIT(virInterfaceObj);
 
 
 static void
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 3749dda751..ae1264325a 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -84,7 +84,7 @@ virNetworkObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virNetworkObj)
+VIR_ONCE_GLOBAL_INIT(virNetworkObj);
 
 virNetworkObjPtr
 virNetworkObjNew(void)
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 6df2985561..37d9de478f 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -69,7 +69,7 @@ virNodeDeviceObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj)
+VIR_ONCE_GLOBAL_INIT(virNodeDeviceObj);
 
 
 static void
diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
index d145fe3223..23978d4207 100644
--- a/src/conf/virnwfilterbindingobj.c
+++ b/src/conf/virnwfilterbindingobj.c
@@ -51,7 +51,7 @@ virNWFilterBindingObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj)
+VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj);
 
 virNWFilterBindingObjPtr
 virNWFilterBindingObjNew(void)
diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 7e8437988f..887c7c7b09 100644
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -52,7 +52,7 @@ static int virNWFilterBindingObjListOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList)
+VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObjList);
 
 
 virNWFilterBindingObjListPtr
diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index c4e7b06eca..8b418d5e66 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -78,7 +78,7 @@ virSecretObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virSecretObj)
+VIR_ONCE_GLOBAL_INIT(virSecretObj);
 
 static virSecretObjPtr
 virSecretObjNew(void)
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 6ea6a97d89..7005de3c24 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -120,7 +120,7 @@ virStorageVolObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStorageVolObj)
+VIR_ONCE_GLOBAL_INIT(virStorageVolObj);
 
 
 static virStorageVolObjPtr
@@ -211,7 +211,7 @@ virStoragePoolObjOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStoragePoolObj)
+VIR_ONCE_GLOBAL_INIT(virStoragePoolObj);
 
 
 virStoragePoolObjPtr
diff --git a/src/datatypes.c b/src/datatypes.c
index caf035f178..09f63d9e15 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -109,7 +109,7 @@ virDataTypesOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virDataTypes)
+VIR_ONCE_GLOBAL_INIT(virDataTypes);
 
 /**
  * virGetConnect:
diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index a28d1353c1..27cc488f4b 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -59,7 +59,7 @@ virNetcfDriverStateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetcfDriverState)
+VIR_ONCE_GLOBAL_INIT(virNetcfDriverState);
 
 static virNetcfDriverStatePtr driver;
 
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 73e988a3dc..0e08b8f0a2 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -66,7 +66,7 @@ static int libxlConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlConfig)
+VIR_ONCE_GLOBAL_INIT(libxlConfig);
 
 static void
 libxlDriverConfigDispose(void *obj)
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 3ada51f517..ffafa7967d 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -61,7 +61,7 @@ libxlDomainObjPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate)
+VIR_ONCE_GLOBAL_INIT(libxlDomainObjPrivate);
 
 static int
 libxlDomainObjInitJob(libxlDomainObjPrivatePtr priv)
diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index cd33efa417..76bcb66a11 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -248,7 +248,7 @@ libxlMigrationDstArgsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs)
+VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs);
 
 static void
 libxlDoMigrateDstReceive(void *opaque)
diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 272bb719ca..16c5ce0cf2 100644
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -82,7 +82,7 @@ virLogHandlerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLogHandler)
+VIR_ONCE_GLOBAL_INIT(virLogHandler);
 
 
 static void
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index c8fa8c4f44..4720c99793 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -51,7 +51,7 @@ static int virLXCConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLXCConfig)
+VIR_ONCE_GLOBAL_INIT(virLXCConfig);
 
 
 /* Functions */
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 0b18a14a89..6d3db9629a 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -57,7 +57,7 @@ static int virLXCMonitorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLXCMonitor)
+VIR_ONCE_GLOBAL_INIT(virLXCMonitor);
 
 static void
 virLXCMonitorHandleEventExit(virNetClientProgramPtr prog,
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index aa86058113..b1e5f00067 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -97,7 +97,7 @@ udevEventDataOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(udevEventData)
+VIR_ONCE_GLOBAL_INIT(udevEventData);
 
 static udevEventDataPtr
 udevEventDataNew(void)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index b52beae9d9..ea62b4b4a5 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -140,7 +140,7 @@ static int qemuAgentOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuAgent)
+VIR_ONCE_GLOBAL_INIT(qemuAgent);
 
 
 #if DEBUG_RAW_IO
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index f19d44b04f..0cbebab359 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -66,7 +66,7 @@ qemuBlockJobDataOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(qemuBlockJobData)
+VIR_ONCE_GLOBAL_INIT(qemuBlockJobData);
 
 static qemuBlockJobDataPtr
 qemuBlockJobDataNew(qemuBlockJobType type,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ca271b5274..7ed5f94803 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -615,7 +615,7 @@ static int virQEMUCapsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virQEMUCaps)
+VIR_ONCE_GLOBAL_INIT(virQEMUCaps);
 
 static virArch virQEMUCapsArchFromString(const char *arch)
 {
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 8379b5a30d..2f5ef8d0c4 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -80,7 +80,7 @@ static int virQEMUConfigOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virQEMUConfig)
+VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 
 
 static void
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b348633d4b..162be7e982 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -156,7 +156,7 @@ qemuDomainOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomain)
+VIR_ONCE_GLOBAL_INIT(qemuDomain);
 
 static void
 qemuDomainLogContextDispose(void *obj)
@@ -1051,7 +1051,7 @@ qemuDomainDiskPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainDiskPrivate);
 
 static virObjectPtr
 qemuDomainDiskPrivateNew(void)
@@ -1090,7 +1090,7 @@ qemuDomainStorageSourcePrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainStorageSourcePrivate);
 
 virObjectPtr
 qemuDomainStorageSourcePrivateNew(void)
@@ -1129,7 +1129,7 @@ qemuDomainVcpuPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainVcpuPrivate);
 
 static virObjectPtr
 qemuDomainVcpuPrivateNew(void)
@@ -1169,7 +1169,7 @@ qemuDomainChrSourcePrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainChrSourcePrivate);
 
 static virObjectPtr
 qemuDomainChrSourcePrivateNew(void)
@@ -1207,7 +1207,7 @@ qemuDomainVsockPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainVsockPrivate);
 
 static virObjectPtr
 qemuDomainVsockPrivateNew(void)
@@ -1247,7 +1247,7 @@ qemuDomainGraphicsPrivateOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate)
+VIR_ONCE_GLOBAL_INIT(qemuDomainGraphicsPrivate);
 
 static virObjectPtr
 qemuDomainGraphicsPrivateNew(void)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 19d5556e06..8bd4d4d761 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -165,7 +165,7 @@ static int qemuMonitorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(qemuMonitor)
+VIR_ONCE_GLOBAL_INIT(qemuMonitor);
 
 
 VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index fc18e6a204..5906cdfa19 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -62,7 +62,7 @@ static int virKeepAliveOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virKeepAlive)
+VIR_ONCE_GLOBAL_INIT(virKeepAlive);
 
 static virNetMessagePtr
 virKeepAliveMessage(virKeepAlivePtr ka, int proc)
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index b7ffdcb05b..40d45b9d2a 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -124,7 +124,7 @@ static int virNetClientOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClient)
+VIR_ONCE_GLOBAL_INIT(virNetClient);
 
 static void virNetClientIOEventLoopPassTheBuck(virNetClientPtr client,
                                                virNetClientCallPtr thiscall);
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 5e68122881..58f24145ec 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -58,7 +58,7 @@ static int virNetClientProgramOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClientProgram)
+VIR_ONCE_GLOBAL_INIT(virNetClientProgram);
 
 
 virNetClientProgramPtr virNetClientProgramNew(unsigned program,
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 1140b8dfa3..a17da31392 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -75,7 +75,7 @@ static int virNetClientStreamOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetClientStream)
+VIR_ONCE_GLOBAL_INIT(virNetClientStream);
 
 
 static void
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 833b78d7c0..0ca61c5a9a 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -113,7 +113,7 @@ virNetDaemonOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetDaemon)
+VIR_ONCE_GLOBAL_INIT(virNetDaemon);
 
 
 virNetDaemonPtr
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index b4db5c40c6..f49340f033 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -66,7 +66,7 @@ static int virNetSASLContextOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetSASLContext)
+VIR_ONCE_GLOBAL_INIT(virNetSASLContext);
 
 /* Apple have annotated all SASL functions as deprecated for
  * unknown reasons. Since they still work, lets just ignore
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 380ca6b302..83b871764f 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -96,7 +96,7 @@ static int virNetServerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServer)
+VIR_ONCE_GLOBAL_INIT(virNetServer);
 
 unsigned long long virNetServerNextClientID(virNetServerPtr srv)
 {
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 2464319a49..410de253d2 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -131,7 +131,7 @@ static int virNetServerClientOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerClient)
+VIR_ONCE_GLOBAL_INIT(virNetServerClient);
 
 
 static void virNetServerClientDispatchEvent(virNetSocketPtr sock, int events, void *opaque);
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 53f566ba53..7ae1d2e955 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -55,7 +55,7 @@ static int virNetServerProgramOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerProgram)
+VIR_ONCE_GLOBAL_INIT(virNetServerProgram);
 
 
 virNetServerProgramPtr virNetServerProgramNew(unsigned program,
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 36c92c6714..97341d1546 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -59,7 +59,7 @@ static int virNetServerServiceOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetServerService)
+VIR_ONCE_GLOBAL_INIT(virNetServerService);
 
 
 static void virNetServerServiceAccept(virNetSocketPtr sock,
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 4f7b6d59f7..bfa1952989 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -128,7 +128,7 @@ static int virNetSocketOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetSocket)
+VIR_ONCE_GLOBAL_INIT(virNetSocket);
 
 
 #ifndef WIN32
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 7bc6540641..72e9ed9eac 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -96,7 +96,7 @@ static int virNetTLSContextOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virNetTLSContext)
+VIR_ONCE_GLOBAL_INIT(virNetTLSContext);
 
 
 static int
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 568c52aa28..b06567855e 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -133,7 +133,7 @@ static int testDriverOnceInit(void)
 
     return 0;
 }
-VIR_ONCE_GLOBAL_INIT(testDriver)
+VIR_ONCE_GLOBAL_INIT(testDriver);
 
 #define TEST_MODEL "i686"
 #define TEST_EMULATOR "/usr/bin/test-hv"
diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c
index c88a94112e..200577e18e 100644
--- a/src/util/virclosecallbacks.c
+++ b/src/util/virclosecallbacks.c
@@ -55,7 +55,7 @@ static int virCloseCallbacksOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virCloseCallbacks)
+VIR_ONCE_GLOBAL_INIT(virCloseCallbacks);
 
 
 virCloseCallbacksPtr
diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index 9abd9ed3bf..81e20c9df0 100644
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -58,7 +58,7 @@ virDevMapperOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virDevMapper)
+VIR_ONCE_GLOBAL_INIT(virDevMapper);
 
 
 static int
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index d676bfda69..550f3179ae 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -643,7 +643,7 @@ static int dnsmasqCapsOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(dnsmasqCaps)
+VIR_ONCE_GLOBAL_INIT(dnsmasqCaps);
 
 static void
 dnsmasqCapsSet(dnsmasqCapsPtr caps,
diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index cff40bad25..1bc43e20a1 100644
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -135,7 +135,7 @@ static int virFDStreamDataOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virFDStreamData)
+VIR_ONCE_GLOBAL_INIT(virFDStreamData);
 
 
 static int
diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index eb7dbd97cc..fa57e3d620 100644
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -93,7 +93,7 @@ virFileCacheOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virFileCache)
+VIR_ONCE_GLOBAL_INIT(virFileCache);
 
 
 static char *
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 177f72ef68..d63ce05ed8 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -93,7 +93,7 @@ virFirewallOnceInit(void)
     return virFirewallValidateBackend(currentBackend);
 }
 
-VIR_ONCE_GLOBAL_INIT(virFirewall)
+VIR_ONCE_GLOBAL_INIT(virFirewall);
 
 static bool iptablesUseLock;
 static bool ip6tablesUseLock;
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 52722fc049..4fcdd61043 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -77,7 +77,7 @@ static int virHashAtomicOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virHashAtomic)
+VIR_ONCE_GLOBAL_INIT(virHashAtomic);
 
 
 static uint32_t virHashStrCode(const void *name, uint32_t seed)
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 880ca083d4..6be395cdda 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -124,7 +124,7 @@ static int virHostdevManagerOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virHostdevManager)
+VIR_ONCE_GLOBAL_INIT(virHostdevManager);
 
 static void
 virHostdevManagerDispose(void *obj)
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index e7637b5f20..4ceff3cb74 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -67,7 +67,7 @@ static int virIdentityOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virIdentity)
+VIR_ONCE_GLOBAL_INIT(virIdentity);
 
 /**
  * virIdentityGetCurrent:
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 0861576a00..269a5f89d4 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -298,7 +298,7 @@ virLogOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virLog)
+VIR_ONCE_GLOBAL_INIT(virLog);
 
 
 /**
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 8b46534421..814dc55952 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -66,7 +66,7 @@ virMediatedOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virMediated)
+VIR_ONCE_GLOBAL_INIT(virMediated);
 
 #ifdef __linux__
 
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 81181b2b81..adeab66d77 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -203,7 +203,7 @@ static int virPCIOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virPCI)
+VIR_ONCE_GLOBAL_INIT(virPCI);
 
 
 static char *
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index d48963c1ff..1ffd446f40 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -91,7 +91,7 @@ virPortAllocatorOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virPortAllocator)
+VIR_ONCE_GLOBAL_INIT(virPortAllocator);
 
 virPortAllocatorRangePtr
 virPortAllocatorRangeNew(const char *name,
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 9e5a14158f..97891b2f8f 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -443,7 +443,7 @@ virResctrlOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virResctrl)
+VIR_ONCE_GLOBAL_INIT(virResctrl);
 
 
 /* Common functions */
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 32d249ad5c..715064d669 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -84,7 +84,7 @@ virSCSIOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virSCSI)
+VIR_ONCE_GLOBAL_INIT(virSCSI);
 
 static int
 virSCSIDeviceGetAdapterId(const char *adapter,
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index ce44079357..62b3e99cea 100644
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -73,7 +73,7 @@ virSCSIVHostOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(virSCSIVHost)
+VIR_ONCE_GLOBAL_INIT(virSCSIVHost);
 
 
 int
diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c
index 72cf3d1d16..9acaea2f81 100644
--- a/src/util/virstoragefilebackend.c
+++ b/src/util/virstoragefilebackend.c
@@ -83,7 +83,7 @@ static int virStorageFileBackendOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virStorageFileBackend)
+VIR_ONCE_GLOBAL_INIT(virStorageFileBackend);
 
 int
 virStorageFileBackendRegister(virStorageFileBackendPtr backend)
diff --git a/src/util/virthread.h b/src/util/virthread.h
index 6af4492d42..218d1fcd3f 100644
--- a/src/util/virthread.h
+++ b/src/util/virthread.h
@@ -181,7 +181,7 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
  *
  * Then invoking the macro:
  *
- *  VIR_ONCE_GLOBAL_INIT(virMyObject)
+ *  VIR_ONCE_GLOBAL_INIT(virMyObject);
  *
  * Will create a method
  *
@@ -211,6 +211,7 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
         } \
  \
         return 0; \
-    }
+    } \
+    struct classname ## EatSemicolon
 
 #endif /* LIBVIRT_VIRTHREAD_H */
diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c
index 8f87ae6039..2c6f45fd51 100644
--- a/src/util/virthreadjob.c
+++ b/src/util/virthreadjob.c
@@ -42,7 +42,7 @@ virThreadJobOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virThreadJob)
+VIR_ONCE_GLOBAL_INIT(virThreadJob);
 
 
 const char *
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 263712c323..3f74aa1283 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -79,7 +79,7 @@ static int virUSBOnceInit(void)
     return 0;
 }
 
-VIR_ONCE_GLOBAL_INIT(virUSB)
+VIR_ONCE_GLOBAL_INIT(virUSB);
 
 static int virUSBSysReadFile(const char *f_name, const char *d_name,
                              int base, unsigned int *value)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 8eaeb79f3c..b22a44d6ad 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -161,7 +161,7 @@ static int vzDriverOnceInit(void)
 
     return 0;
 }
-VIR_ONCE_GLOBAL_INIT(vzDriver)
+VIR_ONCE_GLOBAL_INIT(vzDriver);
 
 vzDriverPtr
 vzGetDriverConnection(void)
diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c
index 82c2286752..08062d66e3 100644
--- a/tests/virfilecachetest.c
+++ b/tests/virfilecachetest.c
@@ -57,7 +57,7 @@ testFileCacheObjOnceInit(void)
 }
 
 
-VIR_ONCE_GLOBAL_INIT(testFileCacheObj)
+VIR_ONCE_GLOBAL_INIT(testFileCacheObj);
 
 
 static testFileCacheObjPtr