diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl
index 48a2bd4e312e1e08f90531deb829929ae49eebc9..74b4c0246b953ee781f1630519f442a45efaf58f 100644
--- a/build-aux/header-ifdef.pl
+++ b/build-aux/header-ifdef.pl
@@ -70,6 +70,15 @@ while (<>) {
             &mistake("$file: missing '#endif /* $ifdef */'");
         }
 
+        $ifdef = uc $ARGV;
+        $ifdef =~ s,.*/,,;
+        $ifdef =~ s,[^A-Z0-9],_,g;
+        $ifdef =~ s,__+,_,g;
+        unless ($ifdef =~ /^LIBVIRT_/ && $ARGV !~ /libvirt_internal.h/) {
+            $ifdef = "LIBVIRT_" . $ifdef;
+        }
+        $ifdefpriv = $ifdef . "_ALLOW";
+
         $file = $ARGV;
         $state = $STATE_COPYRIGHT_COMMENT;
         $mistake = 0;
@@ -98,11 +107,10 @@ while (<>) {
     } elsif ($state == $STATE_PRIV_START) {
         if (/^$/) {
             &mistake("$file: too many blank lines after coyright header");
-        } elsif (/#ifndef\s(.*ALLOW.*)/) {
-            $ifdefpriv = $1;
+        } elsif (/#ifndef $ifdefpriv$/) {
             $state = $STATE_PRIV_ERROR;
         } else {
-            &mistake("$file: missing '#ifndef SYMBOL_ALLOW'");
+            &mistake("$file: missing '#ifndef $ifdefpriv'");
         }
     } elsif ($state == $STATE_PRIV_ERROR) {
         if (/# error ".*"$/) {
@@ -124,11 +132,10 @@ while (<>) {
     } elsif ($state == $STATE_GUARD_START) {
         if (/^$/) {
             &mistake("$file: too many blank lines after coyright header");
-        } elsif (/#ifndef\s(.*)$/) {
-            $ifdef = $1;
+        } elsif (/#ifndef $ifdef$/) {
             $state = $STATE_GUARD_DEFINE;
         } else {
-            &mistake("$file: missing '#ifndef SYMBOL'");
+            &mistake("$file: missing '#ifndef $ifdef'");
         }
     } elsif ($state == $STATE_GUARD_DEFINE) {
         if (/# define $ifdef$/) {
diff --git a/docs/apibuild.py b/docs/apibuild.py
index b1b5881943f34671470eb0eadd398d54f1cfd7a1..3ef5d0f554e8831a02f52f0a4751271a6d6e8f2f 100755
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -1003,6 +1003,8 @@ class CParser:
                 # skip hidden macros
                 if name in hidden_macros:
                     return token
+                if name[-2:] == "_H" or name[-8:] == "_H_ALLOW":
+                    return token
 
                 strValue = None
                 if len(lst) == 1 and lst[0][0] == '"' and lst[0][-1] == '"':
diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h
index 190bda75677222452c60664daeac63e802f012d8..abf279292617fd2834e63823e716b7802f68e2b1 100644
--- a/include/libvirt/libvirt-admin.h
+++ b/include/libvirt/libvirt-admin.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ADMIN_H__
-# define __VIR_ADMIN_H__
+#ifndef LIBVIRT_ADMIN_H
+# define LIBVIRT_ADMIN_H
 
 # ifdef __cplusplus
 extern "C" {
@@ -422,4 +422,4 @@ int virAdmConnectSetLoggingFilters(virAdmConnectPtr conn,
 }
 # endif
 
-#endif /* __VIR_ADMIN_H__ */
+#endif /* LIBVIRT_ADMIN_H */
diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h
index 139fe359860dc152755bd587de5c0cff1c2560e3..0c9985f7f432cdbc59edc3e6847e10d8133a3638 100644
--- a/include/libvirt/libvirt-domain-snapshot.h
+++ b/include/libvirt/libvirt-domain-snapshot.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__
-# define __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__
+#ifndef LIBVIRT_DOMAIN_SNAPSHOT_H
+# define LIBVIRT_DOMAIN_SNAPSHOT_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -210,4 +210,4 @@ int virDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
 int virDomainSnapshotRef(virDomainSnapshotPtr snapshot);
 int virDomainSnapshotFree(virDomainSnapshotPtr snapshot);
 
-#endif /* __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__ */
+#endif /* LIBVIRT_DOMAIN_SNAPSHOT_H */
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 9f56a40d9c7d188369301fd1615380128a65db97..6a7494198f0a076270bcd2bb85794a9b7c0607f2 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_DOMAIN_H__
-# define __VIR_LIBVIRT_DOMAIN_H__
+#ifndef LIBVIRT_DOMAIN_H
+# define LIBVIRT_DOMAIN_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -4839,4 +4839,4 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain,
                                    int *nparams,
                                    unsigned int flags);
 
-#endif /* __VIR_LIBVIRT_DOMAIN_H__ */
+#endif /* LIBVIRT_DOMAIN_H */
diff --git a/include/libvirt/libvirt-event.h b/include/libvirt/libvirt-event.h
index f818712cea43799af6e2a70b87536526c07a5674..734dbdcbc173e6fdbdb4811ece7d65c0d41800ed 100644
--- a/include/libvirt/libvirt-event.h
+++ b/include/libvirt/libvirt-event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_EVENT_H__
-# define __VIR_LIBVIRT_EVENT_H__
+#ifndef LIBVIRT_EVENT_H
+# define LIBVIRT_EVENT_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -186,4 +186,4 @@ void virEventUpdateTimeout(int timer, int frequency);
 int virEventRemoveTimeout(int timer);
 
 
-#endif /* __VIR_LIBVIRT_EVENT_H__ */
+#endif /* LIBVIRT_EVENT_H */
diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
index 5ce5d6ea2b85b83d3d7c72686a0aa32e829565c0..7debb5f8296b6dd3074dcb80dc01d6ded2c2825b 100644
--- a/include/libvirt/libvirt-host.h
+++ b/include/libvirt/libvirt-host.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_HOST_H__
-# define __VIR_LIBVIRT_HOST_H__
+#ifndef LIBVIRT_HOST_H
+# define LIBVIRT_HOST_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -743,4 +743,4 @@ int virNodeAllocPages(virConnectPtr conn,
                       unsigned int flags);
 
 
-#endif /* __VIR_LIBVIRT_HOST_H__ */
+#endif /* LIBVIRT_HOST_H */
diff --git a/include/libvirt/libvirt-interface.h b/include/libvirt/libvirt-interface.h
index 7dc7622085825ac61e4e1057cfd9c50047335c2b..7591c6c7fbe253ed4d0c89933f0123ddde665920 100644
--- a/include/libvirt/libvirt-interface.h
+++ b/include/libvirt/libvirt-interface.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_INTERFACE_H__
-# define __VIR_LIBVIRT_INTERFACE_H__
+#ifndef LIBVIRT_INTERFACE_H
+# define LIBVIRT_INTERFACE_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -106,4 +106,4 @@ int                     virInterfaceChangeRollback(virConnectPtr conn,
 int virInterfaceIsActive(virInterfacePtr iface);
 
 
-#endif /* __VIR_LIBVIRT_INTERFACE_H__ */
+#endif /* LIBVIRT_INTERFACE_H */
diff --git a/include/libvirt/libvirt-lxc.h b/include/libvirt/libvirt-lxc.h
index 64697d8f6c36740cf68d6e0d89fffb0848994cbf..898a4a81676f1352ffb0c7912a036a97b6fcbeef 100644
--- a/include/libvirt/libvirt-lxc.h
+++ b/include/libvirt/libvirt-lxc.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LXC_H__
-# define __VIR_LXC_H__
+#ifndef LIBVIRT_LXC_H
+# define LIBVIRT_LXC_H
 
 # include <libvirt/libvirt.h>
 
@@ -51,4 +51,4 @@ int virDomainLxcEnterCGroup(virDomainPtr domain,
 }
 # endif
 
-#endif /* __VIR_LXC_H__ */
+#endif /* LIBVIRT_LXC_H */
diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h
index 87d22359564642c85bdea064f78ee16cf0f06a41..5115251fbe8f21d0e476ca88ad69b0291d750926 100644
--- a/include/libvirt/libvirt-network.h
+++ b/include/libvirt/libvirt-network.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_NETWORK_H__
-# define __VIR_LIBVIRT_NETWORK_H__
+#ifndef LIBVIRT_NETWORK_H
+# define LIBVIRT_NETWORK_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -333,4 +333,4 @@ int virConnectNetworkEventRegisterAny(virConnectPtr conn,
 int virConnectNetworkEventDeregisterAny(virConnectPtr conn,
                                         int callbackID);
 
-#endif /* __VIR_LIBVIRT_NETWORK_H__ */
+#endif /* LIBVIRT_NETWORK_H */
diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h
index 9dc58b8ac2c2f1ef3a838bd99a4307ef005970f4..a2ad61ac6dc1b266922a63373fe21d58d5f2129a 100644
--- a/include/libvirt/libvirt-nodedev.h
+++ b/include/libvirt/libvirt-nodedev.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_NODEDEV_H__
-# define __VIR_LIBVIRT_NODEDEV_H__
+#ifndef LIBVIRT_NODEDEV_H
+# define LIBVIRT_NODEDEV_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -216,4 +216,4 @@ typedef void (*virConnectNodeDeviceEventLifecycleCallback)(virConnectPtr conn,
                                                            int detail,
                                                            void *opaque);
 
-#endif /* __VIR_LIBVIRT_NODEDEV_H__ */
+#endif /* LIBVIRT_NODEDEV_H */
diff --git a/include/libvirt/libvirt-nwfilter.h b/include/libvirt/libvirt-nwfilter.h
index 8501b847a79680416c2c83cb8b5a52ff76ec3979..44ca1b3fae3801279eee01b79b107d91b5902dc2 100644
--- a/include/libvirt/libvirt-nwfilter.h
+++ b/include/libvirt/libvirt-nwfilter.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_NWFILTER_H__
-# define __VIR_LIBVIRT_NWFILTER_H__
+#ifndef LIBVIRT_NWFILTER_H
+# define LIBVIRT_NWFILTER_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -130,4 +130,4 @@ int                     virNWFilterBindingDelete(virNWFilterBindingPtr binding);
 int                     virNWFilterBindingRef(virNWFilterBindingPtr binding);
 int                     virNWFilterBindingFree(virNWFilterBindingPtr binding);
 
-#endif /* __VIR_LIBVIRT_NWFILTER_H__ */
+#endif /* LIBVIRT_NWFILTER_H */
diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h
index a97df8dda9bc30d955779064ab8879b168e439f4..891617443f44c74f14dc12ee44aee985b816f38e 100644
--- a/include/libvirt/libvirt-qemu.h
+++ b/include/libvirt/libvirt-qemu.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_QEMU_H__
-# define __VIR_QEMU_H__
+#ifndef LIBVIRT_QEMU_H
+# define LIBVIRT_QEMU_H
 
 # include <libvirt/libvirt.h>
 
@@ -101,4 +101,4 @@ int virConnectDomainQemuMonitorEventDeregister(virConnectPtr conn,
 }
 # endif
 
-#endif /* __VIR_QEMU_H__ */
+#endif /* LIBVIRT_QEMU_H */
diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h
index e46162da286d0141823de21984188780b5baaa5b..9a1065f0f37f5e10e6fb03aae6042a0c69634aa0 100644
--- a/include/libvirt/libvirt-secret.h
+++ b/include/libvirt/libvirt-secret.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_SECRET_H__
-# define __VIR_LIBVIRT_SECRET_H__
+#ifndef LIBVIRT_SECRET_H
+# define LIBVIRT_SECRET_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -202,4 +202,4 @@ typedef void (*virConnectSecretEventLifecycleCallback)(virConnectPtr conn,
                                                        void *opaque);
 
 
-#endif /* __VIR_LIBVIRT_SECRET_H__ */
+#endif /* LIBVIRT_SECRET_H */
diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h
index 17906da890d106060ad08376a5971037ea77202c..4bf2b5f1dd8c74ca63076b0ce153f05fd667a888 100644
--- a/include/libvirt/libvirt-storage.h
+++ b/include/libvirt/libvirt-storage.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_STORAGE_H__
-# define __VIR_LIBVIRT_STORAGE_H__
+#ifndef LIBVIRT_STORAGE_H
+# define LIBVIRT_STORAGE_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -495,4 +495,4 @@ typedef void (*virConnectStoragePoolEventLifecycleCallback)(virConnectPtr conn,
                                                             int detail,
                                                             void *opaque);
 
-#endif /* __VIR_LIBVIRT_STORAGE_H__ */
+#endif /* LIBVIRT_STORAGE_H */
diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h
index 7d3a3d98e1fa2b1d0cb002e2371aeb26c51c5124..076f9ee8b826b31045e28be21a2e4620703a854a 100644
--- a/include/libvirt/libvirt-stream.h
+++ b/include/libvirt/libvirt-stream.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LIBVIRT_STREAM_H__
-# define __VIR_LIBVIRT_STREAM_H__
+#ifndef LIBVIRT_STREAM_H
+# define LIBVIRT_STREAM_H
 
 # ifndef __VIR_LIBVIRT_H_INCLUDES__
 #  error "Don't include this file directly, only use libvirt/libvirt.h"
@@ -266,4 +266,4 @@ int virStreamAbort(virStreamPtr st);
 
 int virStreamFree(virStreamPtr st);
 
-#endif /* __VIR_LIBVIRT_STREAM_H__ */
+#endif /* LIBVIRT_STREAM_H */
diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index d555ac798f874a183097dd90b36517a24fda5e5a..20e5d276a761bad061939bb292ea3b2b81a3609b 100644
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_VIRLIB_H__
-# define __VIR_VIRLIB_H__
+#ifndef LIBVIRT_H
+# define LIBVIRT_H
 
 # include <sys/types.h>
 
@@ -49,4 +49,4 @@ extern "C" {
 }
 # endif
 
-#endif /* __VIR_VIRLIB_H__ */
+#endif /* LIBVIRT_H */
diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index 095c6cb1e4b25c6b52218bc26731deb856b61865..44292c70212d07e4254fb1c951657e0d7696bfde 100644
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_VIRERR_H__
-# define __VIR_VIRERR_H__
+#ifndef LIBVIRT_VIRTERROR_H
+# define LIBVIRT_VIRTERROR_H
 
 # include <libvirt/libvirt.h>
 
@@ -364,4 +364,4 @@ int                     virConnCopyLastError    (virConnectPtr conn,
 }
 # endif
 
-#endif /* __VIR_VIRERR_H__ */
+#endif /* LIBVIRT_VIRTERROR_H */
diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h
index 3b25f36cabd81d6a9a9546e279894566e0b26b89..2cc3950f60b0e1980b3c0e0402ac61d8cca2e4e1 100644
--- a/src/access/viraccessdriver.h
+++ b/src/access/viraccessdriver.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_DRIVER_H__
-# define __VIR_ACCESS_DRIVER_H__
+#ifndef LIBVIRT_VIRACCESSDRIVER_H
+# define LIBVIRT_VIRACCESSDRIVER_H
 
 # include "conf/domain_conf.h"
 # include "access/viraccessmanager.h"
@@ -91,4 +91,4 @@ struct _virAccessDriver {
 };
 
 
-#endif /* __VIR_ACCESS_DRIVER_H__ */
+#endif /* LIBVIRT_VIRACCESSDRIVER_H */
diff --git a/src/access/viraccessdrivernop.h b/src/access/viraccessdrivernop.h
index 0b5d4134185a0f96934b0bac9937c0bcec2d4d54..d383c6f3efcefd16e2d6e55ae14c0d4ecd3b83fb 100644
--- a/src/access/viraccessdrivernop.h
+++ b/src/access/viraccessdrivernop.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_DRIVER_NOP_H__
-# define __VIR_ACCESS_DRIVER_NOP_H__
+#ifndef LIBVIRT_VIRACCESSDRIVERNOP_H
+# define LIBVIRT_VIRACCESSDRIVERNOP_H
 
 # include "access/viraccessdriver.h"
 
 extern virAccessDriver accessDriverNop;
 
-#endif /* __VIR_ACCESS_DRIVER_NOP_H__ */
+#endif /* LIBVIRT_VIRACCESSDRIVERNOP_H */
diff --git a/src/access/viraccessdriverpolkit.h b/src/access/viraccessdriverpolkit.h
index 00b044f458e55212c37ae72fb5edb1d24dab6f22..4c71889824f23e8e78bd81007d3027a6e694de4d 100644
--- a/src/access/viraccessdriverpolkit.h
+++ b/src/access/viraccessdriverpolkit.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_DRIVER_POLKIT_H__
-# define __VIR_ACCESS_DRIVER_POLKIT_H__
+#ifndef LIBVIRT_VIRACCESSDRIVERPOLKIT_H
+# define LIBVIRT_VIRACCESSDRIVERPOLKIT_H
 
 # include "viraccessdriver.h"
 
 extern virAccessDriver accessDriverPolkit;
 
-#endif /* __VIR_ACCESS_DRIVER_POLKIT_H__ */
+#endif /* LIBVIRT_VIRACCESSDRIVERPOLKIT_H */
diff --git a/src/access/viraccessdriverstack.h b/src/access/viraccessdriverstack.h
index 4e34d5faca95307e32f491238271330622536ed8..0984b21914dbe0b730c3d332fe83e03583afd848 100644
--- a/src/access/viraccessdriverstack.h
+++ b/src/access/viraccessdriverstack.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_DRIVER_STACK_H__
-# define __VIR_ACCESS_DRIVER_STACK_H__
+#ifndef LIBVIRT_VIRACCESSDRIVERSTACK_H
+# define LIBVIRT_VIRACCESSDRIVERSTACK_H
 
 # include "access/viraccessdriver.h"
 
@@ -29,4 +29,4 @@ int virAccessDriverStackAppend(virAccessManagerPtr manager,
 
 extern virAccessDriver accessDriverStack;
 
-#endif /* __VIR_ACCESS_DRIVER_STACK_H__ */
+#endif /* LIBVIRT_VIRACCESSDRIVERSTACK_H */
diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h
index 4fc86a1ff2c99b7ecba197f609cfb02fc6fedb9b..ab5ef8758513f88b5aec71d7453848535d1f512b 100644
--- a/src/access/viraccessmanager.h
+++ b/src/access/viraccessmanager.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_MANAGER_H__
-# define __VIR_ACCESS_MANAGER_H__
+#ifndef LIBVIRT_VIRACCESSMANAGER_H
+# define LIBVIRT_VIRACCESSMANAGER_H
 
 # include "viridentity.h"
 # include "conf/domain_conf.h"
@@ -93,4 +93,4 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager,
                                     virAccessPermStorageVol perm);
 
 
-#endif /* __VIR_ACCESS_MANAGER_H__ */
+#endif /* LIBVIRT_VIRACCESSMANAGER_H */
diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 10ce2dc13956e7eb2003b9b78474cfb867762297..ce3865b35926f44bbfe4698a4f5c619ddf1ad9ae 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ACCESS_PERM_H__
-# define __VIR_ACCESS_PERM_H__
+#ifndef LIBVIRT_VIRACCESSPERM_H
+# define LIBVIRT_VIRACCESSPERM_H
 
 # include "internal.h"
 # include "virutil.h"
@@ -699,4 +699,4 @@ VIR_ENUM_DECL(virAccessPermSecret);
 VIR_ENUM_DECL(virAccessPermStoragePool);
 VIR_ENUM_DECL(virAccessPermStorageVol);
 
-#endif /* __VIR_ACCESS_PERM_H__ */
+#endif /* LIBVIRT_VIRACCESSPERM_H */
diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h
index dc0f31e54b893f18cc00084c7383b10f4847dfc5..43f2b85fc19aef73981c281b7c94d33da2b1daad 100644
--- a/src/admin/admin_server.h
+++ b/src/admin/admin_server.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ADMIN_SERVER_H__
-# define __ADMIN_SERVER_H__
+#ifndef LIBVIRT_ADMIN_SERVER_H
+# define LIBVIRT_ADMIN_SERVER_H
 
 # include "rpc/virnetdaemon.h"
 # include "rpc/virnetserver.h"
@@ -69,4 +69,4 @@ int adminServerSetClientLimits(virNetServerPtr srv,
                                int nparams,
                                unsigned int flags);
 
-#endif /* __ADMIN_SERVER_H__ */
+#endif /* LIBVIRT_ADMIN_SERVER_H */
diff --git a/src/admin/admin_server_dispatch.h b/src/admin/admin_server_dispatch.h
index 322bba7dd8d7688c5a97b5ac3c3176381ff0aa8e..5316b89313a1050636b51e7c08bcb5d750057188 100644
--- a/src/admin/admin_server_dispatch.h
+++ b/src/admin/admin_server_dispatch.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ADMIN_SERVER_DISPATCH_H__
-# define __ADMIN_SERVER_DISPATCH_H__
+#ifndef LIBVIRT_ADMIN_SERVER_DISPATCH_H
+# define LIBVIRT_ADMIN_SERVER_DISPATCH_H
 
 # include "rpc/virnetserverprogram.h"
 # include "rpc/virnetserverclient.h"
@@ -37,4 +37,4 @@ void *remoteAdmClientNewPostExecRestart(virNetServerClientPtr client,
 virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client,
                                               void *data);
 
-#endif /* __ADMIN_SERVER_DISPATCH_H__ */
+#endif /* LIBVIRT_ADMIN_SERVER_DISPATCH_H */
diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h
index 9d3218127e953602e4426f5c6d1f0bcb5806aa7c..db4aff477592b15c808d58ccafec983ef2455607 100644
--- a/src/bhyve/bhyve_capabilities.h
+++ b/src/bhyve/bhyve_capabilities.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _BHYVE_CAPABILITIES
-# define _BHYVE_CAPABILITIES
+#ifndef LIBVIRT_BHYVE_CAPABILITIES_H
+# define LIBVIRT_BHYVE_CAPABILITIES_H
 
 # include "capabilities.h"
 # include "conf/domain_capabilities.h"
@@ -55,4 +55,4 @@ typedef enum {
 int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps);
 int virBhyveProbeCaps(unsigned int *caps);
 
-#endif /* _BHYVE_CAPABILITIES */
+#endif /* LIBVIRT_BHYVE_CAPABILITIES_H */
diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h
index 22a959dfb21db036d2727dcd46d3678befb773cf..ae0f770ac2f2a747071be37babb82a236492c487 100644
--- a/src/bhyve/bhyve_command.h
+++ b/src/bhyve/bhyve_command.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __BHYVE_COMMAND_H__
-# define __BHYVE_COMMAND_H__
+#ifndef LIBVIRT_BHYVE_COMMAND_H
+# define LIBVIRT_BHYVE_COMMAND_H
 
 # include "bhyve_domain.h"
 # include "bhyve_utils.h"
@@ -42,4 +42,4 @@ virCommandPtr
 virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def,
                             const char *devmap_file, char **devicesmap_out);
 
-#endif /* __BHYVE_COMMAND_H__ */
+#endif /* LIBVIRT_BHYVE_COMMAND_H */
diff --git a/src/bhyve/bhyve_conf.h b/src/bhyve/bhyve_conf.h
index 3f105ace1c416cab4a56ec69692368fa4112f7f2..8da39fde7ab8162933e1af8dfb11c5a1eace5cd1 100644
--- a/src/bhyve/bhyve_conf.h
+++ b/src/bhyve/bhyve_conf.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef BHYVE_CONF_H
-# define BHYVE_CONF_H
+#ifndef LIBVIRT_BHYVE_CONF_H
+# define LIBVIRT_BHYVE_CONF_H
 
 # include "bhyve_utils.h"
 
@@ -29,4 +29,4 @@ virBhyveDriverConfigPtr virBhyveDriverGetConfig(bhyveConnPtr driver);
 int virBhyveLoadDriverConfig(virBhyveDriverConfigPtr cfg,
                              const char *filename);
 
-#endif /* BHYVE_CONF_H */
+#endif /* LIBVIRT_BHYVE_CONF_H */
diff --git a/src/bhyve/bhyve_device.h b/src/bhyve/bhyve_device.h
index 48e7db438e3a19eb4511499828a106e9efcb2291..23b32e0e3e7d7058991c948c4363b76f4fcc9fce 100644
--- a/src/bhyve/bhyve_device.h
+++ b/src/bhyve/bhyve_device.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BHYVE_DEVICE_H__
-# define __BHYVE_DEVICE_H__
+#ifndef LIBVIRT_BHYVE_DEVICE_H
+# define LIBVIRT_BHYVE_DEVICE_H
 
 # include "domain_conf.h"
 # include "virpci.h"
@@ -33,4 +33,4 @@ virDomainPCIAddressSetPtr bhyveDomainPCIAddressSetCreate(virDomainDefPtr def,
 int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj)
     ATTRIBUTE_NONNULL(1);
 
-#endif /* __BHYVE_DEVICE_H__ */
+#endif /* LIBVIRT_BHYVE_DEVICE_H */
diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h
index 82b0b9b34639426569d54b08c99a21535a998041..f34e5fe9676a7a11ef20530821086a337ebab67d 100644
--- a/src/bhyve/bhyve_domain.h
+++ b/src/bhyve/bhyve_domain.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BHYVE_DOMAIN_H__
-# define __BHYVE_DOMAIN_H__
+#ifndef LIBVIRT_BHYVE_DOMAIN_H
+# define LIBVIRT_BHYVE_DOMAIN_H
 
 # include "domain_addr.h"
 # include "domain_conf.h"
@@ -40,4 +40,4 @@ virDomainXMLOptionPtr virBhyveDriverCreateXMLConf(bhyveConnPtr);
 extern virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks;
 extern virDomainDefParserConfig virBhyveDriverDomainDefParserConfig;
 
-#endif /* __BHYVE_DOMAIN_H__ */
+#endif /* LIBVIRT_BHYVE_DOMAIN_H */
diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h
index c9bcbb94187e83539d17fc22ca428ccea32996dd..36d1f8be853c75564e8422cba52097be88e5baf3 100644
--- a/src/bhyve/bhyve_driver.h
+++ b/src/bhyve/bhyve_driver.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BHYVE_DRIVER_H__
-# define __BHYVE_DRIVER_H__
+#ifndef LIBVIRT_BHYVE_DRIVER_H
+# define LIBVIRT_BHYVE_DRIVER_H
 
 # include "capabilities.h"
 # include "bhyve_utils.h"
@@ -32,4 +32,4 @@ unsigned bhyveDriverGetGrubCaps(virConnectPtr conn);
 
 virCapsPtr bhyveDriverGetCapabilities(bhyveConnPtr driver);
 
-#endif /* __BHYVE_DRIVER_H__ */
+#endif /* LIBVIRT_BHYVE_DRIVER_H */
diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h
index f376941bc67935b668e9dce708fa13bd28029c49..54c9e70040c2d0f2002b615296d38b15e869460e 100644
--- a/src/bhyve/bhyve_monitor.h
+++ b/src/bhyve/bhyve_monitor.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BHYVE_MONITOR_H
-# define BHYVE_MONITOR_H
+#ifndef LIBVIRT_BHYVE_MONITOR_H
+# define LIBVIRT_BHYVE_MONITOR_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -31,4 +31,4 @@ typedef bhyveMonitor *bhyveMonitorPtr;
 bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver);
 void bhyveMonitorClose(bhyveMonitorPtr mon);
 
-#endif /* BHYVE_MONITOR_H */
+#endif /* LIBVIRT_BHYVE_MONITOR_H */
diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h
index 236444e77728138a2af68c028d88a030e7b210d4..3609107711854dce9dcfca365fe26fd291e4d16d 100644
--- a/src/bhyve/bhyve_parse_command.h
+++ b/src/bhyve/bhyve_parse_command.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BHYVE_PARSE_COMMAND_H__
-# define __BHYVE_PARSE_COMMAND_H__
+#ifndef LIBVIRT_BHYVE_PARSE_COMMAND_H
+# define LIBVIRT_BHYVE_PARSE_COMMAND_H
 
 virDomainDefPtr bhyveParseCommandLineString(const char* nativeConfig,
                                             unsigned caps,
                                             virDomainXMLOptionPtr xmlopt);
 
-#endif /* __BHYVE_PARSE_COMMAND_H__ */
+#endif /* LIBVIRT_BHYVE_PARSE_COMMAND_H */
diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h
index ebabe17d87d2d0008352cdd5b56fb0e8134f4efc..f9ad5b6b5ae6dffde0dfebe2b1be68c842900600 100644
--- a/src/bhyve/bhyve_process.h
+++ b/src/bhyve/bhyve_process.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __BHYVE_PROCESS_H__
-# define __BHYVE_PROCESS_H__
+#ifndef LIBVIRT_BHYVE_PROCESS_H
+# define LIBVIRT_BHYVE_PROCESS_H
 
 # include "bhyve_utils.h"
 
@@ -45,4 +45,4 @@ typedef enum {
     VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0,
 } bhyveProcessStartFlags;
 
-#endif /* __BHYVE_PROCESS_H__ */
+#endif /* LIBVIRT_BHYVE_PROCESS_H */
diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h
index d6fb67689891d7452fbe6ec90fab3b8a355b546b..e915bedd8752745aef170c052031dd5649395e4f 100644
--- a/src/bhyve/bhyve_utils.h
+++ b/src/bhyve/bhyve_utils.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __BHYVE_UTILS_H__
-# define __BHYVE_UTILS_H__
+#ifndef LIBVIRT_BHYVE_UTILS_H
+# define LIBVIRT_BHYVE_UTILS_H
 
 # include "driver.h"
 # include "domain_event.h"
@@ -76,4 +76,4 @@ struct bhyveAutostartData {
 void bhyveDriverLock(bhyveConnPtr driver);
 void bhyveDriverUnlock(bhyveConnPtr driver);
 
-#endif /* __BHYVE_UTILS_H__ */
+#endif /* LIBVIRT_BHYVE_UTILS_H */
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index c861ad5536561dc3db9876d39509e176243dde01..31c2a07a9bdbabfe5a785e82697a999935185e50 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CAPABILITIES_H
-# define __VIR_CAPABILITIES_H
+#ifndef LIBVIRT_CAPABILITIES_H
+# define LIBVIRT_CAPABILITIES_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -355,4 +355,4 @@ int virCapabilitiesInitCaches(virCapsPtr caps);
 
 void virCapabilitiesHostInitIOMMU(virCapsPtr caps);
 
-#endif /* __VIR_CAPABILITIES_H */
+#endif /* LIBVIRT_CAPABILITIES_H */
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 7792a4b44997fb9836dd08bf1fbc819c41ef5313..0b2b63f5e48aacf1df823c18a34e18a033834162 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_CONF_H__
-# define __VIR_CPU_CONF_H__
+#ifndef LIBVIRT_CPU_CONF_H
+# define LIBVIRT_CPU_CONF_H
 
 # include "virutil.h"
 # include "virbuffer.h"
@@ -224,4 +224,4 @@ virCPUDefListParse(const char **xmlCPUs,
 void
 virCPUDefListFree(virCPUDefPtr *cpus);
 
-#endif /* __VIR_CPU_CONF_H__ */
+#endif /* LIBVIRT_CPU_CONF_H */
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 320c6b55a165b5f02b488d2f97db1521ff8a1cd1..56745707d9b645b3cfb3b4d99cb00f3bc3dcc66f 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DEVICE_CONF_H__
-# define __DEVICE_CONF_H__
+#ifndef LIBVIRT_DEVICE_CONF_H
+# define LIBVIRT_DEVICE_CONF_H
 
 # include <libxml/parser.h>
 # include <libxml/tree.h>
@@ -231,4 +231,4 @@ int virInterfaceLinkParseXML(xmlNodePtr node,
 int virInterfaceLinkFormat(virBufferPtr buf,
                            const virNetDevIfLink *lnk);
 
-#endif /* __DEVICE_CONF_H__ */
+#endif /* LIBVIRT_DEVICE_CONF_H */
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index a0c853b7af603dc6e4646bb01fc9cb4a5fbd3d74..803d07d4157f8bbe0b4e7b183de7b0aecc721885 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DOMAIN_ADDR_H__
-# define __DOMAIN_ADDR_H__
+#ifndef LIBVIRT_DOMAIN_ADDR_H
+# define LIBVIRT_DOMAIN_ADDR_H
 
 # include "domain_conf.h"
 
@@ -312,4 +312,4 @@ int
 virDomainUSBAddressRelease(virDomainUSBAddressSetPtr addrs,
                            virDomainDeviceInfoPtr info)
     ATTRIBUTE_NONNULL(2);
-#endif /* __DOMAIN_ADDR_H__ */
+#endif /* LIBVIRT_DOMAIN_ADDR_H */
diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h
index 17e43b8ceabc8e2631840bdee6ee67846e6fa735..ee8a4aa70e6ac82a55055c38149e20bc10fcb7b2 100644
--- a/src/conf/domain_audit.h
+++ b/src/conf/domain_audit.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DOMAIN_AUDIT_H__
-# define __VIR_DOMAIN_AUDIT_H__
+#ifndef LIBVIRT_DOMAIN_AUDIT_H
+# define LIBVIRT_DOMAIN_AUDIT_H
 
 # include "domain_conf.h"
 # include "vircgroup.h"
@@ -138,4 +138,4 @@ void virDomainAuditInput(virDomainObjPtr vm,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 
-#endif /* __VIR_DOMAIN_AUDIT_H__ */
+#endif /* LIBVIRT_DOMAIN_AUDIT_H */
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 16b96771244e67ff603138a949de82729613f1d1..15e065359b04127cf9870093df3d4f0574269afe 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DOMAIN_CAPABILITIES_H__
-# define __DOMAIN_CAPABILITIES_H__
+#ifndef LIBVIRT_DOMAIN_CAPABILITIES_H
+# define LIBVIRT_DOMAIN_CAPABILITIES_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -217,4 +217,4 @@ virSEVCapabilitiesFree(virSEVCapability *capabilities);
 
 VIR_DEFINE_AUTOPTR_FUNC(virSEVCapability, virSEVCapabilitiesFree);
 
-#endif /* __DOMAIN_CAPABILITIES_H__ */
+#endif /* LIBVIRT_DOMAIN_CAPABILITIES_H */
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 26b07d6804691e2827c9081da0c330f4fc708127..5814997bdbbe33266c79ac1c07fd14db6f7aed9e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DOMAIN_CONF_H
-# define __DOMAIN_CONF_H
+#ifndef LIBVIRT_DOMAIN_CONF_H
+# define LIBVIRT_DOMAIN_CONF_H
 
 # include <libxml/parser.h>
 # include <libxml/tree.h>
@@ -3678,4 +3678,4 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics);
 bool
 virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics);
 
-#endif /* __DOMAIN_CONF_H */
+#endif /* LIBVIRT_DOMAIN_CONF_H */
diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index c70117526a25e0c39a88cc884aa72952e67a54cd..637f1daf68e719336af73cc1652e55c1eaffd2d1 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DOMAIN_EVENT_H__
-# define __DOMAIN_EVENT_H__
+#ifndef LIBVIRT_DOMAIN_EVENT_H
+# define LIBVIRT_DOMAIN_EVENT_H
 
 # include "internal.h"
 # include "object_event.h"
@@ -324,4 +324,4 @@ virDomainQemuMonitorEventNew(int id,
                              const char *details)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 
-#endif /* __DOMAIN_EVENT_H__ */
+#endif /* LIBVIRT_DOMAIN_EVENT_H */
diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h
index 4ab9fbbfa79ff3895532748567bab0292d61e62a..9429ee649364fb2a57020a5f9948dee5a43e0b31 100644
--- a/src/conf/domain_nwfilter.h
+++ b/src/conf/domain_nwfilter.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DOMAIN_NWFILTER_H
-# define DOMAIN_NWFILTER_H
+#ifndef LIBVIRT_DOMAIN_NWFILTER_H
+# define LIBVIRT_DOMAIN_NWFILTER_H
 
 int virDomainConfNWFilterInstantiate(const char *vmname,
                                      const unsigned char *vmuuid,
@@ -29,4 +29,4 @@ int virDomainConfNWFilterInstantiate(const char *vmname,
 void virDomainConfNWFilterTeardown(virDomainNetDefPtr net);
 void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm);
 
-#endif /* DOMAIN_NWFILTER_H */
+#endif /* LIBVIRT_DOMAIN_NWFILTER_H */
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index af19f0d53bc49e6f56b3a7bfe2cf77256775f26a..24d0acd32378604c63861dac633b379c92818403 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -19,8 +19,8 @@
  *         Laine Stump <laine@redhat.com>
  */
 
-#ifndef __INTERFACE_CONF_H__
-# define __INTERFACE_CONF_H__
+#ifndef LIBVIRT_INTERFACE_CONF_H
+# define LIBVIRT_INTERFACE_CONF_H
 
 # include <libxml/parser.h>
 # include <libxml/tree.h>
@@ -179,4 +179,4 @@ virInterfaceDefFormat(const virInterfaceDef *def);
                 (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \
                  VIR_CONNECT_LIST_INTERFACES_INACTIVE)
 
-#endif /* __INTERFACE_CONF_H__ */
+#endif /* LIBVIRT_INTERFACE_CONF_H */
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 37049cc69a019fe3d1bb97f740435dd3ff7c4d47..cb1ffd29e02e33fb5775000ba753386abc3b5e55 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_BANDWIDTH_CONF_H__
-# define __VIR_NETDEV_BANDWIDTH_CONF_H__
+#ifndef LIBVIRT_NETDEV_BANDWIDTH_CONF_H
+# define LIBVIRT_NETDEV_BANDWIDTH_CONF_H
 
 # include "internal.h"
 # include "virnetdevbandwidth.h"
@@ -57,4 +57,4 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type)
     return false;
 }
 
-#endif /* __VIR_NETDEV_BANDWIDTH_CONF_H__ */
+#endif /* LIBVIRT_NETDEV_BANDWIDTH_CONF_H */
diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h
index 88667d47fa90ab13fd7967058ab201426b2cc7d2..e3a99790eb9a9fc13ddbb7ed091e8125cdc17348 100644
--- a/src/conf/netdev_vlan_conf.h
+++ b/src/conf/netdev_vlan_conf.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_VLAN_CONF_H__
-# define __VIR_NETDEV_VLAN_CONF_H__
+#ifndef LIBVIRT_NETDEV_VLAN_CONF_H
+# define LIBVIRT_NETDEV_VLAN_CONF_H
 
 # include "internal.h"
 # include "virnetdevvlan.h"
@@ -27,4 +27,4 @@
 int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);
 int virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf);
 
-#endif /* __VIR_NETDEV_VLAN_CONF_H__ */
+#endif /* LIBVIRT_NETDEV_VLAN_CONF_H */
diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index 29f627367f1b18bf4cfbab82aec0eb7471fc377b..9044217fb005bbb535af0129302a6348f3f6b5a7 100644
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_VPORT_PROFILE_CONF_H__
-# define __VIR_NETDEV_VPORT_PROFILE_CONF_H__
+#ifndef LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H
+# define LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H
 
 # include "internal.h"
 # include "virnetdevvportprofile.h"
@@ -45,4 +45,4 @@ virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort,
                             virBufferPtr buf);
 
 
-#endif /* __VIR_NETDEV_VPORT_PROFILE_CONF_H__ */
+#endif /* LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H */
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 6ae39dbeaf703fd36cd2d7087f7a502ca1a443c9..c6306743008c884e4db58d957bd7a55f8c505528 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NETWORK_CONF_H__
-# define __NETWORK_CONF_H__
+#ifndef LIBVIRT_NETWORK_CONF_H
+# define LIBVIRT_NETWORK_CONF_H
 
 # define DNS_RECORD_LENGTH_SRV  (512 - 30)  /* Limit minus overhead as mentioned in RFC-2782 */
 
@@ -383,4 +383,4 @@ virNetworkDefUpdateSection(virNetworkDefPtr def,
                            unsigned int flags);  /* virNetworkUpdateFlags */
 
 VIR_ENUM_DECL(virNetworkTaint)
-#endif /* __NETWORK_CONF_H__ */
+#endif /* LIBVIRT_NETWORK_CONF_H */
diff --git a/src/conf/network_event.h b/src/conf/network_event.h
index fb43a273591d805de52151a9e2df84e0aacd7928..d3d17dd16831bf6670474e7451782ac74aae7faa 100644
--- a/src/conf/network_event.h
+++ b/src/conf/network_event.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NETWORK_EVENT_H__
-# define __NETWORK_EVENT_H__
+#ifndef LIBVIRT_NETWORK_EVENT_H
+# define LIBVIRT_NETWORK_EVENT_H
 
 # include "internal.h"
 # include "object_event.h"
@@ -56,4 +56,4 @@ virNetworkEventLifecycleNew(const char *name,
                             int type,
                             int detail);
 
-#endif /* __NETWORK_EVENT_H__ */
+#endif /* LIBVIRT_NETWORK_EVENT_H */
diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h
index 636a647e94d87eab94c684ebd9876fb99770d6a2..b6c37a5a28c9019411fe7072b147af27102e1257 100644
--- a/src/conf/networkcommon_conf.h
+++ b/src/conf/networkcommon_conf.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NETWORKCOMMON_CONF_H__
-# define __NETWORKCOMMON_CONF_H__
+#ifndef LIBVIRT_NETWORKCOMMON_CONF_H
+# define LIBVIRT_NETWORKCOMMON_CONF_H
 
 # include <libxml/tree.h>
 # include <libxml/xpath.h>
@@ -50,4 +50,4 @@ int
 virNetDevIPRouteFormat(virBufferPtr buf,
                        const virNetDevIPRoute *def);
 
-#endif /* __NETWORKCOMMON_CONF_H__ */
+#endif /* LIBVIRT_NETWORKCOMMON_CONF_H */
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 24355f86ab0b3f2f70e41cc47a3df6159709ecc5..6412ac647237b65b05e2a1b10d3eb6a0df72bc1c 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NODE_DEVICE_CONF_H__
-# define __VIR_NODE_DEVICE_CONF_H__
+#ifndef LIBVIRT_NODE_DEVICE_CONF_H
+# define LIBVIRT_NODE_DEVICE_CONF_H
 
 # include "internal.h"
 # include "virbitmap.h"
@@ -383,4 +383,4 @@ int
 virNodeDeviceCapsListExport(virNodeDeviceDefPtr def,
                             virNodeDevCapType **list);
 
-#endif /* __VIR_NODE_DEVICE_CONF_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_CONF_H */
diff --git a/src/conf/node_device_event.h b/src/conf/node_device_event.h
index 6c4fc50ef8e97ec00f7d14b2817398f3182543c7..b30177a9017887c229548efc24aaeeceb249aa72 100644
--- a/src/conf/node_device_event.h
+++ b/src/conf/node_device_event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NODE_DEVICE_EVENT_H__
-# define __NODE_DEVICE_EVENT_H__
+#ifndef LIBVIRT_NODE_DEVICE_EVENT_H
+# define LIBVIRT_NODE_DEVICE_EVENT_H
 
 # include "internal.h"
 # include "object_event.h"
@@ -59,4 +59,4 @@ virNodeDeviceEventLifecycleNew(const char *name,
 virObjectEventPtr
 virNodeDeviceEventUpdateNew(const char *name);
 
-#endif /* __NODE_DEVICE_EVENT_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_EVENT_H */
diff --git a/src/conf/node_device_util.h b/src/conf/node_device_util.h
index 5cb225d03e2ac2d4b9800a70b3bd1d7ccb847f37..e040bf62a9cba91f5c0ab4eb2ff6fa7d53743c66 100644
--- a/src/conf/node_device_util.h
+++ b/src/conf/node_device_util.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NODE_DEVICE_UTIL_H__
-# define __VIR_NODE_DEVICE_UTIL_H__
+#ifndef LIBVIRT_NODE_DEVICE_UTIL_H
+# define LIBVIRT_NODE_DEVICE_UTIL_H
 
 # include "conf/storage_adapter_conf.h"
 
@@ -32,4 +32,4 @@ int
 virNodeDeviceDeleteVport(virConnectPtr conn,
                          virStorageAdapterFCHostPtr fchost);
 
-#endif /* __VIR_NODE_DEVICE_UTIL_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_UTIL_H */
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index 0b8d38834785b7e21f93b279354f47f8f5d7931c..5bb149bc12d89c65046ec770b033da6df781b27f 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NUMA_CONF_H__
-# define __NUMA_CONF_H__
+#ifndef LIBVIRT_NUMA_CONF_H
+# define LIBVIRT_NUMA_CONF_H
 
 # include <libxml/xpath.h>
 
@@ -186,4 +186,4 @@ int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
 unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
 
 
-#endif /* __NUMA_CONF_H__ */
+#endif /* LIBVIRT_NUMA_CONF_H */
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index da70f0d80bc2df1ad9163ba71ab235cfaf90d091..de4c3b1d40ee84af23576ac53546f3d12e160932 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -22,8 +22,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NWFILTER_CONF_H
-# define NWFILTER_CONF_H
+#ifndef LIBVIRT_NWFILTER_CONF_H
+# define LIBVIRT_NWFILTER_CONF_H
 
 # include "internal.h"
 
@@ -615,4 +615,4 @@ VIR_ENUM_DECL(virNWFilterChainPolicy);
 VIR_ENUM_DECL(virNWFilterEbtablesTable);
 VIR_ENUM_DECL(virNWFilterChainSuffix);
 
-#endif /* NWFILTER_CONF_H */
+#endif /* LIBVIRT_NWFILTER_CONF_H */
diff --git a/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h
index 272440966b5482709e7d317192804c87f8582e69..13e763ae7edc2c7d97c518c8682790314af4636e 100644
--- a/src/conf/nwfilter_ipaddrmap.h
+++ b/src/conf/nwfilter_ipaddrmap.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_NWFILTER_IPADDRMAP_H
-# define __VIR_NWFILTER_IPADDRMAP_H
+#ifndef LIBVIRT_NWFILTER_IPADDRMAP_H
+# define LIBVIRT_NWFILTER_IPADDRMAP_H
 
 int virNWFilterIPAddrMapInit(void);
 void virNWFilterIPAddrMapShutdown(void);
@@ -31,4 +31,4 @@ int virNWFilterIPAddrMapDelIPAddr(const char *ifname,
                                   const char *ipaddr);
 virNWFilterVarValuePtr virNWFilterIPAddrMapGetIPAddr(const char *ifname);
 
-#endif /* __VIR_NWFILTER_IPADDRMAP_H */
+#endif /* LIBVIRT_NWFILTER_IPADDRMAP_H */
diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h
index 762e94ed0fc845f218644721269f826fb9f81555..9abeeba43a63ad0827aaadf99ec12c7346ea774b 100644
--- a/src/conf/nwfilter_params.h
+++ b/src/conf/nwfilter_params.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NWFILTER_PARAMS_H
-# define NWFILTER_PARAMS_H
+#ifndef LIBVIRT_NWFILTER_PARAMS_H
+# define LIBVIRT_NWFILTER_PARAMS_H
 
 # include "virhash.h"
 # include "virbuffer.h"
@@ -152,4 +152,4 @@ const char *virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci,
                                               const virNWFilterVarAccess *);
 
 
-#endif /* NWFILTER_PARAMS_H */
+#endif /* LIBVIRT_NWFILTER_PARAMS_H */
diff --git a/src/conf/object_event.h b/src/conf/object_event.h
index ebded5ab7a278b476d9a61c12b0e72ce518dc2d4..bbeaa3aae73034c7696d051f088905ebac3b02ab 100644
--- a/src/conf/object_event.h
+++ b/src/conf/object_event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __OBJECT_EVENT_H__
-# define __OBJECT_EVENT_H__
+#ifndef LIBVIRT_OBJECT_EVENT_H
+# define LIBVIRT_OBJECT_EVENT_H
 
 # include "internal.h"
 
@@ -89,4 +89,4 @@ virObjectEventStateSetRemote(virConnectPtr conn,
                              int remoteID)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-#endif /* __OBJECT_EVENT_H__ */
+#endif /* LIBVIRT_OBJECT_EVENT_H */
diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h
index 6f152906708c3720f71f18ff9d3bd4773da561d2..5000b99504deba66617afd0cb805e532f3e03567 100644
--- a/src/conf/object_event_private.h
+++ b/src/conf/object_event_private.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __OBJECT_EVENT_PRIVATE_H__
-# define __OBJECT_EVENT_PRIVATE_H__
+#ifndef LIBVIRT_OBJECT_EVENT_PRIVATE_H
+# define LIBVIRT_OBJECT_EVENT_PRIVATE_H
 
 # include "datatypes.h"
 
@@ -106,4 +106,4 @@ virObjectEventNew(virClassPtr klass,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5)
     ATTRIBUTE_NONNULL(7);
 
-#endif /* __OBJECT_EVENT_PRIVATE_H__ */
+#endif /* LIBVIRT_OBJECT_EVENT_PRIVATE_H */
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index d871ad7e9348c52b400a834986840aebc1c33d1e..1a48f12dd90e51372c68f1ac5fc287291c75b9a2 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SECRET_CONF_H__
-# define __VIR_SECRET_CONF_H__
+#ifndef LIBVIRT_SECRET_CONF_H
+# define LIBVIRT_SECRET_CONF_H
 
 # include "internal.h"
 # include "virutil.h"
@@ -52,4 +52,4 @@ char *virSecretDefFormat(const virSecretDef *def);
                 (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL  | \
                  VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE)
 
-#endif /* __VIR_SECRET_CONF_H__ */
+#endif /* LIBVIRT_SECRET_CONF_H */
diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h
index 3aa651c533a6782db7736d9b8b6adc0f665ad152..83a432d5a664d78863f1147a5b73ec9b90ed8475 100644
--- a/src/conf/secret_event.h
+++ b/src/conf/secret_event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SECRET_EVENT_H__
-# define __SECRET_EVENT_H__
+#ifndef LIBVIRT_SECRET_EVENT_H
+# define LIBVIRT_SECRET_EVENT_H
 
 # include "internal.h"
 # include "object_event.h"
@@ -62,4 +62,4 @@ virSecretEventValueChangedNew(const unsigned char *uuid,
                               int usage_type,
                               const char *usage_id);
 
-#endif /* __SECRET_EVENT_H__ */
+#endif /* LIBVIRT_SECRET_EVENT_H */
diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index 531bf0b7598eb9c6c1b11398cf88bf17a69692e7..5ac1ba74a292307de7e27cfcd767f9bbfb0a8e86 100644
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SNAPSHOT_CONF_H
-# define __SNAPSHOT_CONF_H
+#ifndef LIBVIRT_SNAPSHOT_CONF_H
+# define LIBVIRT_SNAPSHOT_CONF_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -189,4 +189,4 @@ int virDomainSnapshotRedefinePrep(virDomainPtr domain,
 VIR_ENUM_DECL(virDomainSnapshotLocation)
 VIR_ENUM_DECL(virDomainSnapshotState)
 
-#endif /* __SNAPSHOT_CONF_H */
+#endif /* LIBVIRT_SNAPSHOT_CONF_H */
diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_conf.h
index 8ef2236c85fa794939aa864451fcf2f07652ccdf..139674e8b40b7e2d036cf395395f9f0533c3b066 100644
--- a/src/conf/storage_adapter_conf.h
+++ b/src/conf/storage_adapter_conf.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_ADAPTER_CONF_H__
-# define __VIR_STORAGE_ADAPTER_CONF_H__
+#ifndef LIBVIRT_STORAGE_ADAPTER_CONF_H
+# define LIBVIRT_STORAGE_ADAPTER_CONF_H
 
 # include "virpci.h"
 # include "virxml.h"
@@ -81,4 +81,4 @@ void
 virStorageAdapterFormat(virBufferPtr buf,
                         virStorageAdapterPtr adapter);
 
-#endif /* __VIR_STORAGE_ADAPTER_CONF_H__ */
+#endif /* LIBVIRT_STORAGE_ADAPTER_CONF_H */
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 37cb3096fadf58a9d656c52548e812d1a6876e4d..dc0aa2ab2919a8adedb640c2068f9d37d5d97649 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_CONF_H__
-# define __VIR_STORAGE_CONF_H__
+#ifndef LIBVIRT_STORAGE_CONF_H
+# define LIBVIRT_STORAGE_CONF_H
 
 # include "internal.h"
 # include "virstorageencryption.h"
@@ -433,4 +433,4 @@ VIR_ENUM_DECL(virStoragePartedFs)
                  VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART  | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE)
 
-#endif /* __VIR_STORAGE_CONF_H__ */
+#endif /* LIBVIRT_STORAGE_CONF_H */
diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h
index 936023584d3eaa789721c94a5bdcf0820d2cdba5..fd6c10969c3cc7b641fe825e1405b8961e2ce190 100644
--- a/src/conf/storage_event.h
+++ b/src/conf/storage_event.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __STORAGE_EVENT_H__
-# define __STORAGE_EVENT_H__
+#ifndef LIBVIRT_STORAGE_EVENT_H
+# define LIBVIRT_STORAGE_EVENT_H
 
 # include "internal.h"
 # include "object_event.h"
@@ -61,4 +61,4 @@ virObjectEventPtr
 virStoragePoolEventRefreshNew(const char *name,
                               const unsigned char *uuid);
 
-#endif /* __STORAGE_EVENT_H__ */
+#endif /* LIBVIRT_STORAGE_EVENT_H */
diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h
index b9dac9b31d985d0abf524b0bfd0cf69f9192c276..42306ff93302891796639f7c4fbbfd015483e145 100644
--- a/src/conf/virchrdev.h
+++ b/src/conf/virchrdev.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CHRDEV_H__
-# define __VIR_CHRDEV_H__
+#ifndef LIBVIRT_VIRCHRDEV_H
+# define LIBVIRT_VIRCHRDEV_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -34,4 +34,4 @@ void virChrdevFree(virChrdevsPtr devs);
 int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source,
                   virStreamPtr st, bool force);
 
-#endif /* __VIR_CHRDEV_H__ */
+#endif /* LIBVIRT_VIRCHRDEV_H */
diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h
index 6e09133b32784e318e143607128817af28caa290..c1ffee76ad7c651afcb654f8f0528204a1f5db91 100644
--- a/src/conf/virdomainobjlist.h
+++ b/src/conf/virdomainobjlist.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRDOMAINOBJLIST_H__
-# define __VIRDOMAINOBJLIST_H__
+#ifndef LIBVIRT_VIRDOMAINOBJLIST_H
+# define LIBVIRT_VIRDOMAINOBJLIST_H
 
 # include "domain_conf.h"
 
@@ -150,4 +150,4 @@ int virDomainObjListConvert(virDomainObjListPtr domlist,
                             unsigned int flags,
                             bool skip_missing);
 
-#endif /* __VIRDOMAINOBJLIST_H__ */
+#endif /* LIBVIRT_VIRDOMAINOBJLIST_H */
diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h
index 33d2dda05d737587d4073750b15c4ff8b011c692..6ad331af4fc7ac4aa6daa1f3a7d51b8f4136a764 100644
--- a/src/conf/virinterfaceobj.h
+++ b/src/conf/virinterfaceobj.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRINTERFACEOBJ_H__
-# define __VIRINTERFACEOBJ_H__
+#ifndef LIBVIRT_VIRINTERFACEOBJ_H
+# define LIBVIRT_VIRINTERFACEOBJ_H
 
 # include "internal.h"
 
@@ -89,4 +89,4 @@ virInterfaceObjListExport(virConnectPtr conn,
                           virInterfaceObjListFilter filter,
                           unsigned int flags);
 
-#endif /* __VIRINTERFACEOBJ_H__ */
+#endif /* LIBVIRT_VIRINTERFACEOBJ_H */
diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h
index 627277b5521a20fc8b72c22d71dbdd7df310a782..9c8f141cd9ce6c3306997e2e565ca161536138d7 100644
--- a/src/conf/virnetworkobj.h
+++ b/src/conf/virnetworkobj.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRNETWORKOBJ_H__
-# define __VIRNETWORKOBJ_H__
+#ifndef LIBVIRT_VIRNETWORKOBJ_H
+# define LIBVIRT_VIRNETWORKOBJ_H
 
 # include "internal.h"
 
@@ -221,4 +221,4 @@ void
 virNetworkObjListPrune(virNetworkObjListPtr nets,
                        unsigned int flags);
 
-#endif /* __VIRNETWORKOBJ_H__ */
+#endif /* LIBVIRT_VIRNETWORKOBJ_H */
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index ffbe4e32e58c8d9e883d92dcd36fbe07bb6f127c..a560852c27a58a83e869fa9cbb030f1fa6697f68 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRNODEDEVICEOBJ_H__
-# define __VIRNODEDEVICEOBJ_H__
+#ifndef LIBVIRT_VIRNODEDEVICEOBJ_H
+# define LIBVIRT_VIRNODEDEVICEOBJ_H
 
 # include "internal.h"
 # include "virthread.h"
@@ -113,4 +113,4 @@ void
 virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj,
                                   bool skipUpdateCaps);
 
-#endif /* __VIRNODEDEVICEOBJ_H__ */
+#endif /* LIBVIRT_VIRNODEDEVICEOBJ_H */
diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbindingdef.h
index 8a78278beed0dcd2dcbeef79b781e5ba09c70ee6..7cd2890b15741bbf76bb16bc09d7f363ce4ccc4a 100644
--- a/src/conf/virnwfilterbindingdef.h
+++ b/src/conf/virnwfilterbindingdef.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef VIR_NWFILTER_BINDING_DEF_H
-# define VIR_NWFILTER_BINDING_DEF_H
+#ifndef LIBVIRT_VIRNWFILTERBINDINGDEF_H
+# define LIBVIRT_VIRNWFILTERBINDINGDEF_H
 
 # include "internal.h"
 # include "virmacaddr.h"
@@ -63,4 +63,4 @@ int
 virNWFilterBindingDefFormatBuf(virBufferPtr buf,
                                const virNWFilterBindingDef *def);
 
-#endif /* VIR_NWFILTER_BINDING_DEF_H */
+#endif /* LIBVIRT_VIRNWFILTERBINDINGDEF_H */
diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbindingobj.h
index 2455a44dd8d7b5d7fc3785a0d0a008a45024a397..8e5fbee35f7d0a2ecf53d2c4da374a98b744eea2 100644
--- a/src/conf/virnwfilterbindingobj.h
+++ b/src/conf/virnwfilterbindingobj.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef VIR_NWFILTER_BINDING_OBJ_H
-# define VIR_NWFILTER_BINDING_OBJ_H
+#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJ_H
+# define LIBVIRT_VIRNWFILTERBINDINGOBJ_H
 
 # include "internal.h"
 # include "virnwfilterbindingdef.h"
@@ -67,4 +67,4 @@ virNWFilterBindingObjParseFile(const char *filename);
 char *
 virNWFilterBindingObjFormat(const virNWFilterBindingObj *obj);
 
-#endif /* VIR_NWFILTER_BINDING_OBJ_H */
+#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJ_H */
diff --git a/src/conf/virnwfilterbindingobjlist.h b/src/conf/virnwfilterbindingobjlist.h
index 7cdae901f25cb332105074872a07c7871c0bd9d6..b0fb90f667b55bc2c9390c5d7f61c30761844b46 100644
--- a/src/conf/virnwfilterbindingobjlist.h
+++ b/src/conf/virnwfilterbindingobjlist.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NWFILTER_BINDING_OBJ_LIST_H__
-# define __VIR_NWFILTER_BINDING_OBJ_LIST_H__
+#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H
+# define LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H
 
 # include "virnwfilterbindingobj.h"
 
@@ -64,4 +64,4 @@ virNWFilterBindingObjListExport(virNWFilterBindingObjListPtr bindings,
                                 virNWFilterBindingObjListACLFilter filter);
 
 
-#endif /* __VIR_NWFILTER_BINDING_OBJ_LIST_H__ */
+#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H */
diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h
index b047a7c88d94ef15a05bfddea9bab68017d0a6b9..2369c20313278e988af30372ed2ae343c393bbca 100644
--- a/src/conf/virnwfilterobj.h
+++ b/src/conf/virnwfilterobj.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIRNWFILTEROBJ_H
-# define VIRNWFILTEROBJ_H
+#ifndef LIBVIRT_VIRNWFILTEROBJ_H
+# define LIBVIRT_VIRNWFILTEROBJ_H
 
 # include "internal.h"
 
@@ -115,4 +115,4 @@ virNWFilterObjLock(virNWFilterObjPtr obj);
 void
 virNWFilterObjUnlock(virNWFilterObjPtr obj);
 
-#endif /* VIRNWFILTEROBJ_H */
+#endif /* LIBVIRT_VIRNWFILTEROBJ_H */
diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h
index c225c8d0bcf600f071056bd39308fda0fd2e2b08..a5e41e7acbcfbfee2d5b8b62120bd3414c1bf3c3 100644
--- a/src/conf/virsavecookie.h
+++ b/src/conf/virsavecookie.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SAVE_COOKIE_H__
-# define __VIR_SAVE_COOKIE_H__
+#ifndef LIBVIRT_VIRSAVECOOKIE_H
+# define LIBVIRT_VIRSAVECOOKIE_H
 
 # include <libxml/xpath.h>
 
@@ -60,4 +60,4 @@ char *
 virSaveCookieFormat(virObjectPtr obj,
                     virSaveCookieCallbacksPtr saveCookie);
 
-#endif /* __VIR_SAVE_COOKIE_H__ */
+#endif /* LIBVIRT_VIRSAVECOOKIE_H */
diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h
index d412ee6a763de8e566677f907f449f706b31ebea..1563fa8ca727759666b50862340280497690d5e0 100644
--- a/src/conf/virsecretobj.h
+++ b/src/conf/virsecretobj.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRSECRETOBJ_H__
-# define __VIRSECRETOBJ_H__
+#ifndef LIBVIRT_VIRSECRETOBJ_H
+# define LIBVIRT_VIRSECRETOBJ_H
 
 # include "internal.h"
 
@@ -118,4 +118,4 @@ int
 virSecretLoadAllConfigs(virSecretObjListPtr secrets,
                         const char *configDir);
 
-#endif /* __VIRSECRETOBJ_H__ */
+#endif /* LIBVIRT_VIRSECRETOBJ_H */
diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index abd6166d888c25660dc65db3591c1a0d8716840f..1106aa71bdcc8e80d1a6fa059dccf679aeb408a4 100644
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIRSTORAGEOBJ_H__
-# define __VIRSTORAGEOBJ_H__
+#ifndef LIBVIRT_VIRSTORAGEOBJ_H
+# define LIBVIRT_VIRSTORAGEOBJ_H
 
 # include "internal.h"
 
@@ -252,4 +252,4 @@ virStoragePoolObjListExport(virConnectPtr conn,
                             virStoragePoolObjListFilter filter,
                             unsigned int flags);
 
-#endif /* __VIRSTORAGEOBJ_H__ */
+#endif /* LIBVIRT_VIRSTORAGEOBJ_H */
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 592586d913ff98ffe395f89f3ff41df481dd901c..3446627e1895727e9f647ed8d9791875251f004f 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_H__
-# define __VIR_CPU_H__
+#ifndef LIBVIRT_CPU_H
+# define LIBVIRT_CPU_H
 
 # include "virerror.h"
 # include "datatypes.h"
@@ -265,4 +265,4 @@ char *virCPUDataFormat(const virCPUData *data)
 virCPUDataPtr virCPUDataParse(const char *xmlStr)
     ATTRIBUTE_NONNULL(1);
 
-#endif /* __VIR_CPU_H__ */
+#endif /* LIBVIRT_CPU_H */
diff --git a/src/cpu/cpu_arm.h b/src/cpu/cpu_arm.h
index c77d102847adb77fa1d2db6d321609a09c557895..c1a8939a61119325e4856c0675a5c43cc72d894c 100644
--- a/src/cpu/cpu_arm.h
+++ b/src/cpu/cpu_arm.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_ARM_H__
-# define __VIR_CPU_ARM_H__
+#ifndef LIBVIRT_CPU_ARM_H
+# define LIBVIRT_CPU_ARM_H
 
 # include "cpu.h"
 
 extern struct cpuArchDriver cpuDriverArm;
 
-#endif /* __VIR_CPU_ARM_H__ */
+#endif /* LIBVIRT_CPU_ARM_H */
diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
index 130738b1ab14f71ec0c64cac31677b775f5dd4fd..a7a7509b7e30bfd46f35ffb27baca49d13fbd1df 100644
--- a/src/cpu/cpu_map.h
+++ b/src/cpu/cpu_map.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_MAP_H__
-# define __VIR_CPU_MAP_H__
+#ifndef LIBVIRT_CPU_MAP_H
+# define LIBVIRT_CPU_MAP_H
 
 # include "virxml.h"
 
@@ -35,4 +35,4 @@ cpuMapLoad(const char *arch,
            cpuMapLoadCallback modelCB,
            void *data);
 
-#endif /* __VIR_CPU_MAP_H__ */
+#endif /* LIBVIRT_CPU_MAP_H */
diff --git a/src/cpu/cpu_ppc64.h b/src/cpu/cpu_ppc64.h
index 752f603cf605f2e84dc1e019fbfc733192b6f3d6..18b8376bb76c5314d881953618ede086d78d1abb 100644
--- a/src/cpu/cpu_ppc64.h
+++ b/src/cpu/cpu_ppc64.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_PPC64_H__
-# define __VIR_CPU_PPC64_H__
+#ifndef LIBVIRT_CPU_PPC64_H
+# define LIBVIRT_CPU_PPC64_H
 
 # include "cpu.h"
 
 extern struct cpuArchDriver cpuDriverPPC64;
 
-#endif /* __VIR_CPU_PPC64_H__ */
+#endif /* LIBVIRT_CPU_PPC64_H */
diff --git a/src/cpu/cpu_ppc64_data.h b/src/cpu/cpu_ppc64_data.h
index ef89a3610b082e062418bb6c703b101a79f0aa73..2018cbbb6f08ae43d4824e2c9517722b5e9170ea 100644
--- a/src/cpu/cpu_ppc64_data.h
+++ b/src/cpu/cpu_ppc64_data.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_PPC64_DATA_H__
-# define __VIR_CPU_PPC64_DATA_H__
+#ifndef LIBVIRT_CPU_PPC64_DATA_H
+# define LIBVIRT_CPU_PPC64_DATA_H
 
 
 typedef struct _virCPUppc64PVR virCPUppc64PVR;
@@ -36,4 +36,4 @@ struct _virCPUppc64Data {
     virCPUppc64PVR *pvr;
 };
 
-#endif /* __VIR_CPU_PPC64_DATA_H__ */
+#endif /* LIBVIRT_CPU_PPC64_DATA_H */
diff --git a/src/cpu/cpu_s390.h b/src/cpu/cpu_s390.h
index 8a6ad9692c390c67fadb73100bc0d74fc838a56b..4c45e1b32c27a77370e579932e55f66aec4941d9 100644
--- a/src/cpu/cpu_s390.h
+++ b/src/cpu/cpu_s390.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_S390X_H__
-# define __VIR_CPU_S390X_H__
+#ifndef LIBVIRT_CPU_S390_H
+# define LIBVIRT_CPU_S390_H
 
 # include "cpu.h"
 
 extern struct cpuArchDriver cpuDriverS390;
 
-#endif /* __VIR_CPU_S390X_H__ */
+#endif /* LIBVIRT_CPU_S390_H */
diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
index b6ad687f85c775e2372be60dcbdf0e258043b363..dedf8dedfe7452434d278570a4f988c2ca516b03 100644
--- a/src/cpu/cpu_x86.h
+++ b/src/cpu/cpu_x86.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_X86_H__
-# define __VIR_CPU_X86_H__
+#ifndef LIBVIRT_CPU_X86_H
+# define LIBVIRT_CPU_X86_H
 
 # include "cpu.h"
 # include "cpu_x86_data.h"
@@ -40,4 +40,4 @@ int virCPUx86DataSetVendor(virCPUDataPtr cpuData,
 int virCPUx86DataAddFeature(virCPUDataPtr cpuData,
                             const char *name);
 
-#endif /* __VIR_CPU_X86_H__ */
+#endif /* LIBVIRT_CPU_X86_H */
diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
index 32da772002ad4593d762accc5cae1830092304e3..f3cc3952ed74230ab2832586cb89a3085700c51b 100644
--- a/src/cpu/cpu_x86_data.h
+++ b/src/cpu/cpu_x86_data.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CPU_X86_DATA_H__
-# define __VIR_CPU_X86_DATA_H__
+#ifndef LIBVIRT_CPU_X86_DATA_H
+# define LIBVIRT_CPU_X86_DATA_H
 
 
 typedef struct _virCPUx86CPUID virCPUx86CPUID;
@@ -74,4 +74,4 @@ struct _virCPUx86Data {
     virCPUx86CPUID *data;
 };
 
-#endif /* __VIR_CPU_X86_DATA_H__ */
+#endif /* LIBVIRT_CPU_X86_DATA_H */
diff --git a/src/datatypes.h b/src/datatypes.h
index 08f1e033bb0a0184a2b3bc632f91b202e6f6255d..529b3405874b83323745b29082b7f6a8a4b44d5b 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_DATATYPES_H_
-# define __VIR_DATATYPES_H_
+#ifndef LIBVIRT_DATATYPES_H
+# define LIBVIRT_DATATYPES_H
 
 # include "internal.h"
 
@@ -777,4 +777,4 @@ int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbd
 int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDataPtr cbdata,
                                              virAdmConnectCloseFunc cb);
 
-#endif /* __VIR_DATATYPES_H_ */
+#endif /* LIBVIRT_DATATYPES_H */
diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index 6be3e175ce9f0319ccf1d97ff5beade598f90312..5315e33dde50d36bfc745b4d6d3f95c82830b666 100644
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_HYPERVISOR_H__
-# define __VIR_DRIVER_HYPERVISOR_H__
+#ifndef LIBVIRT_DRIVER_HYPERVISOR_H
+# define LIBVIRT_DRIVER_HYPERVISOR_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -1583,4 +1583,4 @@ struct _virHypervisorDriver {
 };
 
 
-#endif /* __VIR_DRIVER_HYPERVISOR_H__ */
+#endif /* LIBVIRT_DRIVER_HYPERVISOR_H */
diff --git a/src/driver-interface.h b/src/driver-interface.h
index 3f05a93325921ed6c88ed4fcd8253e46ed8908ac..5373f5e66a4b0529f828d85d290e6c9c9df86611 100644
--- a/src/driver-interface.h
+++ b/src/driver-interface.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_INTERFACE_H__
-# define __VIR_DRIVER_INTERFACE_H__
+#ifndef LIBVIRT_DRIVER_INTERFACE_H
+# define LIBVIRT_DRIVER_INTERFACE_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -119,4 +119,4 @@ struct _virInterfaceDriver {
 };
 
 
-#endif /* __VIR_DRIVER_INTERFACE_H__ */
+#endif /* LIBVIRT_DRIVER_INTERFACE_H */
diff --git a/src/driver-network.h b/src/driver-network.h
index e65117c49aca0fa17180992883a5ac679d44fdbe..2715c7bfece55c5cf1245a08795427108b809095 100644
--- a/src/driver-network.h
+++ b/src/driver-network.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_NETWORK_H__
-# define __VIR_DRIVER_NETWORK_H__
+#ifndef LIBVIRT_DRIVER_NETWORK_H
+# define LIBVIRT_DRIVER_NETWORK_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -154,4 +154,4 @@ struct _virNetworkDriver {
 };
 
 
-#endif /* __VIR_DRIVER_NETWORK_H__ */
+#endif /* LIBVIRT_DRIVER_NETWORK_H */
diff --git a/src/driver-nodedev.h b/src/driver-nodedev.h
index 5eae2391c7145fec19bd9a6a4d73d843b21305ed..c506e846f6b94bcf60ba976c04ca87bc024e3326 100644
--- a/src/driver-nodedev.h
+++ b/src/driver-nodedev.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_NODEDEV_H__
-# define __VIR_DRIVER_NODEDEV_H__
+#ifndef LIBVIRT_DRIVER_NODEDEV_H
+# define LIBVIRT_DRIVER_NODEDEV_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -117,4 +117,4 @@ struct _virNodeDeviceDriver {
 };
 
 
-#endif /* __VIR_DRIVER_NODEDEV_H__ */
+#endif /* LIBVIRT_DRIVER_NODEDEV_H */
diff --git a/src/driver-nwfilter.h b/src/driver-nwfilter.h
index 2c3e480a32a1fd06bce97949691f74a2af4d0a84..7bcb823f0ac2d18978170a1b7d365a554a0abda0 100644
--- a/src/driver-nwfilter.h
+++ b/src/driver-nwfilter.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_NWFILTER_H__
-# define __VIR_DRIVER_NWFILTER_H__
+#ifndef LIBVIRT_DRIVER_NWFILTER_H
+# define LIBVIRT_DRIVER_NWFILTER_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -110,4 +110,4 @@ struct _virNWFilterDriver {
 };
 
 
-#endif /* __VIR_DRIVER_NWFILTER_H__ */
+#endif /* LIBVIRT_DRIVER_NWFILTER_H */
diff --git a/src/driver-secret.h b/src/driver-secret.h
index 3cd9034b434535a96335506bf502676539514056..1dcae638808228fc2e64f72aa1bd02dadd93f9df 100644
--- a/src/driver-secret.h
+++ b/src/driver-secret.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_SECRET_H__
-# define __VIR_DRIVER_SECRET_H__
+#ifndef LIBVIRT_DRIVER_SECRET_H
+# define LIBVIRT_DRIVER_SECRET_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -115,4 +115,4 @@ struct _virSecretDriver {
 };
 
 
-#endif /* __VIR_DRIVER_SECRET_H__ */
+#endif /* LIBVIRT_DRIVER_SECRET_H */
diff --git a/src/driver-state.h b/src/driver-state.h
index 1cb3e4faf31331b93c42be939321cc01f0a7404e..54ca17b26088e1bb2e51e8849269693c7c2b9f3a 100644
--- a/src/driver-state.h
+++ b/src/driver-state.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_STATE_H__
-# define __VIR_DRIVER_STATE_H__
+#ifndef LIBVIRT_DRIVER_STATE_H
+# define LIBVIRT_DRIVER_STATE_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -55,4 +55,4 @@ struct _virStateDriver {
 };
 
 
-#endif /* __VIR_DRIVER_STATE_H__ */
+#endif /* LIBVIRT_DRIVER_STATE_H */
diff --git a/src/driver-storage.h b/src/driver-storage.h
index 146eb88b2c99ebd54c9e60131c77a5240b66ffbb..35bd99a20c6a0d15f1b476969b564af61809c426 100644
--- a/src/driver-storage.h
+++ b/src/driver-storage.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_STORAGE_H__
-# define __VIR_DRIVER_STORAGE_H__
+#ifndef LIBVIRT_DRIVER_STORAGE_H
+# define LIBVIRT_DRIVER_STORAGE_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -276,4 +276,4 @@ struct _virStorageDriver {
 };
 
 
-#endif /* __VIR_DRIVER_STORAGE_H__ */
+#endif /* LIBVIRT_DRIVER_STORAGE_H */
diff --git a/src/driver-stream.h b/src/driver-stream.h
index f207bf0ebd374eef03272f98fd2a37f45962a86c..4978f90d2db0a9a8f55eaf19135a87ce532dc63e 100644
--- a/src/driver-stream.h
+++ b/src/driver-stream.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_STREAM_H__
-# define __VIR_DRIVER_STREAM_H__
+#ifndef LIBVIRT_DRIVER_STREAM_H
+# define LIBVIRT_DRIVER_STREAM_H
 
 # ifndef __VIR_DRIVER_H_INCLUDES___
 #  error "Don't include this file directly, only use driver.h"
@@ -94,4 +94,4 @@ struct _virStreamDriver {
 };
 
 
-#endif /* __VIR_DRIVER_STREAM_H__ */
+#endif /* LIBVIRT_DRIVER_STREAM_H */
diff --git a/src/driver.h b/src/driver.h
index 83888921c0fdcec4d0a21df5ea63e9082092da6e..6472bd9367702e9c7f18f9cd2b2a5a84c97949ef 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DRIVER_H__
-# define __VIR_DRIVER_H__
+#ifndef LIBVIRT_DRIVER_H
+# define LIBVIRT_DRIVER_H
 
 # include <unistd.h>
 
@@ -127,4 +127,4 @@ int virSetConnectNodeDev(virConnectPtr conn);
 int virSetConnectSecret(virConnectPtr conn);
 int virSetConnectStorage(virConnectPtr conn);
 
-#endif /* __VIR_DRIVER_H__ */
+#endif /* LIBVIRT_DRIVER_H */
diff --git a/src/esx/esx_driver.h b/src/esx/esx_driver.h
index 0de6a648c23c4be12135e01ddda6d6a7c1aedd20..6c8f32c9d6c6a4097677f5152505078182decfae 100644
--- a/src/esx/esx_driver.h
+++ b/src/esx/esx_driver.h
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __ESX_DRIVER_H__
-# define __ESX_DRIVER_H__
+#ifndef LIBVIRT_ESX_DRIVER_H
+# define LIBVIRT_ESX_DRIVER_H
 
 int esxRegister(void);
 
-#endif /* __ESX_DRIVER_H__ */
+#endif /* LIBVIRT_ESX_DRIVER_H */
diff --git a/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h
index dfe245bb892a24853c4b5d3802fd9f159b79d56a..20e4fe60d0dca1a1c9568651ee559b34e5d35621 100644
--- a/src/esx/esx_interface_driver.h
+++ b/src/esx/esx_interface_driver.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef __ESX_INTERFACE_DRIVER_H__
-# define __ESX_INTERFACE_DRIVER_H__
+#ifndef LIBVIRT_ESX_INTERFACE_DRIVER_H
+# define LIBVIRT_ESX_INTERFACE_DRIVER_H
 
 # include "driver.h"
 
 extern virInterfaceDriver esxInterfaceDriver;
 
-#endif /* __ESX_INTERFACE_DRIVER_H__ */
+#endif /* LIBVIRT_ESX_INTERFACE_DRIVER_H */
diff --git a/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h
index d5bf0dd952f5e5986dfdbd53554c7af6c51d241c..c977a1abcf39f19edcad57f75c6e10d6879403d6 100644
--- a/src/esx/esx_network_driver.h
+++ b/src/esx/esx_network_driver.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef __ESX_NETWORK_DRIVER_H__
-# define __ESX_NETWORK_DRIVER_H__
+#ifndef LIBVIRT_ESX_NETWORK_DRIVER_H
+# define LIBVIRT_ESX_NETWORK_DRIVER_H
 
 # include "driver.h"
 
 extern virNetworkDriver esxNetworkDriver;
 
-#endif /* __ESX_NETWORK_DRIVER_H__ */
+#endif /* LIBVIRT_ESX_NETWORK_DRIVER_H */
diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h
index f2766eb0a6fb51a5a745a002f7d87918566b574d..abb4567e8f23ded1632b57721fddceed7381aa79 100644
--- a/src/esx/esx_private.h
+++ b/src/esx/esx_private.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ESX_PRIVATE_H__
-# define __ESX_PRIVATE_H__
+#ifndef LIBVIRT_ESX_PRIVATE_H
+# define LIBVIRT_ESX_PRIVATE_H
 
 # include "internal.h"
 # include "virerror.h"
@@ -42,4 +42,4 @@ typedef struct _esxPrivate {
     int32_t usedCpuTimeCounterId;
 } esxPrivate;
 
-#endif /* __ESX_PRIVATE_H__ */
+#endif /* LIBVIRT_ESX_PRIVATE_H */
diff --git a/src/esx/esx_storage_backend_iscsi.h b/src/esx/esx_storage_backend_iscsi.h
index da461c1cd0f23369b25ded99ae491d10c5a1769e..09ca4ac8131edc0de24251854bb996e7df66dc6e 100644
--- a/src/esx/esx_storage_backend_iscsi.h
+++ b/src/esx/esx_storage_backend_iscsi.h
@@ -19,11 +19,11 @@
  *
  */
 
-#ifndef __ESX_STORAGE_BACKEND_ISCSI_H__
-# define __ESX_STORAGE_BACKEND_ISCSI_H__
+#ifndef LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H
+# define LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H
 
 # include "driver.h"
 
 extern virStorageDriver esxStorageBackendISCSI;
 
-#endif /* __ESX_STORAGE_BACKEND_ISCSI_H__ */
+#endif /* LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H */
diff --git a/src/esx/esx_storage_backend_vmfs.h b/src/esx/esx_storage_backend_vmfs.h
index 4dad9bcd9aa08e0e2bc0e598028d8f3a0cc4721b..67b8af38cc4f1c341b9b0ebd4114d2b6ec1d1cb4 100644
--- a/src/esx/esx_storage_backend_vmfs.h
+++ b/src/esx/esx_storage_backend_vmfs.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef __ESX_STORAGE_BACKEND_VMFS_H__
-# define __ESX_STORAGE_BACKEND_VMFS_H__
+#ifndef LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H
+# define LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H
 
 # include "driver.h"
 
 extern virStorageDriver esxStorageBackendVMFS;
 
-#endif /* __ESX_STORAGE_BACKEND_VMFS_H__ */
+#endif /* LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H */
diff --git a/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h
index eee3c5c51e605e24537e9c9dc4a4db8cc403b1c4..73110cf8e6064d77df9115486b25fd95ca65bd91 100644
--- a/src/esx/esx_storage_driver.h
+++ b/src/esx/esx_storage_driver.h
@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef __ESX_STORAGE_DRIVER_H__
-# define __ESX_STORAGE_DRIVER_H__
+#ifndef LIBVIRT_ESX_STORAGE_DRIVER_H
+# define LIBVIRT_ESX_STORAGE_DRIVER_H
 
 # include "driver.h"
 
 extern virStorageDriver esxStorageDriver;
 
-#endif /* __ESX_STORAGE_DRIVER_H__ */
+#endif /* LIBVIRT_ESX_STORAGE_DRIVER_H */
diff --git a/src/esx/esx_stream.h b/src/esx/esx_stream.h
index 542a75ef67e19df6edae829cd8a37dbc7f8285ae..f00b4443aadc6d48b6b94b62eba7acd7e5cdc900 100644
--- a/src/esx/esx_stream.h
+++ b/src/esx/esx_stream.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ESX_STREAM_H__
-# define __ESX_STREAM_H__
+#ifndef LIBVIRT_ESX_STREAM_H
+# define LIBVIRT_ESX_STREAM_H
 
 # include "internal.h"
 # include "esx_private.h"
@@ -29,4 +29,4 @@ int esxStreamOpenUpload(virStreamPtr stream, esxPrivate *priv, const char *url);
 int esxStreamOpenDownload(virStreamPtr stream, esxPrivate *priv, const char *url,
                           unsigned long long offset, unsigned long long length);
 
-#endif /* __ESX_STREAM_H__ */
+#endif /* LIBVIRT_ESX_STREAM_H */
diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h
index df246445d2cd7cde3f0dfb45ac592b42a9b44880..163626688e71ff7857399a949da8b8ae6679ed16 100644
--- a/src/esx/esx_util.h
+++ b/src/esx/esx_util.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ESX_UTIL_H__
-# define __ESX_UTIL_H__
+#ifndef LIBVIRT_ESX_UTIL_H
+# define LIBVIRT_ESX_UTIL_H
 
 # include <netdb.h>
 # include "internal.h"
@@ -70,4 +70,4 @@ char *esxUtil_EscapeDatastoreItem(const char *string);
 
 char *esxUtil_EscapeForXml(const char *string);
 
-#endif /* __ESX_UTIL_H__ */
+#endif /* LIBVIRT_ESX_UTIL_H */
diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index 515024bb75af1d7e6dda0c73ef65dc36583e0fb2..ff2abfb0345af2e8c13970f62e71afbd234339c2 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __ESX_VI_H__
-# define __ESX_VI_H__
+#ifndef LIBVIRT_ESX_VI_H
+# define LIBVIRT_ESX_VI_H
 
 # include <libxml/tree.h>
 # include <libxml/xpath.h>
@@ -532,4 +532,4 @@ int esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx, const char *key,
 
 # include "esx_vi.generated.h"
 
-#endif /* __ESX_VI_H__ */
+#endif /* LIBVIRT_ESX_VI_H */
diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h
index a68ff1bb8dfd1a32c62cda6aaad9c0e7b7902dad..b09f64ba480aae5de03cea57ae7ad43b8270c899 100644
--- a/src/esx/esx_vi_methods.h
+++ b/src/esx/esx_vi_methods.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ESX_VI_METHODS_H__
-# define __ESX_VI_METHODS_H__
+#ifndef LIBVIRT_ESX_VI_METHODS_H
+# define LIBVIRT_ESX_VI_METHODS_H
 
 # include "esx_vi.h"
 # include "esx_vi_types.h"
@@ -46,4 +46,4 @@ int esxVI_ValidateMigration
 
 # include "esx_vi_methods.generated.h"
 
-#endif /* __ESX_VI_METHODS_H__ */
+#endif /* LIBVIRT_ESX_VI_METHODS_H */
diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h
index 66a5705c8701516762a9a494b21ae42c8cb34799..d43e825a486c3052a06530e680cba24ab664d0ae 100644
--- a/src/esx/esx_vi_types.h
+++ b/src/esx/esx_vi_types.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __ESX_VI_TYPES_H__
-# define __ESX_VI_TYPES_H__
+#ifndef LIBVIRT_ESX_VI_TYPES_H
+# define LIBVIRT_ESX_VI_TYPES_H
 
 # include "virbuffer.h"
 
@@ -420,4 +420,4 @@ int esxVI_Event_DeserializeList(xmlNodePtr node, esxVI_Event **list);
 int esxVI_VirtualMachinePowerState_ConvertToLibvirt
       (esxVI_VirtualMachinePowerState powerState);
 
-#endif /* __ESX_VI_TYPES_H__ */
+#endif /* LIBVIRT_ESX_VI_TYPES_H */
diff --git a/src/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h
index e7c249a32885b37273ceacc04412063c781ea782..f333fba3e15c856d92b7cbfb74aca6b7e92673a0 100644
--- a/src/hyperv/hyperv_driver.h
+++ b/src/hyperv/hyperv_driver.h
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef __HYPERV_DRIVER_H__
-# define __HYPERV_DRIVER_H__
+#ifndef LIBVIRT_HYPERV_DRIVER_H
+# define LIBVIRT_HYPERV_DRIVER_H
 
 int hypervRegister(void);
 
-#endif /* __HYPERV_DRIVER_H__ */
+#endif /* LIBVIRT_HYPERV_DRIVER_H */
diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index 4e7069971f6021680e88de0d4673948115d16e7d..f8d8f7deff686eb613e96cf3edf0216faa24fcb4 100644
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __HYPERV_PRIVATE_H__
-# define __HYPERV_PRIVATE_H__
+#ifndef LIBVIRT_HYPERV_PRIVATE_H
+# define LIBVIRT_HYPERV_PRIVATE_H
 
 # include "internal.h"
 # include "virerror.h"
@@ -41,4 +41,4 @@ struct _hypervPrivate {
     hypervWmiVersion wmiVersion;
 };
 
-#endif /* __HYPERV_PRIVATE_H__ */
+#endif /* LIBVIRT_HYPERV_PRIVATE_H */
diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h
index ededa3166f3c12de202a07a5a1716c678e45e9c6..c72a308da93313a8f8ae3787d35f0788b1a3b383 100644
--- a/src/hyperv/hyperv_util.h
+++ b/src/hyperv/hyperv_util.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __HYPERV_UTIL_H__
-# define __HYPERV_UTIL_H__
+#ifndef LIBVIRT_HYPERV_UTIL_H
+# define LIBVIRT_HYPERV_UTIL_H
 
 # include "internal.h"
 # include "viruri.h"
@@ -35,4 +35,4 @@ int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri);
 
 void hypervFreeParsedUri(hypervParsedUri **parsedUri);
 
-#endif /* __HYPERV_UTIL_H__ */
+#endif /* LIBVIRT_HYPERV_UTIL_H */
diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index cc5307829ce49eacc1330397c54620e134a8939b..e3ace011318781e3d2b873be901f4d2f54b5fb9f 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __HYPERV_WMI_H__
-# define __HYPERV_WMI_H__
+#ifndef LIBVIRT_HYPERV_WMI_H
+# define LIBVIRT_HYPERV_WMI_H
 
 # include "virbuffer.h"
 # include "hyperv_private.h"
@@ -253,4 +253,4 @@ int hypervMsvmComputerSystemToDomain(virConnectPtr conn,
 int hypervMsvmComputerSystemFromDomain(virDomainPtr domain,
                                        Msvm_ComputerSystem **computerSystem);
 
-#endif /* __HYPERV_WMI_H__ */
+#endif /* LIBVIRT_HYPERV_WMI_H */
diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index ce4643e9d3a1e6209a240e01d6e0ee3e0a586da5..cf2ae754476d53324c47baeb40911ce00ccfe802 100644
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __HYPERV_WMI_CLASSES_H__
-# define __HYPERV_WMI_CLASSES_H__
+#ifndef LIBVIRT_HYPERV_WMI_CLASSES_H
+# define LIBVIRT_HYPERV_WMI_CLASSES_H
 
 # include "internal.h"
 # include "openwsman.h"
@@ -140,4 +140,4 @@ struct _hypervWmiClassInfoList {
 
 # include "hyperv_wmi_classes.generated.h"
 
-#endif /* __HYPERV_WMI_CLASSES_H__ */
+#endif /* LIBVIRT_HYPERV_WMI_CLASSES_H */
diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h
index fc2958f539b7ecd875a2c5a2ef10bcff1423fe67..3f19a8f890951c18ca05b39cada3c437e0a8e7c0 100644
--- a/src/hyperv/openwsman.h
+++ b/src/hyperv/openwsman.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __OPENWSMAN_H__
-# define __OPENWSMAN_H__
+#ifndef LIBVIRT_OPENWSMAN_H
+# define LIBVIRT_OPENWSMAN_H
 
 /* Workaround openwsman <= 2.2.6 unconditionally defining optarg. Just pretend
  * that u/os.h was already included. Need to explicitly include time.h because
@@ -47,4 +47,4 @@
 WsXmlDocH ws_xml_create_doc(const char *rootNsUri, const char *rootName);
 WsXmlNodeH xml_parser_get_root(WsXmlDocH doc);
 
-#endif /* __OPENWSMAN_H__ */
+#endif /* LIBVIRT_OPENWSMAN_H */
diff --git a/src/interface/interface_driver.h b/src/interface/interface_driver.h
index 575f297953f91d58b72307461f85f9907423fdf6..242e00a8240b77053b4dcb92358a739745ea604e 100644
--- a/src/interface/interface_driver.h
+++ b/src/interface/interface_driver.h
@@ -18,12 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_INTERFACE__DRIVER_H
-# define __VIR_INTERFACE__DRIVER_H
+#ifndef LIBVIRT_INTERFACE_DRIVER_H
+# define LIBVIRT_INTERFACE_DRIVER_H
 
 int interfaceRegister(void);
 
 int netcfIfaceRegister(void);
 int udevIfaceRegister(void);
 
-#endif /* __VIR_INTERFACE__DRIVER_H */
+#endif /* LIBVIRT_INTERFACE_DRIVER_H */
diff --git a/src/internal.h b/src/internal.h
index fb2b56b662da4051e34ab6db6a4a8ccb81c0c6b6..3f3e567ac99880f4b4b2e668363016a3a731c221 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_INTERNAL_H__
-# define __VIR_INTERNAL_H__
+#ifndef LIBVIRT_INTERNAL_H
+# define LIBVIRT_INTERNAL_H
 
 # include <errno.h>
 # include <limits.h>
@@ -513,4 +513,4 @@ enum {
 #  define ENODATA EIO
 # endif
 
-#endif /* __VIR_INTERNAL_H__ */
+#endif /* LIBVIRT_INTERNAL_H */
diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 5d60f2654db0d64d4f8bfa5768576e2282c64363..8be1257814c913f5eec8eb1b13250b94552720a9 100644
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -22,8 +22,8 @@
  * include/libvirt/libvirt.h apply. ie this file is *append* only
  */
 
-#ifndef __LIBVIRT_H_
-# define __LIBVIRT_H_
+#ifndef LIBVIRT_LIBVIRT_INTERNAL_H
+# define LIBVIRT_LIBVIRT_INTERNAL_H
 
 # include "internal.h"
 
@@ -298,4 +298,4 @@ int virStreamInData(virStreamPtr stream,
                     int *data,
                     long long *length);
 
-#endif /* __LIBVIRT_H_ */
+#endif /* LIBVIRT_LIBVIRT_INTERNAL_H */
diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h
index 7d3fc3e18316552eb718481c75faca4c4b774141..be416822069257531fc3a12e72b99c3fae028d5b 100644
--- a/src/libxl/libxl_capabilities.h
+++ b/src/libxl/libxl_capabilities.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBXL_CAPABILITIES_H
-# define LIBXL_CAPABILITIES_H
+#ifndef LIBVIRT_LIBXL_CAPABILITIES_H
+# define LIBVIRT_LIBXL_CAPABILITIES_H
 
 # include <libxl.h>
 
@@ -52,4 +52,4 @@ libxlMakeDomainCapabilities(virDomainCapsPtr domCaps,
 int
 libxlDomainGetEmulatorType(const virDomainDef *def);
 
-#endif /* LIBXL_CAPABILITIES_H */
+#endif /* LIBVIRT_LIBXL_CAPABILITIES_H */
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index f7364597edc9501f9e39b1e6925a3af0ddcd9401..fee94241af0e23d05ead2f0be05283eefcb1380e 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBXL_CONF_H
-# define LIBXL_CONF_H
+#ifndef LIBVIRT_LIBXL_CONF_H
+# define LIBVIRT_LIBXL_CONF_H
 
 # include <libxl.h>
 
@@ -228,4 +228,4 @@ libxlDriverUnlock(libxlDriverPrivatePtr driver)
     virMutexUnlock(&driver->lock);
 }
 
-#endif /* LIBXL_CONF_H */
+#endif /* LIBVIRT_LIBXL_CONF_H */
diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h
index 40c15f9d24deb3ca0a82b1334f5f7969aef52cad..a3f7a3e04b8e38ff2e97f579c6bb62b7423fa263 100644
--- a/src/libxl/libxl_domain.h
+++ b/src/libxl/libxl_domain.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBXL_DOMAIN_H
-# define LIBXL_DOMAIN_H
+#ifndef LIBVIRT_LIBXL_DOMAIN_H
+# define LIBVIRT_LIBXL_DOMAIN_H
 
 # include <libxl.h>
 
@@ -156,4 +156,4 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver,
                                 virDomainDefPtr src,
                                 virDomainDefPtr dst);
 
-#endif /* LIBXL_DOMAIN_H */
+#endif /* LIBVIRT_LIBXL_DOMAIN_H */
diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h
index db161760f579f4764f8f673a3c4fe7974dd9a601..23b3ed2910872ea9142ebb2aaae6c0b701b81131 100644
--- a/src/libxl/libxl_driver.h
+++ b/src/libxl/libxl_driver.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBXL_DRIVER_H
-# define LIBXL_DRIVER_H
+#ifndef LIBVIRT_LIBXL_DRIVER_H
+# define LIBVIRT_LIBXL_DRIVER_H
 
 int libxlRegister(void);
 
-#endif /* LIBXL_DRIVER_H */
+#endif /* LIBVIRT_LIBXL_DRIVER_H */
diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h
index 6b7adf816cfc16038aa87a0e2fd05030befbd730..678009eba82d420122bbe231e6e3e709afa627d7 100644
--- a/src/libxl/libxl_logger.h
+++ b/src/libxl/libxl_logger.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LIBXL_LOGGER_H
-# define __LIBXL_LOGGER_H
+#ifndef LIBVIRT_LIBXL_LOGGER_H
+# define LIBVIRT_LIBXL_LOGGER_H
 
 # include "util/virlog.h"
 
@@ -34,4 +34,4 @@ void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name,
                          const char *domain_config);
 void libxlLoggerCloseFile(libxlLoggerPtr logger, int id);
 
-#endif /* __LIBXL_LOGGER_H */
+#endif /* LIBVIRT_LIBXL_LOGGER_H */
diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h
index 954968deef1da63334fecd80254788b203896d15..5aea16b74112a5e7042dcbf06f4622bb0dc47b96 100644
--- a/src/libxl/libxl_migration.h
+++ b/src/libxl/libxl_migration.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBXL_MIGRATION_H
-# define LIBXL_MIGRATION_H
+#ifndef LIBVIRT_LIBXL_MIGRATION_H
+# define LIBVIRT_LIBXL_MIGRATION_H
 
 # include "libxl_conf.h"
 
@@ -98,4 +98,4 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver,
                                unsigned int flags,
                                int cancelled);
 
-#endif /* LIBXL_MIGRATION_H */
+#endif /* LIBVIRT_LIBXL_MIGRATION_H */
diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h
index fb4910230c5d57283aa525a787b1756bf6ff7b42..027e93271a9ee77942e2b4232c27ad1d1692a71e 100644
--- a/src/locking/domain_lock.h
+++ b/src/locking/domain_lock.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_DOMAIN_LOCK_H__
-# define __VIR_DOMAIN_LOCK_H__
+#ifndef LIBVIRT_DOMAIN_LOCK_H
+# define LIBVIRT_DOMAIN_LOCK_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -66,4 +66,4 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin,
                              virDomainObjPtr dom,
                              virDomainLeaseDefPtr lease);
 
-#endif /* __VIR_DOMAIN_LOCK_H__ */
+#endif /* LIBVIRT_DOMAIN_LOCK_H */
diff --git a/src/locking/lock_daemon.h b/src/locking/lock_daemon.h
index 7cdf79fb69bfea325425dfe8c6b94d436f42ac0d..5c7f976ea4e5d7c9d8e1ce2fb5a26f644a581bc8 100644
--- a/src/locking/lock_daemon.h
+++ b/src/locking/lock_daemon.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOCK_DAEMON_H__
-# define __VIR_LOCK_DAEMON_H__
+#ifndef LIBVIRT_LOCK_DAEMON_H
+# define LIBVIRT_LOCK_DAEMON_H
 
 # include "virlockspace.h"
 # include "virthread.h"
@@ -51,4 +51,4 @@ int virLockDaemonAddLockSpace(virLockDaemonPtr lockd,
 virLockSpacePtr virLockDaemonFindLockSpace(virLockDaemonPtr lockd,
                                            const char *path);
 
-#endif /* __VIR_LOCK_DAEMON_H__ */
+#endif /* LIBVIRT_LOCK_DAEMON_H */
diff --git a/src/locking/lock_daemon_config.h b/src/locking/lock_daemon_config.h
index cda71311f59b62e8e55e0545376ff5b9d631d7c7..e820d60268a16491b23330ace89d8d4ca9a266a2 100644
--- a/src/locking/lock_daemon_config.h
+++ b/src/locking/lock_daemon_config.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOCK_DAEMON_CONFIG_H__
-# define __VIR_LOCK_DAEMON_CONFIG_H__
+#ifndef LIBVIRT_LOCK_DAEMON_CONFIG_H
+# define LIBVIRT_LOCK_DAEMON_CONFIG_H
 
 # include "internal.h"
 
@@ -43,4 +43,4 @@ int virLockDaemonConfigLoadFile(virLockDaemonConfigPtr data,
                                 const char *filename,
                                 bool allow_missing);
 
-#endif /* __VIR_LOCK_DAEMON_CONFIG_H__ */
+#endif /* LIBVIRT_LOCK_DAEMON_CONFIG_H */
diff --git a/src/locking/lock_daemon_dispatch.h b/src/locking/lock_daemon_dispatch.h
index 153f22b1ca9dc86b501e48a5052072b2887f4ebf..568a7e0160cd4a38ce0b6b2cc8c565ebf5918f35 100644
--- a/src/locking/lock_daemon_dispatch.h
+++ b/src/locking/lock_daemon_dispatch.h
@@ -18,12 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOCK_DAEMON_DISPATCH_H__
-# define __VIR_LOCK_DAEMON_DISPATCH_H__
+#ifndef LIBVIRT_LOCK_DAEMON_DISPATCH_H
+# define LIBVIRT_LOCK_DAEMON_DISPATCH_H
 
 # include "rpc/virnetserverprogram.h"
 
 extern virNetServerProgramProc virLockSpaceProtocolProcs[];
 extern size_t virLockSpaceProtocolNProcs;
 
-#endif /* __VIR_LOCK_DAEMON_DISPATCH_H__ */
+#endif /* LIBVIRT_LOCK_DAEMON_DISPATCH_H */
diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h
index 8b7cccc5210003835dbb59bed9bacddb6b2ec93a..f2d5266517641c70854463125eefbb2fcfdba5d4 100644
--- a/src/locking/lock_driver.h
+++ b/src/locking/lock_driver.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_PLUGINS_LOCK_DRIVER_H__
-# define __VIR_PLUGINS_LOCK_DRIVER_H__
+#ifndef LIBVIRT_LOCK_DRIVER_H
+# define LIBVIRT_LOCK_DRIVER_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -316,4 +316,4 @@ struct _virLockDriver {
 };
 
 
-#endif /* __VIR_PLUGINS_LOCK_DRIVER_H__ */
+#endif /* LIBVIRT_LOCK_DRIVER_H */
diff --git a/src/locking/lock_driver_lockd.h b/src/locking/lock_driver_lockd.h
index 6931fe742589a37ec7ec59fae86a4d58cada117d..d79d5e738addfcdc94816797b49b5fe89d27d240 100644
--- a/src/locking/lock_driver_lockd.h
+++ b/src/locking/lock_driver_lockd.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __VIR_LOCK_DRIVER_LOCKD_H__
-# define __VIR_LOCK_DRIVER_LOCKD_H__
+#ifndef LIBVIRT_LOCK_DRIVER_LOCKD_H
+# define LIBVIRT_LOCK_DRIVER_LOCKD_H
 
 enum virLockSpaceProtocolAcquireResourceFlags {
         VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = (1 << 0),
         VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = (1 << 1),
 };
 
-#endif /* __VIR_LOCK_DRIVER_LOCKD_H__ */
+#endif /* LIBVIRT_LOCK_DRIVER_LOCKD_H */
diff --git a/src/locking/lock_driver_nop.h b/src/locking/lock_driver_nop.h
index 12996321fa6faf29503f4482abd5608599d34ab8..2443072e3d57825a3ab7c1a9e9bf7ef3146ac66f 100644
--- a/src/locking/lock_driver_nop.h
+++ b/src/locking/lock_driver_nop.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __VIR_LOCK_DRIVER_NOP_H__
-# define __VIR_LOCK_DRIVER_NOP_H__
+#ifndef LIBVIRT_LOCK_DRIVER_NOP_H
+# define LIBVIRT_LOCK_DRIVER_NOP_H
 
 # include "lock_driver.h"
 
 extern virLockDriver virLockDriverNop;
 
 
-#endif /* __VIR_LOCK_DRIVER_NOP_H__ */
+#endif /* LIBVIRT_LOCK_DRIVER_NOP_H */
diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h
index 418975976c477b34a191442a797e5428b7ae2afc..71d39097092ddbacfd49416c5514f59ab314450f 100644
--- a/src/locking/lock_manager.h
+++ b/src/locking/lock_manager.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_LOCK_MANAGER_H__
-# define __VIR_LOCK_MANAGER_H__
+#ifndef LIBVIRT_LOCK_MANAGER_H
+# define LIBVIRT_LOCK_MANAGER_H
 
 # include "internal.h"
 # include "lock_driver.h"
@@ -67,4 +67,4 @@ int virLockManagerInquire(virLockManagerPtr manager,
 
 int virLockManagerFree(virLockManagerPtr manager);
 
-#endif /* __VIR_LOCK_MANAGER_H__ */
+#endif /* LIBVIRT_LOCK_MANAGER_H */
diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h
index 7634f9e7fbca4ee9d3e52bbbd435b3756e36da09..27f6af72cf0071851ff136a16d53c7598bd68885 100644
--- a/src/logging/log_daemon.h
+++ b/src/logging/log_daemon.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOG_DAEMON_H__
-# define __VIR_LOG_DAEMON_H__
+#ifndef LIBVIRT_LOG_DAEMON_H
+# define LIBVIRT_LOG_DAEMON_H
 
 # include "virthread.h"
 # include "log_handler.h"
@@ -40,4 +40,4 @@ extern virLogDaemonPtr logDaemon;
 
 virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn);
 
-#endif /* __VIR_LOG_DAEMON_H__ */
+#endif /* LIBVIRT_LOG_DAEMON_H */
diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h
index 12610ba7acc429cefc0a47b4a652199a4131145a..2508e4c9189fea9f99337b4e6b965cf255e523b8 100644
--- a/src/logging/log_daemon_config.h
+++ b/src/logging/log_daemon_config.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOG_DAEMON_CONFIG_H__
-# define __VIR_LOG_DAEMON_CONFIG_H__
+#ifndef LIBVIRT_LOG_DAEMON_CONFIG_H
+# define LIBVIRT_LOG_DAEMON_CONFIG_H
 
 # include "internal.h"
 
@@ -46,4 +46,4 @@ int virLogDaemonConfigLoadFile(virLogDaemonConfigPtr data,
                                const char *filename,
                                bool allow_missing);
 
-#endif /* __VIR_LOG_DAEMON_CONFIG_H__ */
+#endif /* LIBVIRT_LOG_DAEMON_CONFIG_H */
diff --git a/src/logging/log_daemon_dispatch.h b/src/logging/log_daemon_dispatch.h
index 13101c4fea975fd2652bd9df959b5f87d046fd31..8471d6798f4c4884eead138be869a453be7333b6 100644
--- a/src/logging/log_daemon_dispatch.h
+++ b/src/logging/log_daemon_dispatch.h
@@ -18,12 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOG_DAEMON_DISPATCH_H__
-# define __VIR_LOG_DAEMON_DISPATCH_H__
+#ifndef LIBVIRT_LOG_DAEMON_DISPATCH_H
+# define LIBVIRT_LOG_DAEMON_DISPATCH_H
 
 # include "rpc/virnetserverprogram.h"
 
 extern virNetServerProgramProc virLogManagerProtocolProcs[];
 extern size_t virLogManagerProtocolNProcs;
 
-#endif /* __VIR_LOG_DAEMON_DISPATCH_H__ */
+#endif /* LIBVIRT_LOG_DAEMON_DISPATCH_H */
diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h
index 670504bec48d7ee4664892ff1269abf293c57875..db202f70915175226214c4500b3567681e12a7b1 100644
--- a/src/logging/log_handler.h
+++ b/src/logging/log_handler.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOG_HANDLER_H__
-# define __VIR_LOG_HANDLER_H__
+#ifndef LIBVIRT_LOG_HANDLER_H
+# define LIBVIRT_LOG_HANDLER_H
 
 # include "internal.h"
 # include "virjson.h"
@@ -77,4 +77,4 @@ int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler,
 
 virJSONValuePtr virLogHandlerPreExecRestart(virLogHandlerPtr handler);
 
-#endif /* __VIR_LOG_HANDLER_H__ */
+#endif /* LIBVIRT_LOG_HANDLER_H */
diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h
index a16f3b198908f1aec9da4430142733faf0182b59..d796971ef8c02e603737cdf595dbba37345e6b2e 100644
--- a/src/logging/log_manager.h
+++ b/src/logging/log_manager.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LOG_MANAGER_H__
-# define __VIR_LOG_MANAGER_H__
+#ifndef LIBVIRT_LOG_MANAGER_H
+# define LIBVIRT_LOG_MANAGER_H
 
 # include "internal.h"
 
@@ -62,4 +62,4 @@ int virLogManagerDomainAppendMessage(virLogManagerPtr mgr,
                                      const char *message,
                                      unsigned int flags);
 
-#endif /* __VIR_LOG_MANAGER_H__ */
+#endif /* LIBVIRT_LOG_MANAGER_H */
diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index e85f21c47dc66e2c5ccfadce3a834d7cf8f02797..8b32ca1ede800a59aa538acb12dc913e4cbe4331 100644
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_LXC_CGROUP_H__
-# define __VIR_LXC_CGROUP_H__
+#ifndef LIBVIRT_LXC_CGROUP_H
+# define LIBVIRT_LXC_CGROUP_H
 
 # include "vircgroup.h"
 # include "domain_conf.h"
@@ -48,4 +48,4 @@ virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev,
                                   const char *path,
                                   void *opaque);
 
-#endif /* __VIR_LXC_CGROUP_H__ */
+#endif /* LIBVIRT_LXC_CGROUP_H */
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index eecc4c7c0bbfbf4d11cf7960a23aa0a77800a194..d6a1f1ca106414cfe57111241953696df8115211 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LXC_CONF_H
-# define LXC_CONF_H
+#ifndef LIBVIRT_LXC_CONF_H
+# define LIBVIRT_LXC_CONF_H
 
 # include "internal.h"
 # include "libvirt_internal.h"
@@ -121,4 +121,4 @@ static inline void lxcDriverUnlock(virLXCDriverPtr driver)
     virMutexUnlock(&driver->lock);
 }
 
-#endif /* LXC_CONF_H */
+#endif /* LIBVIRT_LXC_CONF_H */
diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h
index d647a629fc3c669a083f10aabb2f629b5911e79e..240c79d5ac8b493566f61d1b0e04d78b0651b4ac 100644
--- a/src/lxc/lxc_container.h
+++ b/src/lxc/lxc_container.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LXC_CONTAINER_H
-# define LXC_CONTAINER_H
+#ifndef LIBVIRT_LXC_CONTAINER_H
+# define LIBVIRT_LXC_CONTAINER_H
 
 # include "lxc_conf.h"
 # include "lxc_domain.h"
@@ -65,4 +65,4 @@ int lxcContainerChown(virDomainDefPtr def, const char *path);
 
 bool lxcIsBasicMountLocation(const char *path);
 
-#endif /* LXC_CONTAINER_H */
+#endif /* LIBVIRT_LXC_CONTAINER_H */
diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index 77ec523a636345057f87e4ec9a8e080bc2f0eaa8..364b8e5a44c0e3c625bbf55dbe02b8271fc68351 100644
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LXC_DOMAIN_H__
-# define __LXC_DOMAIN_H__
+#ifndef LIBVIRT_LXC_DOMAIN_H
+# define LIBVIRT_LXC_DOMAIN_H
 
 # include "vircgroup.h"
 # include "lxc_conf.h"
@@ -109,4 +109,4 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver,
 char *
 virLXCDomainGetMachineName(virDomainDefPtr def, pid_t pid);
 
-#endif /* __LXC_DOMAIN_H__ */
+#endif /* LIBVIRT_LXC_DOMAIN_H */
diff --git a/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h
index 851fc2d85d8e853e0dbfb821cd2f8ac1a2d2a551..4af9bb966ed5a112931a4d2557c4fe0ba9784b9d 100644
--- a/src/lxc/lxc_driver.h
+++ b/src/lxc/lxc_driver.h
@@ -18,10 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LXC_DRIVER_H
-# define LXC_DRIVER_H
+#ifndef LIBVIRT_LXC_DRIVER_H
+# define LIBVIRT_LXC_DRIVER_H
 
 /* Function declarations */
 int lxcRegister(void);
 
-#endif /* LXC_DRIVER_H */
+#endif /* LIBVIRT_LXC_DRIVER_H */
diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index bf22758c4ac41564f6639455317e2f586530af87..f8230e64c553d4f8c5111302a2e472cb2d973741 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LXC_FUSE_H
-# define LXC_FUSE_H
+#ifndef LIBVIRT_LXC_FUSE_H
+# define LIBVIRT_LXC_FUSE_H
 
 # define FUSE_USE_VERSION 26
 
@@ -58,4 +58,4 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def);
 int lxcStartFuse(virLXCFusePtr f);
 void lxcFreeFuse(virLXCFusePtr *f);
 
-#endif /* LXC_FUSE_H */
+#endif /* LIBVIRT_LXC_FUSE_H */
diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h
index f48b1805aa6a9de2c4f48c7b910c6fb5f802942d..4fd8ce35d5e862a7357300c74873a4e27b7acb3f 100644
--- a/src/lxc/lxc_hostdev.h
+++ b/src/lxc/lxc_hostdev.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LXC_HOSTDEV_H__
-# define __LXC_HOSTDEV_H__
+#ifndef LIBVIRT_LXC_HOSTDEV_H
+# define LIBVIRT_LXC_HOSTDEV_H
 
 # include "lxc_conf.h"
 # include "domain_conf.h"
@@ -38,4 +38,4 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver,
 void virLXCDomainReAttachHostDevices(virLXCDriverPtr driver,
                                      virDomainDefPtr def);
 
-#endif /* __LXC_HOSTDEV_H__ */
+#endif /* LIBVIRT_LXC_HOSTDEV_H */
diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h
index a0d6f371bacab056d25cd102760b57cb4599a5e4..fa47db7254f5fcbd4ecae281a00f0e20479d6d3b 100644
--- a/src/lxc/lxc_monitor.h
+++ b/src/lxc/lxc_monitor.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LXC_MONITOR_H__
-# define __LXC_MONITOR_H__
+#ifndef LIBVIRT_LXC_MONITOR_H
+# define LIBVIRT_LXC_MONITOR_H
 
 # include "virobject.h"
 # include "domain_conf.h"
@@ -60,4 +60,4 @@ void virLXCMonitorClose(virLXCMonitorPtr mon);
 void virLXCMonitorLock(virLXCMonitorPtr mon);
 void virLXCMonitorUnlock(virLXCMonitorPtr mon);
 
-#endif /* __LXC_MONITOR_H__ */
+#endif /* LIBVIRT_LXC_MONITOR_H */
diff --git a/src/lxc/lxc_native.h b/src/lxc/lxc_native.h
index 2c13c0065815ee6d99fe6ce2c0cb7303e853424a..86f5163e12a4f75cbdca577efa5a7241aa1c394c 100644
--- a/src/lxc/lxc_native.h
+++ b/src/lxc/lxc_native.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LXC_NATIVE_H__
-# define __LXC_NATIVE_H__
+#ifndef LIBVIRT_LXC_NATIVE_H
+# define LIBVIRT_LXC_NATIVE_H
 
 # include "domain_conf.h"
 
@@ -29,4 +29,4 @@ virDomainDefPtr lxcParseConfigString(const char *config,
                                      virCapsPtr caps,
                                      virDomainXMLOptionPtr xmlopt);
 
-#endif /* __LXC_NATIVE_H__ */
+#endif /* LIBVIRT_LXC_NATIVE_H */
diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h
index d78cddef4b18840986a8518a8186edc2540531b9..7489a3a4202aa73ad8cfaef9a83b97c47249aace 100644
--- a/src/lxc/lxc_process.h
+++ b/src/lxc/lxc_process.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LXC_PROCESS_H__
-# define __LXC_PROCESS_H__
+#ifndef LIBVIRT_LXC_PROCESS_H
+# define LIBVIRT_LXC_PROCESS_H
 
 # include "lxc_conf.h"
 
@@ -55,4 +55,4 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
                                         virDomainDefPtr def,
                                         virDomainNetDefPtr net);
 
-#endif /* __LXC_PROCESS_H__ */
+#endif /* LIBVIRT_LXC_PROCESS_H */
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 5d621521cb479329b9d8c154ef578fb9f6f6b9e0..44c79f555eea5a34b45606a00eb5bc7afdd798d3 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETWORK__DRIVER_H
-# define __VIR_NETWORK__DRIVER_H
+#ifndef LIBVIRT_BRIDGE_DRIVER_H
+# define LIBVIRT_BRIDGE_DRIVER_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -38,4 +38,4 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
                            dnsmasqContext *dctx,
                            dnsmasqCapsPtr caps);
 
-#endif /* __VIR_NETWORK__DRIVER_H */
+#endif /* LIBVIRT_BRIDGE_DRIVER_H */
diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h
index 8507ec4b97906f2763c40deb72879927b0bce84a..8f05ea2b472cc3ce45d0fd93c988c88e7ad41b76 100644
--- a/src/network/bridge_driver_platform.h
+++ b/src/network/bridge_driver_platform.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_BRIDGE_DRIVER_PLATFORM_H__
-# define __VIR_BRIDGE_DRIVER_PLATFORM_H__
+#ifndef LIBVIRT_BRIDGE_DRIVER_PLATFORM_H
+# define LIBVIRT_BRIDGE_DRIVER_PLATFORM_H
 
 # include "internal.h"
 # include "virthread.h"
@@ -64,4 +64,4 @@ int networkAddFirewallRules(virNetworkDefPtr def);
 
 void networkRemoveFirewallRules(virNetworkDefPtr def);
 
-#endif /* __VIR_BRIDGE_DRIVER_PLATFORM_H__ */
+#endif /* LIBVIRT_BRIDGE_DRIVER_PLATFORM_H */
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index 037fc72bce9cbc6840b951df1b36c2d79df5558d..5876671c037da5100a74e8e7fa623345565a6480 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NODE_DEVICE_H__
-# define __VIR_NODE_DEVICE_H__
+#ifndef LIBVIRT_NODE_DEVICE_DRIVER_H
+# define LIBVIRT_NODE_DEVICE_DRIVER_H
 
 # include "internal.h"
 # include "driver.h"
@@ -118,4 +118,4 @@ int
 nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
                                         int callbackID);
 
-#endif /* __VIR_NODE_DEVICE_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_DRIVER_H */
diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h
index 72266729fc063137cc93d7867221772dbe2088ea..ffcf0c84e6713bda5916b2ebf06436e48459b29d 100644
--- a/src/node_device/node_device_hal.h
+++ b/src/node_device/node_device_hal.h
@@ -19,7 +19,7 @@
  *
  */
 
-#ifndef __VIR_NODE_DEVICE_HAL_H__
-# define __VIR_NODE_DEVICE_HAL_H__
+#ifndef LIBVIRT_NODE_DEVICE_HAL_H
+# define LIBVIRT_NODE_DEVICE_HAL_H
 
-#endif /* __VIR_NODE_DEVICE_HAL_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_HAL_H */
diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
index 79e7278cc6fd10369d709ced1958d89ea771cf87..8c1d8fec1dd668d8939575b9c5be392faf33d982 100644
--- a/src/node_device/node_device_udev.h
+++ b/src/node_device/node_device_udev.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NODE_DEVICE_UDEV_H__
-# define __NODE_DEVICE_UDEV_H__
+#ifndef LIBVIRT_NODE_DEVICE_UDEV_H
+# define LIBVIRT_NODE_DEVICE_UDEV_H
 
 # include <libudev.h>
 
@@ -27,4 +27,4 @@
 # define DMI_DEVPATH "/sys/devices/virtual/dmi/id"
 # define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id"
 
-#endif /* __NODE_DEVICE_UDEV_H__ */
+#endif /* LIBVIRT_NODE_DEVICE_UDEV_H */
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h
index 028c236a961454b12bfb08c03bcd365775d1ecf2..38606bdd4195c926012d69dd7372ccaebf6734f1 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.h
+++ b/src/nwfilter/nwfilter_dhcpsnoop.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NWFILTER_DHCPSNOOP_H
-# define __NWFILTER_DHCPSNOOP_H
+#ifndef LIBVIRT_NWFILTER_DHCPSNOOP_H
+# define LIBVIRT_NWFILTER_DHCPSNOOP_H
 
 # include "nwfilter_tech_driver.h"
 
@@ -31,4 +31,4 @@ int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver,
                             virNWFilterBindingDefPtr binding,
                             virNWFilterDriverStatePtr driver);
 void virNWFilterDHCPSnoopEnd(const char *ifname);
-#endif /* __NWFILTER_DHCPSNOOP_H */
+#endif /* LIBVIRT_NWFILTER_DHCPSNOOP_H */
diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h
index 1dfb9b31e6ac4c318adda1061a9abdfb00d918e7..c315a4064992885b0517430424dfef1e9554a55f 100644
--- a/src/nwfilter/nwfilter_driver.h
+++ b/src/nwfilter/nwfilter_driver.h
@@ -22,12 +22,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NWFILTER_DRIVER_H__
-# define __VIR_NWFILTER_DRIVER_H__
+#ifndef LIBVIRT_NWFILTER_DRIVER_H
+# define LIBVIRT_NWFILTER_DRIVER_H
 
 # include "nwfilter_params.h"
 # include "nwfilter_conf.h"
 
 int nwfilterRegister(void);
 
-#endif /* __VIR_NWFILTER_DRIVER_H__ */
+#endif /* LIBVIRT_NWFILTER_DRIVER_H */
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h
index a8e696aa375fb3d7292bed88710d98b67096915d..f7408564964c39ffab8c40a7567cb8c1589f3111 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.h
+++ b/src/nwfilter/nwfilter_ebiptables_driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__
-# define VIR_NWFILTER_EBTABLES_DRIVER_H__
+#ifndef LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H
+# define LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H
 
 # include "nwfilter_tech_driver.h"
 
@@ -32,4 +32,4 @@ extern virNWFilterTechDriver ebiptables_driver;
 
 # define IPTABLES_MAX_COMMENT_LENGTH  256
 
-#endif /* VIR_NWFILTER_EBTABLES_DRIVER_H__ */
+#endif /* LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H */
diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h
index 71a8cad938723134e82823a8fd6a30f009305304..945060cd2268521f490c32769339504f016a3a48 100644
--- a/src/nwfilter/nwfilter_gentech_driver.h
+++ b/src/nwfilter/nwfilter_gentech_driver.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NWFILTER_GENTECH_DRIVER_H
-# define __NWFILTER_GENTECH_DRIVER_H
+#ifndef LIBVIRT_NWFILTER_GENTECH_DRIVER_H
+# define LIBVIRT_NWFILTER_GENTECH_DRIVER_H
 
 # include "virnwfilterobj.h"
 # include "virnwfilterbindingdef.h"
@@ -56,4 +56,4 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr,
 int virNWFilterBuildAll(virNWFilterDriverStatePtr driver,
                         bool newFilters);
 
-#endif /* __NWFILTER_GENTECH_DRIVER_H */
+#endif /* LIBVIRT_NWFILTER_GENTECH_DRIVER_H */
diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h
index 40d00ed68a420ba172dd5744c73ae068321f97bd..117d69f4d4bae5a58eb93a0393b0a21763f2b0b7 100644
--- a/src/nwfilter/nwfilter_learnipaddr.h
+++ b/src/nwfilter/nwfilter_learnipaddr.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NWFILTER_LEARNIPADDR_H
-# define __NWFILTER_LEARNIPADDR_H
+#ifndef LIBVIRT_NWFILTER_LEARNIPADDR_H
+# define LIBVIRT_NWFILTER_LEARNIPADDR_H
 
 # include "conf/nwfilter_params.h"
 # include "nwfilter_tech_driver.h"
@@ -50,4 +50,4 @@ int virNWFilterLearnInit(void);
 void virNWFilterLearnShutdown(void);
 void virNWFilterLearnThreadsTerminate(bool allowNewThreads);
 
-#endif /* __NWFILTER_LEARNIPADDR_H */
+#endif /* LIBVIRT_NWFILTER_LEARNIPADDR_H */
diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h
index 64fa5bcbb5942810b202d25f91ec154bba54bff0..f37a0e7d5c981b471805dc3fb9ec787227e2f103 100644
--- a/src/nwfilter/nwfilter_tech_driver.h
+++ b/src/nwfilter/nwfilter_tech_driver.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NWFILTER_TECH_DRIVER_H__
-# define __NWFILTER_TECH_DRIVER_H__
+#ifndef LIBVIRT_NWFILTER_TECH_DRIVER_H
+# define LIBVIRT_NWFILTER_TECH_DRIVER_H
 
 # include "virnwfilterobj.h"
 
@@ -91,4 +91,4 @@ struct _virNWFilterTechDriver {
     virNWFilterRemoveBasicRules removeBasicRules;
 };
 
-#endif /* __NWFILTER_TECH_DRIVER_H__ */
+#endif /* LIBVIRT_NWFILTER_TECH_DRIVER_H */
diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index e1e0066df69e7e040d38390b65f8a3382a3db14d..05ccd6f927020de020fdc91390b333165a284f9b 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPENVZ_CONF_H
-# define OPENVZ_CONF_H
+#ifndef LIBVIRT_OPENVZ_CONF_H
+# define LIBVIRT_OPENVZ_CONF_H
 
 # include "internal.h"
 # include "virdomainobjlist.h"
@@ -65,4 +65,4 @@ int openvzSetDefinedUUID(int vpsid, unsigned char *uuid);
 int openvzGetVEID(const char *name);
 int openvzReadNetworkConf(virDomainDefPtr def, int veid);
 
-#endif /* OPENVZ_CONF_H */
+#endif /* LIBVIRT_OPENVZ_CONF_H */
diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h
index 68d2c1f03cb6b23c71407787a421e41cdb53e8ab..dd2cfd900ef3b45deb8d3385b39e924739c8f2d1 100644
--- a/src/openvz/openvz_driver.h
+++ b/src/openvz/openvz_driver.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPENVZ_DRIVER_H
-# define OPENVZ_DRIVER_H
+#ifndef LIBVIRT_OPENVZ_DRIVER_H
+# define LIBVIRT_OPENVZ_DRIVER_H
 
 # include "internal.h"
 
@@ -37,4 +37,4 @@
 
 int openvzRegister(void);
 
-#endif /* OPENVZ_DRIVER_H */
+#endif /* LIBVIRT_OPENVZ_DRIVER_H */
diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h
index 98d13ae336d60d3032a8cc21e4df74d8ab8997ab..bc3247119a9e6606113d8f36a84bbe18f854a9ee 100644
--- a/src/openvz/openvz_util.h
+++ b/src/openvz/openvz_util.h
@@ -19,10 +19,10 @@
  *
  */
 
-#ifndef OPENVZ_UTIL_H
-# define OPENVZ_UTIL_H
+#ifndef LIBVIRT_OPENVZ_UTIL_H
+# define LIBVIRT_OPENVZ_UTIL_H
 
 long openvzKBPerPages(void);
 char *openvzVEGetStringParam(virDomainPtr dom, const char *param);
 
-#endif /* OPENVZ_UTIL_H */
+#endif /* LIBVIRT_OPENVZ_UTIL_H */
diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h
index c6410bcc41a2128f5386ed9eeb4ec5dc30a5feb1..52a5d2bd1772f2942d8b8de20b0e50aa796580b7 100644
--- a/src/phyp/phyp_driver.h
+++ b/src/phyp/phyp_driver.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PHYP_DRIVER_H
-# define PHYP_DRIVER_H
+#ifndef LIBVIRT_PHYP_DRIVER_H
+# define LIBVIRT_PHYP_DRIVER_H
 
 int phypRegister(void);
 
-#endif /* PHYP_DRIVER_H */
+#endif /* LIBVIRT_PHYP_DRIVER_H */
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 698b2e06396ac86160e99467654a5b4a29406ee0..24457f84d7a631ad398c6b58ed7af4f2c71c21ad 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_AGENT_H__
-# define __QEMU_AGENT_H__
+#ifndef LIBVIRT_QEMU_AGENT_H
+# define LIBVIRT_QEMU_AGENT_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -121,4 +121,4 @@ int qemuAgentSetUserPassword(qemuAgentPtr mon,
                              const char *user,
                              const char *password,
                              bool crypted);
-#endif /* __QEMU_AGENT_H__ */
+#endif /* LIBVIRT_QEMU_AGENT_H */
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 4afa6f1256cda80c85ce226054f0a70a76bd55f3..aaf81e89ad40cccc726fff53ae0ea2992c3c6025 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_ALIAS_H__
-# define __QEMU_ALIAS_H__
+#ifndef LIBVIRT_QEMU_ALIAS_H
+# define LIBVIRT_QEMU_ALIAS_H
 
 # include "domain_conf.h"
 
@@ -97,4 +97,4 @@ const char *qemuDomainGetManagedPRAlias(void);
 
 char *qemuDomainGetUnmanagedPRAlias(const char *parentalias);
 
-#endif /* __QEMU_ALIAS_H__ */
+#endif /* LIBVIRT_QEMU_ALIAS_H */
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 62ed5027cbfb6a16960fda438aa6f9a8946a6bf6..9401ab4e12b286341cb12f3ad6609efb1c90e87f 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_BLOCK_H__
-# define __QEMU_BLOCK_H__
+#ifndef LIBVIRT_QEMU_BLOCK_H
+# define LIBVIRT_QEMU_BLOCK_H
 
 # include "internal.h"
 
@@ -125,4 +125,4 @@ qemuBlockSnapshotAddLegacy(virJSONValuePtr actions,
                            virStorageSourcePtr newsrc,
                            bool reuse);
 
-#endif /* __QEMU_BLOCK_H__ */
+#endif /* LIBVIRT_QEMU_BLOCK_H */
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index cee3ee21c40393b67c860cefaa22eaff09c85594..445799ff7695927bd5feb67ecdf65504aa67611d 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_BLOCKJOB_H__
-# define __QEMU_BLOCKJOB_H__
+#ifndef LIBVIRT_QEMU_BLOCKJOB_H
+# define LIBVIRT_QEMU_BLOCKJOB_H
 
 # include "internal.h"
 # include "qemu_conf.h"
@@ -42,4 +42,4 @@ void qemuBlockJobSyncEnd(virDomainObjPtr vm,
                          qemuDomainAsyncJob asyncJob,
                          virDomainDiskDefPtr disk);
 
-#endif /* __QEMU_BLOCKJOB_H__ */
+#endif /* LIBVIRT_QEMU_BLOCKJOB_H */
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9f099971669aa585c2c5687e74acfbe293e3548a..bf98ff7fcdbf67f57a91ac5a70471e0464b33f65 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -42,7 +42,7 @@
 #include "virstring.h"
 #include "qemu_hostdev.h"
 #include "qemu_domain.h"
-#define __QEMU_CAPSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 #include "qemu_capspriv.h"
 #include "qemu_qapi.h"
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e19b9d070f7c546db2c958f8a5380782718ef246..1ed763951345d969fef9afaaf8e1772172c76be2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_CAPABILITIES_H__
-# define __QEMU_CAPABILITIES_H__
+#ifndef LIBVIRT_QEMU_CAPABILITIES_H
+# define LIBVIRT_QEMU_CAPABILITIES_H
 
 # include "virobject.h"
 # include "capabilities.h"
@@ -636,4 +636,4 @@ bool virQEMUCapsCPUFilterFeatures(const char *name,
 virSEVCapabilityPtr
 virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps);
 
-#endif /* __QEMU_CAPABILITIES_H__ */
+#endif /* LIBVIRT_QEMU_CAPABILITIES_H */
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index b4183b5e66e03f9b6e2faff3287f68eec6dffda5..b995e4d5d38b164341d3bdb91b467b52126e365c 100644
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -19,12 +19,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_CAPSPRIV_H_ALLOW__
+#ifndef LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # error "qemu_capspriv.h may only be included by qemu_capabilities.c or test suites"
-#endif /* __QEMU_CAPSPRIV_H_ALLOW__ */
+#endif /* LIBVIRT_QEMU_CAPSPRIV_H_ALLOW */
 
-#ifndef __QEMU_CAPSPRIV_H__
-# define __QEMU_CAPSPRIV_H__
+#ifndef LIBVIRT_QEMU_CAPSPRIV_H
+# define LIBVIRT_QEMU_CAPSPRIV_H
 
 virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps);
 
@@ -99,4 +99,4 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,
 void
 virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps);
 
-#endif /* __QEMU_CAPSPRIV_H__ */
+#endif /* LIBVIRT_QEMU_CAPSPRIV_H */
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index 4541c644eee9b095fcd0f73f9c6d6fd79cfa658a..17a565244f40e4043d3a4f55ef0d7158cc03be7a 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_CGROUP_H__
-# define __QEMU_CGROUP_H__
+#ifndef LIBVIRT_QEMU_CGROUP_H
+# define LIBVIRT_QEMU_CGROUP_H
 
 # include "virusb.h"
 # include "vircgroup.h"
@@ -83,4 +83,4 @@ int qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup,
 void qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data);
 
 extern const char *const defaultDeviceACL[];
-#endif /* __QEMU_CGROUP_H__ */
+#endif /* LIBVIRT_QEMU_CGROUP_H */
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index c5bca612c129700c5d41528465d4c26c7d5639ab..464726061af891b51156277d359c90825992794a 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_COMMAND_H__
-# define __QEMU_COMMAND_H__
+#ifndef LIBVIRT_QEMU_COMMAND_H
+# define LIBVIRT_QEMU_COMMAND_H
 
 # include "domain_addr.h"
 # include "domain_conf.h"
@@ -227,4 +227,4 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_NONNULL(4);
 
-#endif /* __QEMU_COMMAND_H__ */
+#endif /* LIBVIRT_QEMU_COMMAND_H */
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index b70a0cda7c5df7cea14c368099c82bf2d7abdbb3..1013cfcaed75d1c753a1eeef07a99af014e73ae0 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMUD_CONF_H
-# define __QEMUD_CONF_H
+#ifndef LIBVIRT_QEMU_CONF_H
+# define LIBVIRT_QEMU_CONF_H
 
 # include <unistd.h>
 
@@ -385,4 +385,4 @@ int qemuGetMemoryBackingPath(const virDomainDef *def,
                              virQEMUDriverConfigPtr cfg,
                              const char *alias,
                              char **memPath);
-#endif /* __QEMUD_CONF_H */
+#endif /* LIBVIRT_QEMU_CONF_H */
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index cc17d622a21215a21f3740e0b095325603beb516..4414a50c81b29d8737609040f86abaca50aa6297 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_DOMAIN_H__
-# define __QEMU_DOMAIN_H__
+#ifndef LIBVIRT_QEMU_DOMAIN_H
+# define LIBVIRT_QEMU_DOMAIN_H
 
 # include "virthread.h"
 # include "vircgroup.h"
@@ -1095,4 +1095,4 @@ qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason);
 bool
 qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv);
 
-#endif /* __QEMU_DOMAIN_H__ */
+#endif /* LIBVIRT_QEMU_DOMAIN_H */
diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h
index 0f360fcc49b904967d7072e217f04150b9d421ff..875112bf8db21145b4ea28a795e1d55d733b6f37 100644
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_DOMAIN_ADDRESS_H__
-# define __QEMU_DOMAIN_ADDRESS_H__
+#ifndef LIBVIRT_QEMU_DOMAIN_ADDRESS_H
+# define LIBVIRT_QEMU_DOMAIN_ADDRESS_H
 
 # include "domain_addr.h"
 # include "domain_conf.h"
@@ -66,4 +66,4 @@ int qemuDomainEnsureVirtioAddress(bool *releaseAddr,
                                   virDomainDeviceDefPtr dev,
                                   const char *devicename);
 
-#endif /* __QEMU_DOMAIN_ADDRESS_H__ */
+#endif /* LIBVIRT_QEMU_DOMAIN_ADDRESS_H */
diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h
index 2e7ed9331e65d7910a4b9bb882182ba4d654aea5..e2efad6e52113f51db8cb2c0f1bd2d623d362998 100644
--- a/src/qemu/qemu_driver.h
+++ b/src/qemu/qemu_driver.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_DRIVER_H__
-# define __QEMU_DRIVER_H__
+#ifndef LIBVIRT_QEMU_DRIVER_H
+# define LIBVIRT_QEMU_DRIVER_H
 
 int qemuRegister(void);
 
-#endif /* __QEMU_DRIVER_H__ */
+#endif /* LIBVIRT_QEMU_DRIVER_H */
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index ad48dbba677656a535604071ce99adb73672d0b6..af03c045ffa297495a398571fed7e7a3f71ca016 100644
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_EXTDEVICE_H__
-# define __QEMU_EXTDEVICE_H__
+#ifndef LIBVIRT_QEMU_EXTDEVICE_H
+# define LIBVIRT_QEMU_EXTDEVICE_H
 
 # include "qemu_conf.h"
 # include "qemu_domain.h"
@@ -55,4 +55,4 @@ int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
                               virDomainDefPtr def,
                               virCgroupPtr cgroup);
 
-#endif /* __QEMU_EXTDEVICE_H__ */
+#endif /* LIBVIRT_QEMU_EXTDEVICE_H */
diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index 1f5542b129b65ab97f3c3cb5f252a71a74ab7fb5..41f254ab81f1ca72379fc1e762163f969af41a1e 100644
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_HOSTDEV_H__
-# define __QEMU_HOSTDEV_H__
+#ifndef LIBVIRT_QEMU_HOSTDEV_H
+# define LIBVIRT_QEMU_HOSTDEV_H
 
 # include "qemu_conf.h"
 # include "domain_conf.h"
@@ -91,4 +91,4 @@ void qemuHostdevReAttachMediatedDevices(virQEMUDriverPtr driver,
 void qemuHostdevReAttachDomainDevices(virQEMUDriverPtr driver,
                                       virDomainDefPtr def);
 
-#endif /* __QEMU_HOSTDEV_H__ */
+#endif /* LIBVIRT_QEMU_HOSTDEV_H */
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index ca168995e16773beb963168c808fbfdc98b76b5a..8da023315ba3e75c1541256910ff235c663d7d2a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "qemu_hotplug.h"
-#define __QEMU_HOTPLUGPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
 #include "qemu_hotplugpriv.h"
 #include "qemu_alias.h"
 #include "qemu_capabilities.h"
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index bccf1122065bfe07c6d1192d85c10b0a5e1eda30..7ac03b781023c68104cd6ab265b8481e738f5e52 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_HOTPLUG_H__
-# define __QEMU_HOTPLUG_H__
+#ifndef LIBVIRT_QEMU_HOTPLUG_H
+# define LIBVIRT_QEMU_HOTPLUG_H
 
 # include "qemu_conf.h"
 # include "qemu_domain.h"
@@ -198,4 +198,4 @@ int qemuDomainDetachInputDevice(virDomainObjPtr vm,
 int qemuDomainDetachVsockDevice(virDomainObjPtr vm,
                                 virDomainVsockDefPtr dev,
                                 bool async);
-#endif /* __QEMU_HOTPLUG_H__ */
+#endif /* LIBVIRT_QEMU_HOTPLUG_H */
diff --git a/src/qemu/qemu_hotplugpriv.h b/src/qemu/qemu_hotplugpriv.h
index 22390137018a11fa87400f3e27ec99b884a0a0aa..e4b37d78c00f07c33cefeeb3abd9f5c949ebb035 100644
--- a/src/qemu/qemu_hotplugpriv.h
+++ b/src/qemu/qemu_hotplugpriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __QEMU_HOTPLUGPRIV_H_ALLOW__
+#ifndef LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
 # error "qemu_hotplugpriv.h may only be included by qemu_hotplug.c or test suites"
-#endif /* __QEMU_HOTPLUGPRIV_H_ALLOW__ */
+#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW */
 
-#ifndef __QEMU_HOTPLUGPRIV_H__
-# define __QEMU_HOTPLUGPRIV_H__
+#ifndef LIBVIRT_QEMU_HOTPLUGPRIV_H
+# define LIBVIRT_QEMU_HOTPLUGPRIV_H
 
 /*
  * This header file should never be used outside unit tests.
@@ -32,4 +32,4 @@
 
 extern unsigned long long qemuDomainRemoveDeviceWaitTime;
 
-#endif /* __QEMU_HOTPLUGPRIV_H__ */
+#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H */
diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index 08df5619eac810e64961f582f0f669abef71406e..f3ec540eda515a7e750b698e6315f95d2c7d2ff1 100644
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_INTERFACE_H__
-# define __QEMU_INTERFACE_H__
+#ifndef LIBVIRT_QEMU_INTERFACE_H
+# define LIBVIRT_QEMU_INTERFACE_H
 
 # include "domain_conf.h"
 # include "qemu_conf.h"
@@ -55,4 +55,4 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def,
                               virDomainNetDefPtr net,
                               int *vhostfd,
                               size_t *vhostfdSize);
-#endif /* __QEMU_INTERFACE_H__ */
+#endif /* LIBVIRT_QEMU_INTERFACE_H */
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index e12b6972db37893926e4ea05c901ac59261dd707..7d0ff8362ebdc66958b079ff28c368467970917f 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __QEMU_MIGRATION_H__
-# define __QEMU_MIGRATION_H__
+#ifndef LIBVIRT_QEMU_MIGRATION_H
+# define LIBVIRT_QEMU_MIGRATION_H
 
 # include "qemu_conf.h"
 # include "qemu_domain.h"
@@ -254,4 +254,4 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
                                  qemuDomainAsyncJob asyncJob,
                                  qemuDomainJobInfoPtr jobInfo);
 
-#endif /* __QEMU_MIGRATION_H__ */
+#endif /* LIBVIRT_QEMU_MIGRATION_H */
diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h
index b399787074d937f40203ed7207b7137b92e09aa9..56678b008ab15546eb2d13c4471edf77a0c827a5 100644
--- a/src/qemu/qemu_migration_cookie.h
+++ b/src/qemu/qemu_migration_cookie.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_MIGRATION_COOKIE_H__
-# define __QEMU_MIGRATION_COOKIE_H__
+#ifndef LIBVIRT_QEMU_MIGRATION_COOKIE_H
+# define LIBVIRT_QEMU_MIGRATION_COOKIE_H
 
 # include "qemu_migration_params.h"
 
@@ -177,4 +177,4 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig,
 virDomainDefPtr
 qemuMigrationCookieGetPersistent(qemuMigrationCookiePtr mig);
 
-#endif /* __QEMU_MIGRATION_COOKIE_H__ */
+#endif /* LIBVIRT_QEMU_MIGRATION_COOKIE_H */
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index f34c3f6c0699eca6be966c9f60348f862ffb5b11..e62b6ed46158c596f9156077c1102ec447510b02 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -30,7 +30,7 @@
 #include "qemu_hotplug.h"
 #include "qemu_migration.h"
 #include "qemu_migration_params.h"
-#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
 #include "qemu_migration_paramspriv.h"
 #include "qemu_monitor.h"
 
diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 57c3b8dc132874ab56d77791c44634beef25d93c..12bb9200da589e00ddf0f7989d4e778aa925f35e 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __QEMU_MIGRATION_PARAMS_H__
-# define __QEMU_MIGRATION_PARAMS_H__
+#ifndef LIBVIRT_QEMU_MIGRATION_PARAMS_H
+# define LIBVIRT_QEMU_MIGRATION_PARAMS_H
 
 # include "internal.h"
 
@@ -148,4 +148,4 @@ bool
 qemuMigrationCapsGet(virDomainObjPtr vm,
                      qemuMigrationCapability cap);
 
-#endif /* __QEMU_MIGRATION_PARAMS_H__ */
+#endif /* LIBVIRT_QEMU_MIGRATION_PARAMS_H */
diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration_paramspriv.h
index 52f159125144d255060acb3bca95f8feaf75a0a1..b1e017e786fdac9afc7c5296ff8494732413e11d 100644
--- a/src/qemu/qemu_migration_paramspriv.h
+++ b/src/qemu/qemu_migration_paramspriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__
+#ifndef LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
 # error "qemu_migration_paramspriv.h may only be included by qemu_migration_params.c or test suites"
-#endif /* __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ */
+#endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW */
 
-#ifndef __QEMU_MIGRATION_PARAMSPRIV_H__
-# define __QEMU_MIGRATION_PARAMSPRIV_H__
+#ifndef LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H
+# define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H
 
 virJSONValuePtr
 qemuMigrationParamsToJSON(qemuMigrationParamsPtr migParams);
@@ -36,4 +36,4 @@ virJSONValuePtr
 qemuMigrationCapsToJSON(virBitmapPtr caps,
                         virBitmapPtr states);
 
-#endif /* __QEMU_MIGRATION_PARAMSPRIV_H__ */
+#endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H */
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 713fe2fab44d36186bc54f1de8c11751361fefc2..5232cefd75ef3264da7c5d465f038d6a01363bb5 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -46,7 +46,7 @@
 # include "libvirt_qemu_probes.h"
 #endif
 
-#define __QEMU_MONITOR_PRIV_H_ALLOW__
+#define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW
 #include "qemu_monitor_priv.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95a21fde05db5cbc9d5603cc230bb1ce550cf476..fef537c90ea7ca964d315410550620f1fd02b221 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QEMU_MONITOR_H
-# define QEMU_MONITOR_H
+#ifndef LIBVIRT_QEMU_MONITOR_H
+# define LIBVIRT_QEMU_MONITOR_H
 
 # include "internal.h"
 
@@ -1194,4 +1194,4 @@ struct _qemuMonitorPRManagerInfo {
 int qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
                                 virHashTablePtr *retinfo);
 
-#endif /* QEMU_MONITOR_H */
+#endif /* LIBVIRT_QEMU_MONITOR_H */
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 331419890bccd463526be8511ff4dab0ba11c13a..62772228fe224692ec7642ff60ce7581b15a4671 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QEMU_MONITOR_JSON_H
-# define QEMU_MONITOR_JSON_H
+#ifndef LIBVIRT_QEMU_MONITOR_JSON_H
+# define LIBVIRT_QEMU_MONITOR_JSON_H
 
 # include "internal.h"
 
@@ -578,4 +578,4 @@ int qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon,
                                     virHashTablePtr info)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-#endif /* QEMU_MONITOR_JSON_H */
+#endif /* LIBVIRT_QEMU_MONITOR_JSON_H */
diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h
index 6db3e3769f5c108d38b5c4206d7bf20f797e0b7d..2e3ca72ec9275d88d23f4e07823444e7ae73d130 100644
--- a/src/qemu/qemu_monitor_priv.h
+++ b/src/qemu/qemu_monitor_priv.h
@@ -16,16 +16,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_MONITOR_PRIV_H_ALLOW__
+#ifndef LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW
 # error "qemu_monitor_priv.h may only be included by qemu_monitor.c or test suites"
-#endif /* __QEMU_MONITOR_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW */
 
-#ifndef __QEMU_MONITOR_PRIV_H__
-# define __QEMU_MONITOR_PRIV_H__
+#ifndef LIBVIRT_QEMU_MONITOR_PRIV_H
+# define LIBVIRT_QEMU_MONITOR_PRIV_H
 
 # include "qemu_monitor.h"
 
 void
 qemuMonitorResetCommandID(qemuMonitorPtr mon);
 
-#endif /* __QEMU_MONITOR_PRIV_H__ */
+#endif /* LIBVIRT_QEMU_MONITOR_PRIV_H */
diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index 8ebdef67b6cd3e6f5935c581c0634e53029e2e80..b1ad2dab52cd2d0881ff54a82838d84807ef6c6d 100644
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QEMU_MONITOR_TEXT_H
-# define QEMU_MONITOR_TEXT_H
+#ifndef LIBVIRT_QEMU_MONITOR_TEXT_H
+# define LIBVIRT_QEMU_MONITOR_TEXT_H
 
 # include "internal.h"
 
@@ -38,4 +38,4 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name);
 int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name);
 int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name);
 
-#endif /* QEMU_MONITOR_TEXT_H */
+#endif /* LIBVIRT_QEMU_MONITOR_TEXT_H */
diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h
index 901b5b438f9dea016efb003e74de71cdcc09ffae..5eeb344c60855977db2c6476164dc6974c1a4250 100644
--- a/src/qemu/qemu_parse_command.h
+++ b/src/qemu/qemu_parse_command.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_PARSE_COMMAND_H__
-# define __QEMU_PARSE_COMMAND_H__
+#ifndef LIBVIRT_QEMU_PARSE_COMMAND_H
+# define LIBVIRT_QEMU_PARSE_COMMAND_H
 
 # include "virfilecache.h"
 
@@ -57,4 +57,4 @@ qemuParseKeywords(const char *str,
                   int *retnkeywords,
                   int allowEmptyValue);
 
-#endif /* __QEMU_PARSE_COMMAND_H__ */
+#endif /* LIBVIRT_QEMU_PARSE_COMMAND_H */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6809522d36788870aa5b0bc76856e9f0f7118aed..685e7201e356da04391527e82da62b2f25597631 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -35,7 +35,7 @@
 #include <sys/utsname.h>
 
 #include "qemu_process.h"
-#define __QEMU_PROCESS_PRIV_H_ALLOW__
+#define LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW
 #include "qemu_processpriv.h"
 #include "qemu_alias.h"
 #include "qemu_block.h"
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 2037467c94624d6c00030f5dee7c62d929c801e1..67a4d7139f5e09f3215d38c64c81dfd0361450e7 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __QEMU_PROCESS_H__
-# define __QEMU_PROCESS_H__
+#ifndef LIBVIRT_QEMU_PROCESS_H
+# define LIBVIRT_QEMU_PROCESS_H
 
 # include "qemu_conf.h"
 # include "qemu_domain.h"
@@ -214,4 +214,4 @@ int qemuProcessStartManagedPRDaemon(virDomainObjPtr vm);
 
 void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm);
 
-#endif /* __QEMU_PROCESS_H__ */
+#endif /* LIBVIRT_QEMU_PROCESS_H */
diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h
index a7582558a9a4f074498389e78a3e5333fa1b3c66..17f981829bad833f316e5b44935cc30d04672c19 100644
--- a/src/qemu/qemu_processpriv.h
+++ b/src/qemu/qemu_processpriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __QEMU_PROCESS_PRIV_H_ALLOW__
+#ifndef LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW
 # error "qemu_process_priv.h may only be included by qemu_process.c or test suites"
-#endif /* __QEMU_PROCESS_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW */
 
-#ifndef __QEMU_PROCESSPRIV_H__
-# define __QEMU_PROCESSPRIV_H__
+#ifndef LIBVIRT_QEMU_PROCESSPRIV_H
+# define LIBVIRT_QEMU_PROCESSPRIV_H
 
 # include "domain_conf.h"
 # include "qemu_monitor.h"
@@ -38,4 +38,4 @@ int qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon,
                                    const char *devAlias,
                                    void *opaque);
 
-#endif /* __QEMU_PROCESSPRIV_H__ */
+#endif /* LIBVIRT_QEMU_PROCESSPRIV_H */
diff --git a/src/qemu/qemu_qapi.h b/src/qemu/qemu_qapi.h
index e074507dc89b8747952dfeb708210587b3c22f57..c95978de9137f6ecdd8761b0e3a19f6b2a4c5068 100644
--- a/src/qemu/qemu_qapi.h
+++ b/src/qemu/qemu_qapi.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_QAPI_H__
-# define __QEMU_QAPI_H__
+#ifndef LIBVIRT_QEMU_QAPI_H
+# define LIBVIRT_QEMU_QAPI_H
 
 # include "internal.h"
 
@@ -37,4 +37,4 @@ virHashTablePtr
 virQEMUQAPISchemaConvert(virJSONValuePtr schemareply);
 
 
-#endif /* __QEMU_QAPI_H__ */
+#endif /* LIBVIRT_QEMU_QAPI_H */
diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
index 8bb50c9534a3f14b2603fd0304fa8b805f2f8fa8..5b4fe6eb8f165f8e49c94ea0c16c31e20e13abdc 100644
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_SECURITY_H__
-# define __QEMU_SECURITY_H__
+#ifndef LIBVIRT_QEMU_SECURITY_H
+# define LIBVIRT_QEMU_SECURITY_H
 
 
 # include "qemu_conf.h"
@@ -131,4 +131,4 @@ int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver,
 # define qemuSecurityStackAddNested virSecurityManagerStackAddNested
 # define qemuSecurityVerify virSecurityManagerVerify
 
-#endif /* __QEMU_SECURITY_H__ */
+#endif /* LIBVIRT_QEMU_SECURITY_H */
diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h
index acae9520aac31c4c46894b7f71ae3547a988f6fc..bffcad5db0a59938f80a175ff158235f302a54c3 100644
--- a/src/qemu/qemu_tpm.h
+++ b/src/qemu/qemu_tpm.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMU_TPM_H__
-# define __QEMU_TPM_H__
+#ifndef LIBVIRT_QEMU_TPM_H
+# define LIBVIRT_QEMU_TPM_H
 
 # include "vircommand.h"
 
@@ -52,4 +52,4 @@ int qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __QEMU_TPM_H__ */
+#endif /* LIBVIRT_QEMU_TPM_H */
diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index 2184f9bda37227bb3432d179b4f1b8a77ad31f8b..50e912f8286e40bcb3aa8687b2ec8ea857a7f9aa 100644
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __REMOTE_DAEMON_H__
-# define __REMOTE_DAEMON_H__
+#ifndef LIBVIRT_REMOTE_DAEMON_H
+# define LIBVIRT_REMOTE_DAEMON_H
 
 # define VIR_ENUM_SENTINELS
 
@@ -88,4 +88,4 @@ extern virNetSASLContextPtr saslCtxt;
 extern virNetServerProgramPtr remoteProgram;
 extern virNetServerProgramPtr qemuProgram;
 
-#endif /* __REMOTE_DAEMON_H__ */
+#endif /* LIBVIRT_REMOTE_DAEMON_H */
diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_config.h
index c5595fa8784d8fdbaeac081d50ca1e04bdd5eae3..56d130bdcec1d94043a2e89584e82bc829ea98bd 100644
--- a/src/remote/remote_daemon_config.h
+++ b/src/remote/remote_daemon_config.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __REMOTE_DAEMON_CONFIG_H__
-# define __REMOTE_DAEMON_CONFIG_H__
+#ifndef LIBVIRT_REMOTE_DAEMON_CONFIG_H
+# define LIBVIRT_REMOTE_DAEMON_CONFIG_H
 
 # include "internal.h"
 
@@ -104,4 +104,4 @@ int daemonConfigLoadData(struct daemonConfig *data,
                          const char *filename,
                          const char *filedata);
 
-#endif /* __REMOTE_DAEMON_CONFIG_H__ */
+#endif /* LIBVIRT_REMOTE_DAEMON_CONFIG_H */
diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon_dispatch.h
index d3b8cf2346671161f549270503f2efb434a42fc6..cafe109a21efab2dbe0685a4fb0dfa08f4778c92 100644
--- a/src/remote/remote_daemon_dispatch.h
+++ b/src/remote/remote_daemon_dispatch.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __REMOTE_DAEMON_DISPATCH_H__
-# define __REMOTE_DAEMON_DISPATCH_H__
+#ifndef LIBVIRT_REMOTE_DAEMON_DISPATCH_H
+# define LIBVIRT_REMOTE_DAEMON_DISPATCH_H
 
 # include "remote_protocol.h"
 # include "rpc/virnetserverprogram.h"
@@ -39,4 +39,4 @@ void remoteClientFree(void *data);
 void *remoteClientNew(virNetServerClientPtr client,
                       void *opaque);
 
-#endif /* __REMOTE_DAEMON_DISPATCH_H__ */
+#endif /* LIBVIRT_REMOTE_DAEMON_DISPATCH_H */
diff --git a/src/remote/remote_daemon_stream.h b/src/remote/remote_daemon_stream.h
index 55a483665ced3f563305215bf2bebfe96cefb7cb..46e3df5c5ecdc91cb7bb8b4a2cadce05897643ee 100644
--- a/src/remote/remote_daemon_stream.h
+++ b/src/remote/remote_daemon_stream.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __REMOTE_DAEMON_STREAM_H__
-# define __REMOTE_DAEMON_STREAM_H__
+#ifndef LIBVIRT_REMOTE_DAEMON_STREAM_H
+# define LIBVIRT_REMOTE_DAEMON_STREAM_H
 
 # include "remote_daemon.h"
 
@@ -44,4 +44,4 @@ daemonRemoveClientStream(virNetServerClientPtr client,
 void
 daemonRemoveAllClientStreams(daemonClientStream *stream);
 
-#endif /* __REMOTE_DAEMON_STREAM_H__ */
+#endif /* LIBVIRT_REMOTE_DAEMON_STREAM_H */
diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index c125a3de821026d8ce34cc4a3c42c020787cb741..5d6580e855da7a14c578f2140790b6bdbd4c7042 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_REMOTE_INTERNAL_H__
-# define __VIR_REMOTE_INTERNAL_H__
+#ifndef LIBVIRT_REMOTE_DRIVER_H
+# define LIBVIRT_REMOTE_DRIVER_H
 
 # include "internal.h"
 # include "configmake.h"
@@ -46,4 +46,4 @@ unsigned long remoteVersion(void);
 # define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem"
 
 
-#endif /* __VIR_REMOTE_INTERNAL_H__ */
+#endif /* LIBVIRT_REMOTE_DRIVER_H */
diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h
index 26043ff67aa36bf7a6aaed3c500c7062d1c58ea5..6b9524b6baeb9f957a318998c1a39f1666e28898 100644
--- a/src/rpc/virkeepalive.h
+++ b/src/rpc/virkeepalive.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_KEEPALIVE_H__
-# define __VIR_KEEPALIVE_H__
+#ifndef LIBVIRT_VIRKEEPALIVE_H
+# define LIBVIRT_VIRKEEPALIVE_H
 
 # include "virnetmessage.h"
 # include "virobject.h"
@@ -53,4 +53,4 @@ bool virKeepAliveCheckMessage(virKeepAlivePtr ka,
                               virNetMessagePtr msg,
                               virNetMessagePtr *response);
 
-#endif /* __VIR_KEEPALIVE_H__ */
+#endif /* LIBVIRT_VIRKEEPALIVE_H */
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 80ca3bf8dbf5b31943082cc9833ff7d98567b59b..39a6176d3ea3ac35660bc4f46fa67c16d3710d91 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_CLIENT_H__
-# define __VIR_NET_CLIENT_H__
+#ifndef LIBVIRT_VIRNETCLIENT_H
+# define LIBVIRT_VIRNETCLIENT_H
 
 # ifdef WITH_GNUTLS
 #  include "virnettlscontext.h"
@@ -148,4 +148,4 @@ int virNetClientKeepAliveStart(virNetClientPtr client,
 
 void virNetClientKeepAliveStop(virNetClientPtr client);
 
-#endif /* __VIR_NET_CLIENT_H__ */
+#endif /* LIBVIRT_VIRNETCLIENT_H */
diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h
index 3e82113ee96e310bdb3cb05f35e1c8dea3a4f5ba..36d331cbf0e6091965f446e63e58d5b1f2db5309 100644
--- a/src/rpc/virnetclientprogram.h
+++ b/src/rpc/virnetclientprogram.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_CLIENT_PROGRAM_H__
-# define __VIR_NET_CLIENT_PROGRAM_H__
+#ifndef LIBVIRT_VIRNETCLIENTPROGRAM_H
+# define LIBVIRT_VIRNETCLIENTPROGRAM_H
 
 # include <rpc/types.h>
 # include <rpc/xdr.h>
@@ -81,4 +81,4 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
 
 
 
-#endif /* __VIR_NET_CLIENT_PROGRAM_H__ */
+#endif /* LIBVIRT_VIRNETCLIENTPROGRAM_H */
diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h
index 86db199b259689d2aaabb2e96b2cdc0649475bf2..d13793222b4d89a140f504bdd238437c63c681b8 100644
--- a/src/rpc/virnetclientstream.h
+++ b/src/rpc/virnetclientstream.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_CLIENT_STREAM_H__
-# define __VIR_NET_CLIENT_STREAM_H__
+#ifndef LIBVIRT_VIRNETCLIENTSTREAM_H
+# define LIBVIRT_VIRNETCLIENTSTREAM_H
 
 # include "virnetclientprogram.h"
 # include "virobject.h"
@@ -82,4 +82,4 @@ int virNetClientStreamEventRemoveCallback(virNetClientStreamPtr st);
 bool virNetClientStreamEOF(virNetClientStreamPtr st)
     ATTRIBUTE_NONNULL(1);
 
-#endif /* __VIR_NET_CLIENT_STREAM_H__ */
+#endif /* LIBVIRT_VIRNETCLIENTSTREAM_H */
diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index e6dbb2f6c79f5a2033563bd66c3bd04bdcf4d2c5..2ad85f265bf1ba732f046756712e078bec2b8468 100644
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_DAEMON_H__
-# define __VIR_NET_DAEMON_H__
+#ifndef LIBVIRT_VIRNETDAEMON_H
+# define LIBVIRT_VIRNETDAEMON_H
 
 # include <signal.h>
 
@@ -82,4 +82,4 @@ ssize_t virNetDaemonGetServers(virNetDaemonPtr dmn, virNetServerPtr **servers);
 bool virNetDaemonHasServer(virNetDaemonPtr dmn,
                            const char *serverName);
 
-#endif /* __VIR_NET_DAEMON_H__ */
+#endif /* LIBVIRT_VIRNETDAEMON_H */
diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h
index b8844dc3ad12bdf7f2ad7ca0db388c0dcfdc43fb..bb89267835da23428b3753228c5ff1e844373545 100644
--- a/src/rpc/virnetlibsshsession.h
+++ b/src/rpc/virnetlibsshsession.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_LIBSSH_SESSION_H__
-# define __VIR_NET_LIBSSH_SESSION_H__
+#ifndef LIBVIRT_VIRNETLIBSSHSESSION_H
+# define LIBVIRT_VIRNETLIBSSHSESSION_H
 
 # include "internal.h"
 # include "viruri.h"
@@ -73,4 +73,4 @@ ssize_t virNetLibsshChannelWrite(virNetLibsshSessionPtr sess,
 
 bool virNetLibsshSessionHasCachedData(virNetLibsshSessionPtr sess);
 
-#endif /* __VIR_NET_LIBSSH_SESSION_H__ */
+#endif /* LIBVIRT_VIRNETLIBSSHSESSION_H */
diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h
index d7406fcd24d5186c330fc9a11c75e9f38ffef024..c787eecb7d633d5fd8619733e121eaa2eb7f221d 100644
--- a/src/rpc/virnetmessage.h
+++ b/src/rpc/virnetmessage.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_MESSAGE_H__
-# define __VIR_NET_MESSAGE_H__
+#ifndef LIBVIRT_VIRNETMESSAGE_H
+# define LIBVIRT_VIRNETMESSAGE_H
 
 # include "virnetprotocol.h"
 
@@ -101,4 +101,4 @@ int virNetMessageDupFD(virNetMessagePtr msg,
 int virNetMessageAddFD(virNetMessagePtr msg,
                        int fd);
 
-#endif /* __VIR_NET_MESSAGE_H__ */
+#endif /* LIBVIRT_VIRNETMESSAGE_H */
diff --git a/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h
index edc082f3a78ec5a0f06c4311665557de67c1d9ad..6d8f16ecd00718069e3388184e86ec09811f5186 100644
--- a/src/rpc/virnetsaslcontext.h
+++ b/src/rpc/virnetsaslcontext.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_CLIENT_SASL_CONTEXT_H__
-# define __VIR_NET_CLIENT_SASL_CONTEXT_H__
+#ifndef LIBVIRT_VIRNETSASLCONTEXT_H
+# define LIBVIRT_VIRNETSASLCONTEXT_H
 
 # include "internal.h"
 # include <sasl/sasl.h>
@@ -110,4 +110,4 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr sasl,
                                 const char **output,
                                 size_t *outputlen);
 
-#endif /* __VIR_NET_CLIENT_SASL_CONTEXT_H__ */
+#endif /* LIBVIRT_VIRNETSASLCONTEXT_H */
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 17dcad9595a689debd8a27c4ffab2c42abe5ea57..92a856fb03c5528b2333b8ed1658757fc4757f2a 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SERVER_H__
-# define __VIR_NET_SERVER_H__
+#ifndef LIBVIRT_VIRNETSERVER_H
+# define LIBVIRT_VIRNETSERVER_H
 
 # include "virnettlscontext.h"
 # include "virnetserverprogram.h"
@@ -113,4 +113,4 @@ int virNetServerSetClientLimits(virNetServerPtr srv,
                                 long long int maxClients,
                                 long long int maxClientsUnauth);
 
-#endif /* __VIR_NET_SERVER_H__ */
+#endif /* LIBVIRT_VIRNETSERVER_H */
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index fa240f0d0fb3d43b0c461130f91bfc7ba07dd9fa..2d6fa7ec5682cd7c0ac8f8559699f3248676285e 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SERVER_CLIENT_H__
-# define __VIR_NET_SERVER_CLIENT_H__
+#ifndef LIBVIRT_VIRNETSERVERCLIENT_H
+# define LIBVIRT_VIRNETSERVERCLIENT_H
 
 # include "viridentity.h"
 # include "virnetsocket.h"
@@ -170,4 +170,4 @@ int virNetServerClientGetInfo(virNetServerClientPtr client,
 
 void virNetServerClientSetQuietEOF(virNetServerClientPtr client);
 
-#endif /* __VIR_NET_SERVER_CLIENT_H__ */
+#endif /* LIBVIRT_VIRNETSERVERCLIENT_H */
diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h
index cced0ee0f358800b4fad09da080ef94682694a17..64511a65c8f9d2759fb97bdd2ec15c67691b89cb 100644
--- a/src/rpc/virnetservermdns.h
+++ b/src/rpc/virnetservermdns.h
@@ -21,8 +21,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SERVER_MDNS_H__
-# define __VIR_NET_SERVER_MDNS_H__
+#ifndef LIBVIRT_VIRNETSERVERMDNS_H
+# define LIBVIRT_VIRNETSERVERMDNS_H
 
 # include "internal.h"
 
@@ -104,4 +104,4 @@ void virNetServerMDNSFree(virNetServerMDNSPtr ptr);
 void virNetServerMDNSGroupFree(virNetServerMDNSGroupPtr ptr);
 void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr ptr);
 
-#endif /* __VIR_NET_SERVER_MDNS_H__ */
+#endif /* LIBVIRT_VIRNETSERVERMDNS_H */
diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h
index fdb6a60a2b7b21515a2a021d4210aca1a380ffc7..b37fc40c9b34b07927cd9b40f1e5198b2b976b50 100644
--- a/src/rpc/virnetserverprogram.h
+++ b/src/rpc/virnetserverprogram.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SERVER_PROGRAM_H__
-# define __VIR_NET_SERVER_PROGRAM_H__
+#ifndef LIBVIRT_VIRNETSERVERPROGRAM_H
+# define LIBVIRT_VIRNETSERVERPROGRAM_H
 
 # include "virnetmessage.h"
 # include "virnetserverclient.h"
@@ -107,4 +107,4 @@ int virNetServerProgramSendStreamHole(virNetServerProgramPtr prog,
                                       long long length,
                                       unsigned int flags);
 
-#endif /* __VIR_NET_SERVER_PROGRAM_H__ */
+#endif /* LIBVIRT_VIRNETSERVERPROGRAM_H */
diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index 32371d979ec1ff84c8c24a8ab65284d284b8540a..5c73bdeab1d715505b1d59e48c8b6022d3f54b17 100644
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SERVER_SERVICE_H__
-# define __VIR_NET_SERVER_SERVICE_H__
+#ifndef LIBVIRT_VIRNETSERVERSERVICE_H
+# define LIBVIRT_VIRNETSERVERSERVICE_H
 
 # include "virnetserverprogram.h"
 # include "virobject.h"
@@ -88,4 +88,4 @@ void virNetServerServiceToggle(virNetServerServicePtr svc,
 
 void virNetServerServiceClose(virNetServerServicePtr svc);
 
-#endif /* __VIR_NET_SERVER_SERVICE_H__ */
+#endif /* LIBVIRT_VIRNETSERVERSERVICE_H */
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 2d64701e402c389d767391d20dcdb760b276d668..334036aafc1244c5a4d8201d624327eefa20ebba 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SOCKET_H__
-# define __VIR_NET_SOCKET_H__
+#ifndef LIBVIRT_VIRNETSOCKET_H
+# define LIBVIRT_VIRNETSOCKET_H
 
 # include "virsocketaddr.h"
 # include "vircommand.h"
@@ -185,4 +185,4 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock);
 void virNetSocketClose(virNetSocketPtr sock);
 
 
-#endif /* __VIR_NET_SOCKET_H__ */
+#endif /* LIBVIRT_VIRNETSOCKET_H */
diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h
index faecb75064f60f162518c7f678a5c2fb196d5903..840054c51a82ac65b4780e1e09316c507b29b989 100644
--- a/src/rpc/virnetsshsession.h
+++ b/src/rpc/virnetsshsession.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_SSH_SESSION_H__
-# define __VIR_NET_SSH_SESSION_H__
+#ifndef LIBVIRT_VIRNETSSHSESSION_H
+# define LIBVIRT_VIRNETSSHSESSION_H
 
 # include "internal.h"
 # include "viruri.h"
@@ -85,4 +85,4 @@ ssize_t virNetSSHChannelWrite(virNetSSHSessionPtr sess,
 
 bool virNetSSHSessionHasCachedData(virNetSSHSessionPtr sess);
 
-#endif /* __VIR_NET_SSH_SESSION_H__ */
+#endif /* LIBVIRT_VIRNETSSHSESSION_H */
diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h
index c20ea9a722b86e8ed3fa7a14cf034e33f3690126..82ecd8267dec094d76337048a593d2e44781ec3e 100644
--- a/src/rpc/virnettlscontext.h
+++ b/src/rpc/virnettlscontext.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NET_TLS_CONTEXT_H__
-# define __VIR_NET_TLS_CONTEXT_H__
+#ifndef LIBVIRT_VIRNETTLSCONTEXT_H
+# define LIBVIRT_VIRNETTLSCONTEXT_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -100,4 +100,4 @@ int virNetTLSSessionGetKeySize(virNetTLSSessionPtr sess);
 
 const char *virNetTLSSessionGetX509DName(virNetTLSSessionPtr sess);
 
-#endif /* __VIR_NET_TLS_CONTEXT_H__ */
+#endif /* LIBVIRT_VIRNETTLSCONTEXT_H */
diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h
index 7c722bda3744f6d60ef099515267a89d650f35f0..b7e46ee0459243f4407233cfc8ecc1e1c009cd03 100644
--- a/src/secret/secret_driver.h
+++ b/src/secret/secret_driver.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SECRET_DRIVER_H__
-# define __VIR_SECRET_DRIVER_H__
+#ifndef LIBVIRT_SECRET_DRIVER_H
+# define LIBVIRT_SECRET_DRIVER_H
 
 int secretRegister(void);
 
-#endif /* __VIR_SECRET_DRIVER_H__ */
+#endif /* LIBVIRT_SECRET_DRIVER_H */
diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h
index 12b51b1aa2957ea8c2528f90376366ce45ce91d1..7219707390d5958b0d9a3381981e3d07f4ba9206 100644
--- a/src/secret/secret_util.h
+++ b/src/secret/secret_util.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_SECRET_UTIL_H__
-# define __VIR_SECRET_UTIL_H__
+#ifndef LIBVIRT_SECRET_UTIL_H
+# define LIBVIRT_SECRET_UTIL_H
 
 # include "internal.h"
 # include "virsecret.h"
@@ -32,4 +32,4 @@ int virSecretGetSecretString(virConnectPtr conn,
                              size_t *ret_secret_size)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
-#endif /* __VIR_SECRET_UTIL_H__ */
+#endif /* LIBVIRT_SECRET_UTIL_H */
diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h
index a3661a82ec5a84b7405b6cca1f0afab9e8ba2525..730f72ff987d6225d48c233a5115d1eab3ae4df7 100644
--- a/src/security/security_apparmor.h
+++ b/src/security/security_apparmor.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SECURITY_APPARMOR_H__
-# define __VIR_SECURITY_APPARMOR_H__
+#ifndef LIBVIRT_SECURITY_APPARMOR_H
+# define LIBVIRT_SECURITY_APPARMOR_H
 
 # include "security_driver.h"
 
@@ -27,4 +27,4 @@ extern virSecurityDriver virAppArmorSecurityDriver;
 # define PROFILE_NAME_SIZE  8 + VIR_UUID_STRING_BUFLEN /* AA_PREFIX + uuid */
 # define MAX_FILE_LEN       (1024*1024*10)  /* 10MB limit for sanity check */
 
-#endif /* __VIR_SECURITY_APPARMOR_H__ */
+#endif /* LIBVIRT_SECURITY_APPARMOR_H */
diff --git a/src/security/security_dac.h b/src/security/security_dac.h
index adc549432862b64a6c3e2b16a882888dd191d8f5..318ca06d755490d1f52575afa127a1007222364e 100644
--- a/src/security/security_dac.h
+++ b/src/security/security_dac.h
@@ -18,8 +18,8 @@
  * POSIX DAC security driver
  */
 
-#ifndef __VIR_SECURITY_DAC
-# define __VIR_SECURITY_DAC
+#ifndef LIBVIRT_SECURITY_DAC_H
+# define LIBVIRT_SECURITY_DAC_H
 
 # include "security_driver.h"
 
@@ -38,4 +38,4 @@ void virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
 void virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
                                     virSecurityManagerDACChownCallback chownCallback);
 
-#endif /* __VIR_SECURITY_DAC */
+#endif /* LIBVIRT_SECURITY_DAC_H */
diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index 1969f7f089726be70bfbb8d44df651106433fcc6..70c8cde50b3940cf7b82961d197b290f90ed858a 100644
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SECURITY_H__
-# define __VIR_SECURITY_H__
+#ifndef LIBVIRT_SECURITY_DRIVER_H
+# define LIBVIRT_SECURITY_DRIVER_H
 
 # include "internal.h"
 # include "domain_conf.h"
@@ -223,4 +223,4 @@ struct _virSecurityDriver {
 virSecurityDriverPtr virSecurityDriverLookup(const char *name,
                                              const char *virtDriver);
 
-#endif /* __VIR_SECURITY_H__ */
+#endif /* LIBVIRT_SECURITY_DRIVER_H */
diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 23815ccdedb1e7234f1fd30b964bae148c6b6585..f7beb29f865259a0ba2484a35954e07b32a99d30 100644
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIR_SECURITY_MANAGER_H__
-# define VIR_SECURITY_MANAGER_H__
+#ifndef LIBVIRT_SECURITY_MANAGER_H
+# define LIBVIRT_SECURITY_MANAGER_H
 
 # include "domain_conf.h"
 # include "vircommand.h"
@@ -208,4 +208,4 @@ void
 virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr,
                                  virSecurityManagerMetadataLockStatePtr *state);
 
-#endif /* VIR_SECURITY_MANAGER_H__ */
+#endif /* LIBVIRT_SECURITY_MANAGER_H */
diff --git a/src/security/security_nop.h b/src/security/security_nop.h
index 514b3394674a2be68d7916b3bd9cf6ba18e4945b..31e46420b1070081cdf7e53e97281920fe60ad77 100644
--- a/src/security/security_nop.h
+++ b/src/security/security_nop.h
@@ -17,11 +17,11 @@
  *
  */
 
-#ifndef __VIR_SECURITY_NOP_H__
-# define __VIR_SECURITY_NOP_H__
+#ifndef LIBVIRT_SECURITY_NOP_H
+# define LIBVIRT_SECURITY_NOP_H
 
 # include "security_driver.h"
 
 extern virSecurityDriver virSecurityDriverNop;
 
-#endif /* __VIR_SECURITY_NOP_H__ */
+#endif /* LIBVIRT_SECURITY_NOP_H */
diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h
index 3d46289849cf82eba946a1a5049ae14f368aaf3b..dfd2b73baada27ac4e60e5d197114d35a1a87dc2 100644
--- a/src/security/security_selinux.h
+++ b/src/security/security_selinux.h
@@ -16,9 +16,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SECURITY_SELINUX_H__
-# define __VIR_SECURITY_SELINUX_H__
+#ifndef LIBVIRT_SECURITY_SELINUX_H
+# define LIBVIRT_SECURITY_SELINUX_H
 
 extern virSecurityDriver virSecurityDriverSELinux;
 
-#endif /* __VIR_SECURITY_SELINUX_H__ */
+#endif /* LIBVIRT_SECURITY_SELINUX_H */
diff --git a/src/security/security_stack.h b/src/security/security_stack.h
index 633182fdd846dd7f64930cda8758e8e905fce74a..8c264d967a0cf9c5834af3d4679d80b0d4c6a71d 100644
--- a/src/security/security_stack.h
+++ b/src/security/security_stack.h
@@ -18,8 +18,8 @@
  * Stacked security driver
  */
 
-#ifndef __VIR_SECURITY_STACK
-# define __VIR_SECURITY_STACK
+#ifndef LIBVIRT_SECURITY_STACK_H
+# define LIBVIRT_SECURITY_STACK_H
 
 # include "security_driver.h"
 
@@ -35,4 +35,4 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr);
 virSecurityManagerPtr*
 virSecurityStackGetNested(virSecurityManagerPtr mgr);
 
-#endif /* __VIR_SECURITY_STACK */
+#endif /* LIBVIRT_SECURITY_STACK_H */
diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index 6e74f855236373868cf6e6c616227462d472241a..2b178494ae31c1f9ddad44aab30051d0f1f29699 100644
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_H__
-# define __VIR_STORAGE_BACKEND_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_H
+# define LIBVIRT_STORAGE_BACKEND_H
 
 # include <sys/stat.h>
 
@@ -126,4 +126,4 @@ int virStorageBackendDriversRegister(bool allmodules);
 
 int virStorageBackendRegister(virStorageBackendPtr backend);
 
-#endif /* __VIR_STORAGE_BACKEND_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_H */
diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h
index 6b450e6352b7cddc4b91f40513f9da5ab967b533..71c3bcaa2b305f595ebcf5ec2202309a17dedc59 100644
--- a/src/storage/storage_backend_disk.h
+++ b/src/storage/storage_backend_disk.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_DISK_H__
-# define __VIR_STORAGE_BACKEND_DISK_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_DISK_H
+# define LIBVIRT_STORAGE_BACKEND_DISK_H
 
 int virStorageBackendDiskRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_DISK_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_DISK_H */
diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h
index e942f057e2e299024e0218928c10335bb98d419c..638c16a01ec26b2a08fe187ea58e317097dc7163 100644
--- a/src/storage/storage_backend_fs.h
+++ b/src/storage/storage_backend_fs.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_FS_H__
-# define __VIR_STORAGE_BACKEND_FS_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_FS_H
+# define LIBVIRT_STORAGE_BACKEND_FS_H
 
 int virStorageBackendFsRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_FS_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_FS_H */
diff --git a/src/storage/storage_backend_gluster.h b/src/storage/storage_backend_gluster.h
index 91b8d8275d7249a62895f33d04284e66caa729d3..586d6e94dd3d12b7da256c7029f480ae321c2fa1 100644
--- a/src/storage/storage_backend_gluster.h
+++ b/src/storage/storage_backend_gluster.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIR_STORAGE_BACKEND_GLUSTER_H__
-# define __VIR_STORAGE_BACKEND_GLUSTER_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_GLUSTER_H
+# define LIBVIRT_STORAGE_BACKEND_GLUSTER_H
 
 int virStorageBackendGlusterRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_GLUSTER_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_GLUSTER_H */
diff --git a/src/storage/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h
index e0935e65586883bb63d64d9f95290df2b1c6c7bd..4b04d1b81d7ca57644e569e8a2ccddc894feecd3 100644
--- a/src/storage/storage_backend_iscsi.h
+++ b/src/storage/storage_backend_iscsi.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_ISCSI_H__
-# define __VIR_STORAGE_BACKEND_ISCSI_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_H
+# define LIBVIRT_STORAGE_BACKEND_ISCSI_H
 
 int virStorageBackendISCSIRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_H */
diff --git a/src/storage/storage_backend_iscsi_direct.h b/src/storage/storage_backend_iscsi_direct.h
index eb56e857ec9842a13f7190953fb56fee7ffa4ac1..07c8acad9d629188077fc58080931a8cc9463021 100644
--- a/src/storage/storage_backend_iscsi_direct.h
+++ b/src/storage/storage_backend_iscsi_direct.h
@@ -14,9 +14,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_ISCSI_H__
-# define __VIR_STORAGE_BACKEND_ISCSI_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H
+# define LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H
 
 int virStorageBackendISCSIDirectRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H */
diff --git a/src/storage/storage_backend_logical.h b/src/storage/storage_backend_logical.h
index 6d0edd03b45335f2b55eaa2f2c9dd4246286fc59..79374c6ca386e1db51a803787fa60b8dd458709b 100644
--- a/src/storage/storage_backend_logical.h
+++ b/src/storage/storage_backend_logical.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_LOGICAL_H__
-# define __VIR_STORAGE_BACKEND_LOGICAL_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_LOGICAL_H
+# define LIBVIRT_STORAGE_BACKEND_LOGICAL_H
 
 int virStorageBackendLogicalRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_LOGICAL_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_LOGICAL_H */
diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h
index dfd322521741297603a204a4b2268ea4baf34207..39afa99964a0408392614e23edee0953d831c461 100644
--- a/src/storage/storage_backend_mpath.h
+++ b/src/storage/storage_backend_mpath.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_MPATH_H__
-# define __VIR_STORAGE_BACKEND_MPATH_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_MPATH_H
+# define LIBVIRT_STORAGE_BACKEND_MPATH_H
 
 int virStorageBackendMpathRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_MPATH_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_MPATH_H */
diff --git a/src/storage/storage_backend_rbd.h b/src/storage/storage_backend_rbd.h
index fb92ca3e1042333186715f2dd3af5b1c72a2a655..1b53d3c65c500d580df85643670c8c0e3a3a13ba 100644
--- a/src/storage/storage_backend_rbd.h
+++ b/src/storage/storage_backend_rbd.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_RBD_H__
-# define __VIR_STORAGE_BACKEND_RBD_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_RBD_H
+# define LIBVIRT_STORAGE_BACKEND_RBD_H
 
 int virStorageBackendRBDRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_RBD_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_RBD_H */
diff --git a/src/storage/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h
index af98fa502fa66ba1d63938ee82e04e2732df459a..7daa2221db0303561768405b976d7dbd7a15828e 100644
--- a/src/storage/storage_backend_scsi.h
+++ b/src/storage/storage_backend_scsi.h
@@ -19,9 +19,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_SCSI_H__
-# define __VIR_STORAGE_BACKEND_SCSI_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_SCSI_H
+# define LIBVIRT_STORAGE_BACKEND_SCSI_H
 
 int virStorageBackendSCSIRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_SCSI_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_SCSI_H */
diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 96d825cc1da77d4fbbe767c90d33d8426c311b2c..b6f424bea1aacf6e3f0f1f219bb8377b707b1012 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -25,7 +25,7 @@
 
 #include "virerror.h"
 #include "storage_backend_sheepdog.h"
-#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__
+#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
 #include "storage_backend_sheepdog_priv.h"
 #include "storage_conf.h"
 #include "vircommand.h"
diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h
index a023c07460fd2d1f9467d3f6f402bee4e3b28d48..e09ad14d1ee5ee7a0eb7efe156f7648854bcfd96 100644
--- a/src/storage/storage_backend_sheepdog.h
+++ b/src/storage/storage_backend_sheepdog.h
@@ -20,9 +20,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_H__
-# define __VIR_STORAGE_BACKEND_SHEEPDOG_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H
+# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H
 
 int virStorageBackendSheepdogRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H */
diff --git a/src/storage/storage_backend_sheepdog_priv.h b/src/storage/storage_backend_sheepdog_priv.h
index 7dc2d7db3c954017158c5adadf1814e89a754444..9f2883593445e6553505f4a0e49c3698035c2ac4 100644
--- a/src/storage/storage_backend_sheepdog_priv.h
+++ b/src/storage/storage_backend_sheepdog_priv.h
@@ -16,12 +16,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
 # error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites"
-#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW */
 
-#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__
-# define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H
+# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H
 
 # include "conf/storage_conf.h"
 
@@ -30,4 +30,4 @@ int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool,
 int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol,
                                           char *output);
 
-#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H */
diff --git a/src/storage/storage_backend_vstorage.h b/src/storage/storage_backend_vstorage.h
index 0a29c597fdc39ba2dd083030307c9c7f32474bcc..e6f5f821fa2fd981ad7b684fd165abc33eb86223 100644
--- a/src/storage/storage_backend_vstorage.h
+++ b/src/storage/storage_backend_vstorage.h
@@ -18,9 +18,9 @@
  *
  */
 
-#ifndef __VIR_STORAGE_BACKEND_VSTORAGE_H__
-# define __VIR_STORAGE_BACKEND_VSTORAGE_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_VSTORAGE_H
+# define LIBVIRT_STORAGE_BACKEND_VSTORAGE_H
 
 int virStorageBackendVstorageRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_VSTORAGE_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_VSTORAGE_H */
diff --git a/src/storage/storage_backend_zfs.h b/src/storage/storage_backend_zfs.h
index 076ff27998e61ee72f056e236273f19fce27f225..98388c5fcae87a6f1a450a450ee3d1e5bc1af71d 100644
--- a/src/storage/storage_backend_zfs.h
+++ b/src/storage/storage_backend_zfs.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIR_STORAGE_BACKEND_ZFS_H__
-# define __VIR_STORAGE_BACKEND_ZFS_H__
+#ifndef LIBVIRT_STORAGE_BACKEND_ZFS_H
+# define LIBVIRT_STORAGE_BACKEND_ZFS_H
 
 int virStorageBackendZFSRegister(void);
 
-#endif /* __VIR_STORAGE_BACKEND_ZFS_H__ */
+#endif /* LIBVIRT_STORAGE_BACKEND_ZFS_H */
diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h
index b5f82dde2e6785e035e029c4821c9cdc4392249f..75632adee59c1448304897fc90b59a07fceea8d6 100644
--- a/src/storage/storage_driver.h
+++ b/src/storage/storage_driver.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_DRIVER_H__
-# define __VIR_STORAGE_DRIVER_H__
+#ifndef LIBVIRT_STORAGE_DRIVER_H
+# define LIBVIRT_STORAGE_DRIVER_H
 
 # include <sys/stat.h>
 
@@ -42,4 +42,4 @@ char *virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj,
 int storageRegister(void);
 int storageRegisterAll(void);
 
-#endif /* __VIR_STORAGE_DRIVER_H__ */
+#endif /* LIBVIRT_STORAGE_DRIVER_H */
diff --git a/src/storage/storage_file_fs.h b/src/storage/storage_file_fs.h
index 6b86f68b24a58201229cef774cc2806bd1b70721..c51c875bc2fd5717c93256796df54319c86c4594 100644
--- a/src/storage/storage_file_fs.h
+++ b/src/storage/storage_file_fs.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_FILE_FS_H__
-# define __VIR_STORAGE_FILE_FS_H__
+#ifndef LIBVIRT_STORAGE_FILE_FS_H
+# define LIBVIRT_STORAGE_FILE_FS_H
 
 int virStorageFileFsRegister(void);
 
-#endif /* __VIR_STORAGE_FILE_FS_H__ */
+#endif /* LIBVIRT_STORAGE_FILE_FS_H */
diff --git a/src/storage/storage_file_gluster.h b/src/storage/storage_file_gluster.h
index a3955f957793dd34cc3de34ecc420afe6abf65d6..3e46cd1c1e3abb019bbe2aefca558ea440b2cf96 100644
--- a/src/storage/storage_file_gluster.h
+++ b/src/storage/storage_file_gluster.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIR_STORAGE_FILE_GLUSTER_H__
-# define __VIR_STORAGE_FILE_GLUSTER_H__
+#ifndef LIBVIRT_STORAGE_FILE_GLUSTER_H
+# define LIBVIRT_STORAGE_FILE_GLUSTER_H
 
 int virStorageFileGlusterRegister(void);
 
-#endif /* __VIR_STORAGE_FILE_GLUSTER_H__ */
+#endif /* LIBVIRT_STORAGE_FILE_GLUSTER_H */
diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
index d0cb5d988410019b00bedc1fd335bf36e65c5353..c872468135f8693dd0e7181b935c369b5cc8ac32 100644
--- a/src/storage/storage_util.h
+++ b/src/storage/storage_util.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_UTIL_H__
-# define __VIR_STORAGE_UTIL_H__
+#ifndef LIBVIRT_STORAGE_UTIL_H
+# define LIBVIRT_STORAGE_UTIL_H
 
 # include <sys/stat.h>
 
@@ -190,4 +190,4 @@ virStorageBackendLogicalChangeCmd(const char *cmdstr,
                                   virStoragePoolDefPtr def,
                                   bool on);
 
-#endif /* __VIR_STORAGE_UTIL_H__ */
+#endif /* LIBVIRT_STORAGE_UTIL_H */
diff --git a/src/test/test_driver.h b/src/test/test_driver.h
index df74433c3633b8cb32107c048d7a315a04a088d5..7201a40a52f0d276aa47c23cedf0dacdb2369a42 100644
--- a/src/test/test_driver.h
+++ b/src/test/test_driver.h
@@ -21,11 +21,11 @@
  * Daniel Berrange <berrange@redhat.com>
  */
 
-#ifndef __VIR_TEST_INTERNAL_H__
-# define __VIR_TEST_INTERNAL_H__
+#ifndef LIBVIRT_TEST_DRIVER_H
+# define LIBVIRT_TEST_DRIVER_H
 
 # include "internal.h"
 
 int testRegister(void);
 
-#endif /* __VIR_TEST_INTERNAL_H__ */
+#endif /* LIBVIRT_TEST_DRIVER_H */
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index e30171563088bb3f12e0edef659649d87bc2af22..a9520a6d3e0863495daf38f3ca1681af3dab3a74 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __UML_CONF_H
-# define __UML_CONF_H
+#ifndef LIBVIRT_UML_CONF_H
+# define LIBVIRT_UML_CONF_H
 
 # include "internal.h"
 # include "libvirt_internal.h"
@@ -79,4 +79,4 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
                                   struct uml_driver *driver,
                                   virDomainObjPtr dom);
 
-#endif /* __UML_CONF_H */
+#endif /* LIBVIRT_UML_CONF_H */
diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h
index 8f877b49c51e1de191fa6e751599467ede20d9cc..3a258f6658d162dabbebb07ed3bb12814df75ea2 100644
--- a/src/uml/uml_driver.h
+++ b/src/uml/uml_driver.h
@@ -19,11 +19,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UML_DRIVER_H
-# define UML_DRIVER_H
+#ifndef LIBVIRT_UML_DRIVER_H
+# define LIBVIRT_UML_DRIVER_H
 
 # include "internal.h"
 
 int umlRegister(void);
 
-#endif /* UML_DRIVER_H */
+#endif /* LIBVIRT_UML_DRIVER_H */
diff --git a/src/util/viralloc.h b/src/util/viralloc.h
index 9e45ab5f11dc9bcf14620e137c43244a43bcc9cf..aa1b92241deb087671c592ec15b7f430d6bdad20 100644
--- a/src/util/viralloc.h
+++ b/src/util/viralloc.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_MEMORY_H_
-# define __VIR_MEMORY_H_
+#ifndef LIBVIRT_VIRALLOC_H
+# define LIBVIRT_VIRALLOC_H
 
 # include "internal.h"
 
@@ -637,4 +637,4 @@ void virAllocTestHook(void (*func)(int, void*), void *data);
 # define VIR_AUTOPTR(type) \
     __attribute__((cleanup(VIR_AUTOPTR_FUNC_NAME(type)))) type *
 
-#endif /* __VIR_MEMORY_H_ */
+#endif /* LIBVIRT_VIRALLOC_H */
diff --git a/src/util/virarch.h b/src/util/virarch.h
index 3247a86d494e15e33d7086ec9a67f052d3ad3de4..638ca9f4849f22efac29164d138e4879a3b6b1e3 100644
--- a/src/util/virarch.h
+++ b/src/util/virarch.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_ARCH_H__
-# define __VIR_ARCH_H__
+#ifndef LIBVIRT_VIRARCH_H
+# define LIBVIRT_VIRARCH_H
 
 # include "internal.h"
 
@@ -108,4 +108,4 @@ virArch virArchFromString(const char *name);
 
 virArch virArchFromHost(void);
 
-#endif /* __VIR_ARCH_H__ */
+#endif /* LIBVIRT_VIRARCH_H */
diff --git a/src/util/virarptable.h b/src/util/virarptable.h
index 783c6e7abceb0255b6524c476d54ae3c59f660c6..4437b3544f0f469ea2c90e7b1f7a2a365de2d808 100644
--- a/src/util/virarptable.h
+++ b/src/util/virarptable.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_ARPTABLE_H__
-# define __VIR_ARPTABLE_H__
+#ifndef LIBVIRT_VIRARPTABLE_H
+# define LIBVIRT_VIRARPTABLE_H
 
 # include "internal.h"
 
@@ -41,4 +41,4 @@ struct _virArpTable {
 virArpTablePtr virArpTableGet(void);
 void virArpTableFree(virArpTablePtr table);
 
-#endif /* __VIR_ARPTABLE_H__ */
+#endif /* LIBVIRT_VIRARPTABLE_H */
diff --git a/src/util/viratomic.h b/src/util/viratomic.h
index f63436fb6b23b43a864759768b7eb03f0e23a60b..0b2b3df0814c50f8290cfa629be673ceaad54433 100644
--- a/src/util/viratomic.h
+++ b/src/util/viratomic.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef __VIR_ATOMIC_H__
-# define __VIR_ATOMIC_H__
+#ifndef LIBVIRT_VIRATOMIC_H
+# define LIBVIRT_VIRATOMIC_H
 
 # include "internal.h"
 
@@ -451,4 +451,4 @@ virAtomicIntXor(volatile unsigned int *atomic,
 
 # endif
 
-#endif /* __VIR_ATOMIC_H__ */
+#endif /* LIBVIRT_VIRATOMIC_H */
diff --git a/src/util/viraudit.h b/src/util/viraudit.h
index 9e3fc897714f05e450dc86d9b498307ed4f4a3fe..66605b16b5af6f904f23e1e10da811e5a54e8ebd 100644
--- a/src/util/viraudit.h
+++ b/src/util/viraudit.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __LIBVIRT_AUDIT_H__
-# define __LIBVIRT_AUDIT_H__
+#ifndef LIBVIRT_VIRAUDIT_H
+# define LIBVIRT_VIRAUDIT_H
 
 # include "internal.h"
 # include "virlog.h"
@@ -57,4 +57,4 @@ void virAuditClose(void);
 # define VIR_AUDIT_STR(str) \
     ((str) ? (str) : "?")
 
-#endif /* __LIBVIRT_AUDIT_H__ */
+#endif /* LIBVIRT_VIRAUDIT_H */
diff --git a/src/util/virauth.h b/src/util/virauth.h
index 268eb3492da51012701e1bcc542d87e8f8008b73..ebcca2cc019faa8087cfcfe9d86a8757480bd585 100644
--- a/src/util/virauth.h
+++ b/src/util/virauth.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_AUTH_H__
-# define __VIR_AUTH_H__
+#ifndef LIBVIRT_VIRAUTH_H
+# define LIBVIRT_VIRAUTH_H
 
 # include "internal.h"
 # include "viruri.h"
@@ -53,4 +53,4 @@ char * virAuthGetPasswordPath(const char *path,
                               const char *servicename,
                               const char *username,
                               const char *hostname);
-#endif /* __VIR_AUTH_H__ */
+#endif /* LIBVIRT_VIRAUTH_H */
diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index d02051d1d93a1680797c86a106f8920052ed6aa2..93bb4346169415ab8968d360f11b1727c8f3f875 100644
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_AUTHCONFIG_H__
-# define __VIR_AUTHCONFIG_H__
+#ifndef LIBVIRT_VIRAUTHCONFIG_H
+# define LIBVIRT_VIRAUTHCONFIG_H
 
 # include "internal.h"
 # include "viralloc.h"
@@ -43,4 +43,4 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
 
 VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree)
 
-#endif /* __VIR_AUTHCONFIG_H__ */
+#endif /* LIBVIRT_VIRAUTHCONFIG_H */
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 4318db6766c18af72305e09a9267f2b7ab823767..dfb30b3bc88590380ecd4594b503fd934f967263 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BITMAP_H__
-# define __BITMAP_H__
+#ifndef LIBVIRT_VIRBITMAP_H
+# define LIBVIRT_VIRBITMAP_H
 
 # include "internal.h"
 # include "viralloc.h"
@@ -156,4 +156,4 @@ void virBitmapShrink(virBitmapPtr map, size_t b);
 
 VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree)
 
-#endif /* __BITMAP_H__ */
+#endif /* LIBVIRT_VIRBITMAP_H */
diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index c662e8ea7206b252822ae1eaa0b304b01d04a91c..4b8111de8e6a7ac3a415c97cf57e64ffffa78478 100644
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -20,8 +20,8 @@
  * Daniel Veillard <veillard@redhat.com>
  */
 
-#ifndef __VIR_BUFFER_H__
-# define __VIR_BUFFER_H__
+#ifndef LIBVIRT_VIRBUFFER_H
+# define LIBVIRT_VIRBUFFER_H
 
 # include <stdarg.h>
 
@@ -123,4 +123,4 @@ void virBufferAddStr(virBufferPtr buf, const char *str);
 
 VIR_DEFINE_AUTOPTR_FUNC(virBuffer, virBufferFreeAndReset)
 
-#endif /* __VIR_BUFFER_H__ */
+#endif /* LIBVIRT_VIRBUFFER_H */
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 7aca8b8a1acf27c912b52aba347f0cc224c1557e..3ebb3b0a0feefe32c81283f07d4f9639d8a24a34 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -38,7 +38,7 @@
 # include <unistd.h>
 #endif /* __linux__ */
 
-#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
 
 #include "virutil.h"
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index 8309bf08d8bc854e2c78624b922da5b33eb810c3..372009de4a1afc0795e55f0bf0f04c929de973fa 100644
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CGROUP_H__
-# define __VIR_CGROUP_H__
+#ifndef LIBVIRT_VIRCGROUP_H
+# define LIBVIRT_VIRCGROUP_H
 
 # include "virutil.h"
 # include "virbitmap.h"
@@ -284,4 +284,4 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
 int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
 
 bool virCgroupControllerAvailable(int controller);
-#endif /* __VIR_CGROUP_H__ */
+#endif /* LIBVIRT_VIRCGROUP_H */
diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c
index 2e90781dc33aeb5bcf9c3d7600030ef80806948d..f85da0041dd16d4caa5c5cf2102e1467fed35cf4 100644
--- a/src/util/vircgroupbackend.c
+++ b/src/util/vircgroupbackend.c
@@ -20,9 +20,8 @@
 #include <config.h>
 
 #include "vircgroupbackend.h"
-#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
-#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
 #include "vircgroupv1.h"
 #include "vircgroupv2.h"
 #include "virerror.h"
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
index a825dc4be7a1344d2527df6bc646438027c8ca47..24b45be9bbff333acc9119c51927cc48a896877d 100644
--- a/src/util/vircgroupbackend.h
+++ b/src/util/vircgroupbackend.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CGROUP_BACKEND_H__
-# define __VIR_CGROUP_BACKEND_H__
+#ifndef LIBVIRT_VIRCGROUPBACKEND_H
+# define LIBVIRT_VIRCGROUPBACKEND_H
 
 # include "internal.h"
 
@@ -461,4 +461,4 @@ virCgroupBackendForController(virCgroupPtr group,
     } \
     return backend->func(group, ##__VA_ARGS__);
 
-#endif /* __VIR_CGROUP_BACKEND_H__ */
+#endif /* LIBVIRT_VIRCGROUPBACKEND_H */
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
index 0e615d3291aada72287cd64e82cb49088046c030..a6fb3bb9f8325d8e30e702639dffe692642420e4 100644
--- a/src/util/vircgrouppriv.h
+++ b/src/util/vircgrouppriv.h
@@ -19,12 +19,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+#ifndef LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 # error "vircgrouppriv.h may only be included by vircgroup.c or its test suite"
-#endif /* __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ */
+#endif /* LIBVIRT_VIRCGROUPPRIV_H_ALLOW */
 
-#ifndef __VIR_CGROUP_PRIV_H__
-# define __VIR_CGROUP_PRIV_H__
+#ifndef LIBVIRT_VIRCGROUPPRIV_H
+# define LIBVIRT_VIRCGROUPPRIV_H
 
 # include "vircgroup.h"
 # include "vircgroupbackend.h"
@@ -128,4 +128,4 @@ int virCgroupKillRecursiveInternal(virCgroupPtr group,
                                    const char *taskFile,
                                    bool dormdir);
 
-#endif /* __VIR_CGROUP_PRIV_H__ */
+#endif /* LIBVIRT_VIRCGROUPPRIV_H */
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 45378be34ba940a0b15564235d53beac7670b5d4..f6707e4894d8f1bcbff808d7fe40ab846a44903b 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -28,9 +28,8 @@
 
 #include "internal.h"
 
-#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
-#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
 
 #include "vircgroup.h"
 #include "vircgroupbackend.h"
diff --git a/src/util/vircgroupv1.h b/src/util/vircgroupv1.h
index 517517c1093335f2b71605591233abb095ed616f..b1f86b54925dcc549657f73b61ac3983552e02e7 100644
--- a/src/util/vircgroupv1.h
+++ b/src/util/vircgroupv1.h
@@ -18,10 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CGROUP_V1_H__
-# define __VIR_CGROUP_V1_H__
+#ifndef LIBVIRT_VIRCGROUPV1_H
+# define LIBVIRT_VIRCGROUPV1_H
 
 void
 virCgroupV1Register(void);
 
-#endif /* __VIR_CGROUP_V1_H__ */
+#endif /* LIBVIRT_VIRCGROUPV1_H */
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 81ef578549579ad530e685c1e7b57499f51ce781..cd58491da1feb9a29f79c439381b266e7da74401 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -26,9 +26,8 @@
 
 #include "internal.h"
 
-#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 #include "vircgrouppriv.h"
-#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
 
 #include "vircgroup.h"
 #include "vircgroupbackend.h"
diff --git a/src/util/vircgroupv2.h b/src/util/vircgroupv2.h
index a5d0bd09789d1e013ce32e45b490c517791994c4..a877d36a0194a70204396dea12ba51d30f9d191e 100644
--- a/src/util/vircgroupv2.h
+++ b/src/util/vircgroupv2.h
@@ -18,10 +18,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CGROUP_V2_H__
-# define __VIR_CGROUP_V2_H__
+#ifndef LIBVIRT_VIRCGROUPV2_H
+# define LIBVIRT_VIRCGROUPV2_H
 
 void
 virCgroupV2Register(void);
 
-#endif /* __VIR_CGROUP_V2_H__ */
+#endif /* LIBVIRT_VIRCGROUPV2_H */
diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h
index 74ba7e19dd1c6622476e4070bed6bd2160dfe925..e756c79a90f8916f17f900f691c9efc4716ac25a 100644
--- a/src/util/virclosecallbacks.h
+++ b/src/util/virclosecallbacks.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CLOSE_CALLBACKS__
-# define __VIR_CLOSE_CALLBACKS__
+#ifndef LIBVIRT_VIRCLOSECALLBACKS_H
+# define LIBVIRT_VIRCLOSECALLBACKS_H
 
 # include "conf/virdomainobjlist.h"
 
@@ -49,4 +49,4 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks,
                      virConnectPtr conn,
                      virDomainObjListPtr domains,
                      void *opaque);
-#endif /* __VIR_CLOSE_CALLBACKS__ */
+#endif /* LIBVIRT_VIRCLOSECALLBACKS_H */
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index de937f6f9aa91abb518eac98bfac9dcf37e1f5df..6f106df33b9a90a6243f3ba84c72f3dbb7ae3328 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -41,7 +41,7 @@
 # include <sys/apparmor.h>
 #endif
 
-#define __VIR_COMMAND_PRIV_H_ALLOW__
+#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"
 #include "virerror.h"
 #include "virutil.h"
diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 90bcc6c89dfb7dcc23cee09e26dda187a10185e2..f299acc775cfad9b4b5d4b286de1900fdedca031 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_COMMAND_H__
-# define __VIR_COMMAND_H__
+#ifndef LIBVIRT_VIRCOMMAND_H
+# define LIBVIRT_VIRCOMMAND_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -221,4 +221,4 @@ int virCommandRunNul(virCommandPtr cmd,
 
 VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree)
 
-#endif /* __VIR_COMMAND_H__ */
+#endif /* LIBVIRT_VIRCOMMAND_H */
diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h
index a21643555af4b0be57d70c977343acb91133062a..e2f4c1959605b7b3491427aaead4e445114e73ce 100644
--- a/src/util/vircommandpriv.h
+++ b/src/util/vircommandpriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __VIR_COMMAND_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # error "vircommandpriv.h may only be included by vircommand.c or test suites"
-#endif /* __VIR_COMMAND_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRCOMMANDPRIV_H_ALLOW */
 
-#ifndef __VIR_COMMAND_PRIV_H__
-# define __VIR_COMMAND_PRIV_H__
+#ifndef LIBVIRT_VIRCOMMANDPRIV_H
+# define LIBVIRT_VIRCOMMANDPRIV_H
 
 # include "vircommand.h"
 
@@ -40,4 +40,4 @@ void virCommandSetDryRun(virBufferPtr buf,
                          virCommandDryRunCallback cb,
                          void *opaque);
 
-#endif /* __VIR_COMMAND_PRIV_H__ */
+#endif /* LIBVIRT_VIRCOMMANDPRIV_H */
diff --git a/src/util/virconf.h b/src/util/virconf.h
index c672ad645d2fb5d70f5975fea9d7914ebc35d152..411b8d669bcb3ebb93ed2a977ef5b2ed431ca275 100644
--- a/src/util/virconf.h
+++ b/src/util/virconf.h
@@ -20,8 +20,8 @@
  * Daniel Veillard <veillard@redhat.com>
  */
 
-#ifndef __VIR_CONF_H__
-# define __VIR_CONF_H__
+#ifndef LIBVIRT_VIRCONF_H
+# define LIBVIRT_VIRCONF_H
 
 # include "virutil.h"
 
@@ -130,4 +130,4 @@ int virConfWriteMem(char *memory,
                     virConfPtr conf);
 int virConfLoadConfig(virConfPtr *conf, const char *name);
 
-#endif /* __VIR_CONF_H__ */
+#endif /* LIBVIRT_VIRCONF_H */
diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h
index e3c70d7d9a10b87817cabff3f2a910d1b76874f6..f816ab54355101962d4749a41f1aacbdb6d78ffe 100644
--- a/src/util/vircrypto.h
+++ b/src/util/vircrypto.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CRYPTO_H__
-# define __VIR_CRYPTO_H__
+#ifndef LIBVIRT_VIRCRYPTO_H
+# define LIBVIRT_VIRCRYPTO_H
 
 # include "internal.h"
 
@@ -65,4 +65,4 @@ int virCryptoEncryptData(virCryptoCipher algorithm,
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6)
     ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_CRYPTO_H__ */
+#endif /* LIBVIRT_VIRCRYPTO_H */
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 1c84b9c8bd72e22e70e288a9dbc69ef640a846be..691f1823876546affed8d6931daa39a9dd15d7e2 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#define __VIR_DBUS_PRIV_H_ALLOW__
+#define LIBVIRT_VIRDBUSPRIV_H_ALLOW
 #include "virdbuspriv.h"
 #include "viralloc.h"
 #include "virerror.h"
diff --git a/src/util/virdbus.h b/src/util/virdbus.h
index 86b4223ffb4be47f6ad15564747b8b2662a46312..268a42afd4f1db94583638ccdb2b8529f82e122b 100644
--- a/src/util/virdbus.h
+++ b/src/util/virdbus.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_DBUS_H__
-# define __VIR_DBUS_H__
+#ifndef LIBVIRT_VIRDBUS_H
+# define LIBVIRT_VIRDBUS_H
 
 # ifdef WITH_DBUS
 #  undef interface /* Work around namespace pollution in mingw's rpc.h */
@@ -75,4 +75,4 @@ int virDBusIsServiceEnabled(const char *name);
 int virDBusIsServiceRegistered(const char *name);
 
 bool virDBusErrorIsUnknownMethod(virErrorPtr err);
-#endif /* __VIR_DBUS_H__ */
+#endif /* LIBVIRT_VIRDBUS_H */
diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h
index 5f97a4967681ba3aa98c265fc610e75ab09baf1d..4f0140c5207eec91a16195cc4fbad21e77f8d26c 100644
--- a/src/util/virdbuspriv.h
+++ b/src/util/virdbuspriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __VIR_DBUS_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRDBUSPRIV_H_ALLOW
 # error "virdbuspriv.h may only be included by virdbus.c or test suites"
-#endif /* __VIR_DBUS_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */
 
-#ifndef __VIR_DBUS_PRIV_H__
-# define __VIR_DBUS_PRIV_H__
+#ifndef LIBVIRT_VIRDBUSPRIV_H
+# define LIBVIRT_VIRDBUSPRIV_H
 
 # include "virdbus.h"
 
@@ -60,4 +60,4 @@ int virDBusMessageDecode(DBusMessage* msg,
                          const char *types,
                          ...);
 
-#endif /* __VIR_DBUS_PRIV_H__ */
+#endif /* LIBVIRT_VIRDBUSPRIV_H */
diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
index f15242b2b07095df53defbc4aff1dffc3f1da959..d9e1c1775ad6cb2eae709c463207fa0de4b7e308 100644
--- a/src/util/virdevmapper.h
+++ b/src/util/virdevmapper.h
@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_DEVMAPPER_H__
-# define __VIR_DEVMAPPER_H__
+#ifndef LIBVIRT_VIRDEVMAPPER_H
+# define LIBVIRT_VIRDEVMAPPER_H
 
 int
 virDevMapperGetTargets(const char *path,
                        char ***devPaths);
 
-#endif /* __VIR_DEVMAPPER_H__ */
+#endif /* LIBVIRT_VIRDEVMAPPER_H */
diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h
index efd8ee0f62b9b98e6ddce1be42a45e5621a5b9fc..74774743fa27b2204a16d14cfc0beef489b9052c 100644
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -21,8 +21,8 @@
  * based on iptables.h
  */
 
-#ifndef __DNSMASQ_H__
-# define __DNSMASQ_H__
+#ifndef LIBVIRT_VIRDNSMASQ_H
+# define LIBVIRT_VIRDNSMASQ_H
 
 # include "virobject.h"
 # include "virsocketaddr.h"
@@ -119,4 +119,4 @@ unsigned long dnsmasqCapsGetVersion(dnsmasqCapsPtr caps);
     (dnsmasqCapsGetVersion(CAPS) >= \
      (DNSMASQ_RA_MAJOR_REQD * 1000000) + \
      (DNSMASQ_RA_MINOR_REQD * 1000))
-#endif /* __DNSMASQ_H__ */
+#endif /* LIBVIRT_VIRDNSMASQ_H */
diff --git a/src/util/virebtables.h b/src/util/virebtables.h
index b8cb584963fdf8feafafe9cbef14e29e2cafb3da..87bb3a3708b626909d2737a1ccf6b126878c0b16 100644
--- a/src/util/virebtables.h
+++ b/src/util/virebtables.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __QEMUD_EBTABLES_H__
-# define __QEMUD_EBTABLES_H__
+#ifndef LIBVIRT_VIREBTABLES_H
+# define LIBVIRT_VIREBTABLES_H
 
 # include "virmacaddr.h"
 
@@ -38,4 +38,4 @@ int              ebtablesRemoveForwardAllowIn    (ebtablesContext *ctx,
 
 int              ebtablesAddForwardPolicyReject(ebtablesContext *ctx);
 
-#endif /* __QEMUD_EBTABLES_H__ */
+#endif /* LIBVIRT_VIREBTABLES_H */
diff --git a/src/util/virendian.h b/src/util/virendian.h
index 25c2f1ab1d48720d958c9b6facc571e1739d861f..4a92b1822da8645482426add0107a6a3d823e494 100644
--- a/src/util/virendian.h
+++ b/src/util/virendian.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_ENDIAN_H__
-# define __VIR_ENDIAN_H__
+#ifndef LIBVIRT_VIRENDIAN_H
+# define LIBVIRT_VIRENDIAN_H
 
 # include "internal.h"
 
@@ -114,4 +114,4 @@
     ((uint16_t)(uint8_t)((buf)[0]) | \
      ((uint16_t)(uint8_t)((buf)[1]) << 8))
 
-#endif /* __VIR_ENDIAN_H__ */
+#endif /* LIBVIRT_VIRENDIAN_H */
diff --git a/src/util/virerror.h b/src/util/virerror.h
index ff5bde9b10bad0811d1022c57bd40d501cab7491..d9d3109a4c4442a4e7d5a1e355de543fd65562b2 100644
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIRT_ERROR_H_
-# define __VIRT_ERROR_H_
+#ifndef LIBVIRT_VIRERROR_H
+# define LIBVIRT_VIRERROR_H
 
 # include "internal.h"
 # include "viralloc.h"
@@ -208,4 +208,4 @@ void virErrorRestore(virErrorPtr *savederr);
 
 VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError)
 
-#endif /* __VIRT_ERROR_H_ */
+#endif /* LIBVIRT_VIRERROR_H */
diff --git a/src/util/virevent.h b/src/util/virevent.h
index e26871a2acc865d4443f205e2ec994d541328165..37d70709352253da275f9b458fa328e46ef634ae 100644
--- a/src/util/virevent.h
+++ b/src/util/virevent.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_EVENT_H__
-# define __VIR_EVENT_H__
+#ifndef LIBVIRT_VIREVENT_H
+# define LIBVIRT_VIREVENT_H
 # include "internal.h"
 
-#endif /* __VIR_EVENT_H__ */
+#endif /* LIBVIRT_VIREVENT_H */
diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h
index 199a658c2eb6376368d388cb7cb7b2f5eaaef242..ad1ee56e7c57fad58cc437920ca465737e37955c 100644
--- a/src/util/vireventpoll.h
+++ b/src/util/vireventpoll.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_EVENT_POLL_H__
-# define __VIR_EVENT_POLL_H__
+#ifndef LIBVIRT_VIREVENTPOLL_H
+# define LIBVIRT_VIREVENTPOLL_H
 
 # include "internal.h"
 
@@ -127,4 +127,4 @@ int virEventPollToNativeEvents(int events);
 int virEventPollInterrupt(void);
 
 
-#endif /* __VIR_EVENT_POLL_H__ */
+#endif /* LIBVIRT_VIREVENTPOLL_H */
diff --git a/src/util/virfcp.h b/src/util/virfcp.h
index fab6e9403b6ef53a1613e50c156f46d907e8cdf9..16a6b2d42ebbdab1c7a6e322e9899760675e8990 100644
--- a/src/util/virfcp.h
+++ b/src/util/virfcp.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_FCP_H__
-# define __VIR_FCP_H__
+#ifndef LIBVIRT_VIRFCP_H
+# define LIBVIRT_VIRFCP_H
 
 bool
 virFCIsCapableRport(const char *rport);
@@ -29,4 +29,4 @@ virFCReadRportValue(const char *rport,
                     const char *entry,
                     char **result);
 
-#endif /* __VIR_FCP_H__ */
+#endif /* LIBVIRT_VIRFCP_H */
diff --git a/src/util/virfdstream.h b/src/util/virfdstream.h
index 905975ff1e272927ccc5be760b1b0af82f668e3e..093db303ff6822558efe45700068b341fd7c34d7 100644
--- a/src/util/virfdstream.h
+++ b/src/util/virfdstream.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_FDSTREAM_H_
-# define __VIR_FDSTREAM_H_
+#ifndef LIBVIRT_VIRFDSTREAM_H
+# define LIBVIRT_VIRFDSTREAM_H
 
 # include "internal.h"
 
@@ -65,4 +65,4 @@ int virFDStreamSetInternalCloseCb(virStreamPtr st,
                                   virFDStreamInternalCloseCb cb,
                                   void *opaque,
                                   virFDStreamInternalCloseCbFreeOpaque fcb);
-#endif /* __VIR_FDSTREAM_H_ */
+#endif /* LIBVIRT_VIRFDSTREAM_H */
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 795c339356c9b3e506455c9fef7b7059e96c2dd0..04b3e4dfb39d1cc3ddac2be8ce667bd9377151f1 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __VIR_FILE_H_
-# define __VIR_FILE_H_
+#ifndef LIBVIRT_VIRFILE_H
+# define LIBVIRT_VIRFILE_H
 
 # include <dirent.h>
 
@@ -382,4 +382,4 @@ int virFileInData(int fd,
 
 VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree)
 
-#endif /* __VIR_FILE_H_ */
+#endif /* LIBVIRT_VIRFILE_H */
diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h
index af6a189d7f900af6534a74d8c2f2e428cd5278d9..70c8a4bffe55954cea247ba51d3f1122622928ba 100644
--- a/src/util/virfilecache.h
+++ b/src/util/virfilecache.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_FILE_CACHE_H__
-# define __VIR_FILE_CACHE_H__
+#ifndef LIBVIRT_VIRFILECACHE_H
+# define LIBVIRT_VIRFILECACHE_H
 
 # include "internal.h"
 
@@ -134,4 +134,4 @@ virFileCacheInsertData(virFileCachePtr cache,
                        const char *name,
                        void *data);
 
-#endif /* __VIR_FILE_CACHE_H__ */
+#endif /* LIBVIRT_VIRFILECACHE_H */
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index 8218a400d67a087c390a286ed4a764d36421b1a3..c25d2ddfad7c02212b98d020f75a3b03dece11d6 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -20,10 +20,9 @@
 
 #include <config.h>
 
-#define __VIR_FIREWALL_PRIV_H_ALLOW__
-
 #include <stdarg.h>
 
+#define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 #include "virfirewallpriv.h"
 #include "virerror.h"
 #include "virutil.h"
diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index c955a2d07aa3fc3f169728835679002fc61690c3..a1c45e04271d48536e46d78a846934f563fa3468 100644
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_FIREWALL_H__
-# define __VIR_FIREWALL_H__
+#ifndef LIBVIRT_VIRFIREWALL_H
+# define LIBVIRT_VIRFIREWALL_H
 
 # include "internal.h"
 # include "viralloc.h"
@@ -116,4 +116,4 @@ void virFirewallSetLockOverride(bool avoid);
 
 VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree)
 
-#endif /* __VIR_FIREWALL_H__ */
+#endif /* LIBVIRT_VIRFIREWALL_H */
diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h
index 1dca0c5e9aa87e5408a9be0cb3343b82dcb133d6..efa94a7da4ebe541f2aea4bd45c2ff66a93d64a0 100644
--- a/src/util/virfirewallpriv.h
+++ b/src/util/virfirewallpriv.h
@@ -18,12 +18,12 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_FIREWALL_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 # error "virfirewallpriv.h may only be included by virfirewall.c or test suites"
-#endif /* __VIR_FIREWALL_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRFIREWALLPRIV_H_ALLOW */
 
-#ifndef __VIR_FIREWALL_PRIV_H__
-# define __VIR_FIREWALL_PRIV_H__
+#ifndef LIBVIRT_VIRFIREWALLPRIV_H
+# define LIBVIRT_VIRFIREWALLPRIV_H
 
 # include "virfirewall.h"
 
@@ -39,4 +39,4 @@ typedef enum {
 
 int virFirewallSetBackend(virFirewallBackend backend);
 
-#endif /* __VIR_FIREWALL_PRIV_H__ */
+#endif /* LIBVIRT_VIRFIREWALLPRIV_H */
diff --git a/src/util/virfirmware.h b/src/util/virfirmware.h
index 0bff01333795e1b69d10ea4886c7a62dd4d9194a..784e34cc65268e192df4afb1424164d3ccdbd23c 100644
--- a/src/util/virfirmware.h
+++ b/src/util/virfirmware.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_FIRMWARE_H__
-# define __VIR_FIRMWARE_H__
+#ifndef LIBVIRT_VIRFIRMWARE_H
+# define LIBVIRT_VIRFIRMWARE_H
 
 # include "internal.h"
 
@@ -46,4 +46,4 @@ virFirmwareParseList(const char *list,
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 
-#endif /* __VIR_FIRMWARE_H__ */
+#endif /* LIBVIRT_VIRFIRMWARE_H */
diff --git a/src/util/virgettext.h b/src/util/virgettext.h
index 5e9cfd2719fc0264fcbd00f73e904f05fb774a00..fe5daa3fe2751d512b0caf68696147764e148a54 100644
--- a/src/util/virgettext.h
+++ b/src/util/virgettext.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_GETTEXT_H__
-# define __VIR_GETTEXT_H__
+#ifndef LIBVIRT_VIRGETTEXT_H
+# define LIBVIRT_VIRGETTEXT_H
 
 int virGettextInitialize(void);
 
-#endif /* __VIR_GETTEXT_H__ */
+#endif /* LIBVIRT_VIRGETTEXT_H */
diff --git a/src/util/virgic.h b/src/util/virgic.h
index 0e6fc4f5666b0d1e2b65aa3ca1083fa1e8c37032..371d04f708a9db4fd81ceea71b3c4ec7e4c52ea7 100644
--- a/src/util/virgic.h
+++ b/src/util/virgic.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_GIC_H__
-# define __VIR_GIC_H__
+#ifndef LIBVIRT_VIRGIC_H
+# define LIBVIRT_VIRGIC_H
 
 # include "virutil.h"
 
@@ -46,4 +46,4 @@ struct _virGICCapability {
     virGICImplementation implementation;
 };
 
-#endif /* __VIR_GIC_H__ */
+#endif /* LIBVIRT_VIRGIC_H */
diff --git a/src/util/virhash.h b/src/util/virhash.h
index 811b6c5b210599680c9e06754e071c64d5d66c1f..0c849561f8a8cf81a7922e1f48b188335057fdb6 100644
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -7,8 +7,8 @@
  * Copyright (C) 2000 Bjorn Reese and Daniel Veillard.
  */
 
-#ifndef __VIR_HASH_H__
-# define __VIR_HASH_H__
+#ifndef LIBVIRT_VIRHASH_H
+# define LIBVIRT_VIRHASH_H
 
 
 # include "viralloc.h"
@@ -199,4 +199,4 @@ void virHashValueFree(void *value, const void *name);
 
 VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree)
 
-#endif /* __VIR_HASH_H__ */
+#endif /* LIBVIRT_VIRHASH_H */
diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h
index f8171df2682897e63ff450524fc9476b7b512cc6..e512e04bac661f1b2f18addd86f643e3bf1a0e3b 100644
--- a/src/util/virhashcode.h
+++ b/src/util/virhashcode.h
@@ -25,12 +25,12 @@
  * clients can be both 64 or 32 bit at the same time.
  */
 
-#ifndef __VIR_HASH_CODE_H__
-# define __VIR_HASH_CODE_H__
+#ifndef LIBVIRT_VIRHASHCODE_H
+# define LIBVIRT_VIRHASHCODE_H
 
 # include "internal.h"
 
 uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed)
     ATTRIBUTE_NOINLINE;
 
-#endif /* __VIR_HASH_CODE_H__ */
+#endif /* LIBVIRT_VIRHASHCODE_H */
diff --git a/src/util/virhook.h b/src/util/virhook.h
index 64ae8c0adae0b3850382fc015d211e913a8bdeb7..034fb8f263df9a663c90e544e27b699ba160fd81 100644
--- a/src/util/virhook.h
+++ b/src/util/virhook.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_HOOKS_H__
-# define __VIR_HOOKS_H__
+#ifndef LIBVIRT_VIRHOOK_H
+# define LIBVIRT_VIRHOOK_H
 
 # include "internal.h"
 
@@ -105,4 +105,4 @@ int virHookPresent(int driver);
 int virHookCall(int driver, const char *id, int op, int sub_op,
                 const char *extra, const char *input, char **output);
 
-#endif /* __VIR_HOOKS_H__ */
+#endif /* LIBVIRT_VIRHOOK_H */
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 9e80c192ac8488ade01a918e85c3d0a7dc70e9da..6514c3d76543c82593fabb1c1b72f18709ad5c36 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -40,7 +40,7 @@
 
 #include "c-ctype.h"
 #include "viralloc.h"
-#define __VIR_HOSTCPU_PRIV_H_ALLOW__
+#define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW
 #include "virhostcpupriv.h"
 #include "physmem.h"
 #include "virerror.h"
diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index 9107bb32ff240c2bc1f8a17313644716ca6cc7d6..df6a7e789dccd4c8e580da055a13ec327470fed2 100644
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_HOSTCPU_H__
-# define __VIR_HOSTCPU_H__
+#ifndef LIBVIRT_VIRHOSTCPU_H
+# define LIBVIRT_VIRHOSTCPU_H
 
 # include "internal.h"
 # include "virarch.h"
@@ -66,4 +66,4 @@ int virHostCPUGetOnline(unsigned int cpu, bool *online);
 
 unsigned int virHostCPUGetMicrocodeVersion(void);
 
-#endif /* __VIR_HOSTCPU_H__ */
+#endif /* LIBVIRT_VIRHOSTCPU_H */
diff --git a/src/util/virhostcpupriv.h b/src/util/virhostcpupriv.h
index 52ab4a9fe0c9be1b288db0078e80bfc94d8bc578..980d4cb1fad23123f4e86aaf67b78b47fc22121f 100644
--- a/src/util/virhostcpupriv.h
+++ b/src/util/virhostcpupriv.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef __VIR_HOSTCPU_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW
 # error "virhostcpupriv.h may only be included by virhostcpu.c or test suites"
-#endif /* __VIR_HOSTCPU_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW */
 
-#ifndef __VIR_HOSTCPU_PRIV_H__
-# define __VIR_HOSTCPU_PRIV_H__
+#ifndef LIBVIRT_VIRHOSTCPUPRIV_H
+# define LIBVIRT_VIRHOSTCPUPRIV_H
 
 # include "virhostcpu.h"
 
@@ -44,4 +44,4 @@ int virHostCPUGetStatsLinux(FILE *procstat,
                             int *nparams);
 # endif
 
-#endif /* __VIR_HOSTCPU_PRIV_H__ */
+#endif /* LIBVIRT_VIRHOSTCPUPRIV_H */
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 93d7ccd88657306ecb896aa31ed067c2c6abc684..7263f320a2521f099b670c5555b21b7e532ecb36 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_HOSTDEV_H__
-# define __VIR_HOSTDEV_H__
+#ifndef LIBVIRT_VIRHOSTDEV_H
+# define LIBVIRT_VIRHOSTDEV_H
 
 # include "internal.h"
 
@@ -203,4 +203,4 @@ int virHostdevPCINodeDeviceReset(virHostdevManagerPtr mgr,
                                  virPCIDevicePtr pci)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-#endif /* __VIR_HOSTDEV_H__ */
+#endif /* LIBVIRT_VIRHOSTDEV_H */
diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h
index c5a3853fdf62b3e05f2aff35de686aefd776f754..cba1732d8d69a79dc97a15dbf6fc9e6bb835ef20 100644
--- a/src/util/virhostmem.h
+++ b/src/util/virhostmem.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_HOSTMEM_H__
-# define __VIR_HOSTMEM_H__
+#ifndef LIBVIRT_VIRHOSTMEM_H
+# define LIBVIRT_VIRHOSTMEM_H
 
 # include "internal.h"
 
@@ -55,4 +55,4 @@ int virHostMemAllocPages(unsigned int npages,
                          unsigned int cellCount,
                          bool add);
 
-#endif /* __VIR_HOSTMEM_H__ */
+#endif /* LIBVIRT_VIRHOSTMEM_H */
diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 63aa63d573cafc00b76ba23a4e4526f3b1807d12..e385eda62256a33f920dfd99e5ae2ce789246446 100644
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_IDENTITY_H__
-# define __VIR_IDENTITY_H__
+#ifndef LIBVIRT_VIRIDENTITY_H
+# define LIBVIRT_VIRIDENTITY_H
 
 # include "virobject.h"
 
@@ -105,4 +105,4 @@ int virIdentitySetSELinuxContext(virIdentityPtr ident,
                                  const char *context);
 
 
-#endif /* __VIR_IDENTITY_H__ */
+#endif /* LIBVIRT_VIRIDENTITY_H */
diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h
index 83170753da85e9740433a2d79eef59c2c1a0ed50..7ac627883a9fd021baf65c1894557ab28e29574a 100644
--- a/src/util/virinitctl.h
+++ b/src/util/virinitctl.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_INITCTL_H__
-# define __VIR_INITCTL_H__
+#ifndef LIBVIRT_VIRINITCTL_H
+# define LIBVIRT_VIRINITCTL_H
 
 typedef enum {
     VIR_INITCTL_RUNLEVEL_POWEROFF = 0,
@@ -35,4 +35,4 @@ typedef enum {
 
 int virInitctlSetRunLevel(virInitctlRunLevel level);
 
-#endif /* __VIR_INITCTL_H__ */
+#endif /* LIBVIRT_VIRINITCTL_H */
diff --git a/src/util/viriptables.h b/src/util/viriptables.h
index 477ec23d623f2471bfba843426fd8d7225a194e1..b978fe409bfefe3f09dff78234e38aa9b0f8e41b 100644
--- a/src/util/viriptables.h
+++ b/src/util/viriptables.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_IPTABLES_H__
-# define __VIR_IPTABLES_H__
+#ifndef LIBVIRT_VIRIPTABLES_H
+# define LIBVIRT_VIRIPTABLES_H
 
 # include "virsocketaddr.h"
 # include "virfirewall.h"
@@ -145,4 +145,4 @@ void             iptablesRemoveOutputFixUdpChecksum (virFirewallPtr fw,
                                                      const char *iface,
                                                      int port);
 
-#endif /* __VIR_IPTABLES_H__ */
+#endif /* LIBVIRT_VIRIPTABLES_H */
diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h
index 3fbf90663766c07667f0ec9989ea53d57d8d9d26..acf9ab18eb791f033d095e181b939e0a80517703 100644
--- a/src/util/viriscsi.h
+++ b/src/util/viriscsi.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_ISCSI_H__
-# define __VIR_ISCSI_H__
+#ifndef LIBVIRT_VIRISCSI_H
+# define LIBVIRT_VIRISCSI_H
 
 # include "internal.h"
 
@@ -69,4 +69,4 @@ virISCSINodeUpdate(const char *portal,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_ISCSI_H__ */
+#endif /* LIBVIRT_VIRISCSI_H */
diff --git a/src/util/virjson.h b/src/util/virjson.h
index 804cc0ce95407b2628d4aedbcf7fbf71d97eede3..a6768d904c76e3e5583cb38d16d882328394a724 100644
--- a/src/util/virjson.h
+++ b/src/util/virjson.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_JSON_H_
-# define __VIR_JSON_H_
+#ifndef LIBVIRT_VIRJSON_H
+# define LIBVIRT_VIRJSON_H
 
 # include "internal.h"
 # include "virbitmap.h"
@@ -158,4 +158,4 @@ virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json);
 
 VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree)
 
-#endif /* __VIR_JSON_H_ */
+#endif /* LIBVIRT_VIRJSON_H */
diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h
index 106dae7a08788afe8f7553a37c756b77a84433c5..7120fb96e60513477df015010a73fc97ecb5a73b 100644
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_UTIL_VIRTKEYCODE_H__
-# define __VIR_UTIL_VIRTKEYCODE_H__
+#ifndef LIBVIRT_VIRKEYCODE_H
+# define LIBVIRT_VIRKEYCODE_H
 
 # include "virutil.h"
 
@@ -30,4 +30,4 @@ int virKeycodeValueTranslate(virKeycodeSet from_codeset,
                         virKeycodeSet to_offset,
                         int key_value);
 
-#endif /* __VIR_UTIL_VIRTKEYCODE_H__ */
+#endif /* LIBVIRT_VIRKEYCODE_H */
diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h
index 457d50472a1a62952939d6907bd30ecfa14eabc7..ad82bd02d50aa151847ce7b0883218cc8e4d109a 100644
--- a/src/util/virkeyfile.h
+++ b/src/util/virkeyfile.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_KEYFILE_H__
-# define __VIR_KEYFILE_H__
+#ifndef LIBVIRT_VIRKEYFILE_H
+# define LIBVIRT_VIRKEYFILE_H
 
 # include "internal.h"
 
@@ -58,4 +58,4 @@ const char *virKeyFileGetValueString(virKeyFilePtr conf,
                                      const char *valuename)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
-#endif /* __VIR_KEYFILE_H__ */
+#endif /* LIBVIRT_VIRKEYFILE_H */
diff --git a/src/util/virkmod.h b/src/util/virkmod.h
index 608f1b884e7cbec1d663e03a41328d89099f253a..059af4fd5f00833135173c5f76d6fbcb66e6a5c5 100644
--- a/src/util/virkmod.h
+++ b/src/util/virkmod.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_KMOD_H__
-# define __VIR_KMOD_H__
+#ifndef LIBVIRT_VIRKMOD_H
+# define LIBVIRT_VIRKMOD_H
 
 # include "internal.h"
 
@@ -31,4 +31,4 @@ char *virKModUnload(const char *)
     ATTRIBUTE_NONNULL(1);
 bool virKModIsBlacklisted(const char *)
     ATTRIBUTE_NONNULL(1);
-#endif /* __VIR_KMOD_H__ */
+#endif /* LIBVIRT_VIRKMOD_H */
diff --git a/src/util/virlease.h b/src/util/virlease.h
index 9f151aed74b586c8d17661d632542e0f139503d9..9aa8095f834acdbdcc0f5edcbdfb486446eeb72c 100644
--- a/src/util/virlease.h
+++ b/src/util/virlease.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_LEASE_H_
-# define __VIR_LEASE_H_
+#ifndef LIBVIRT_VIRLEASE_H
+# define LIBVIRT_VIRLEASE_H
 
 # include "virjson.h"
 
@@ -42,4 +42,4 @@ int virLeaseNew(virJSONValuePtr *lease_ret,
                 const char *iaid,
                 const char *server_duid);
 
-#endif /* __VIR_LEASE_H_ */
+#endif /* LIBVIRT_VIRLEASE_H */
diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h
index 041cf203968ae0c8f331e15cf4a1789399138afe..8e6b61d486e4eb6cab260052ac4968ed5a4ccf0c 100644
--- a/src/util/virlockspace.h
+++ b/src/util/virlockspace.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_LOCK_SPACE_H__
-# define __VIR_LOCK_SPACE_H__
+#ifndef LIBVIRT_VIRLOCKSPACE_H
+# define LIBVIRT_VIRLOCKSPACE_H
 
 # include "internal.h"
 # include "virjson.h"
@@ -59,4 +59,4 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace,
 int virLockSpaceReleaseResourcesForOwner(virLockSpacePtr lockspace,
                                          pid_t owner);
 
-#endif /* __VIR_LOCK_SPACE_H__ */
+#endif /* LIBVIRT_VIRLOCKSPACE_H */
diff --git a/src/util/virlog.h b/src/util/virlog.h
index 1155d35663e42001c8e37428ed720edf7ef0557b..8edd39037859d316e15d482bc1b42302393d82b5 100644
--- a/src/util/virlog.h
+++ b/src/util/virlog.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIRTLOG_H_
-# define __VIRTLOG_H_
+#ifndef LIBVIRT_VIRLOG_H
+# define LIBVIRT_VIRLOG_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -239,4 +239,4 @@ int virLogParseOutputs(const char *src,
 int virLogParseFilters(const char *src,
                        virLogFilterPtr **filters) ATTRIBUTE_NONNULL(1);
 
-#endif /* __VIRTLOG_H_ */
+#endif /* LIBVIRT_VIRLOG_H */
diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 8369293e9687e29a6205720e7cfa68d09e5134b7..3999de3421fa03bfc7ed368769d7674d0afe78b6 100644
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_MACADDR_H__
-# define __VIR_MACADDR_H__
+#ifndef LIBVIRT_VIRMACADDR_H
+# define LIBVIRT_VIRMACADDR_H
 
 # include "internal.h"
 # include "viralloc.h"
@@ -66,4 +66,4 @@ void virMacAddrFree(virMacAddrPtr addr);
 
 VIR_DEFINE_AUTOPTR_FUNC(virMacAddr, virMacAddrFree)
 
-#endif /* __VIR_MACADDR_H__ */
+#endif /* LIBVIRT_VIRMACADDR_H */
diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h
index e34f98f6614ebff4e4cbab8c55d244a289765db6..68843b947a36f4766b7f5c8f4fdda96be1428fb4 100644
--- a/src/util/virmacmap.h
+++ b/src/util/virmacmap.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_MACMAP_H__
-# define __VIR_MACMAP_H__
+#ifndef LIBVIRT_VIRMACMAP_H
+# define LIBVIRT_VIRMACMAP_H
 
 typedef struct virMacMap virMacMap;
 typedef virMacMap *virMacMapPtr;
@@ -47,4 +47,4 @@ int virMacMapWriteFile(virMacMapPtr mgr,
 int virMacMapDumpStr(virMacMapPtr mgr,
                      char **str);
 
-#endif /* __VIR_MACMAP_H__ */
+#endif /* LIBVIRT_VIRMACMAP_H */
diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index c856ff5bdb5b21379b783d1cc9c8476de9b6e298..1c584712c4f3cf45b78d0f2b26017569ac1d095a 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_MDEV_H__
-# define __VIR_MDEV_H__
+#ifndef LIBVIRT_VIRMDEV_H
+# define LIBVIRT_VIRMDEV_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -140,4 +140,4 @@ virMediatedDeviceTypeReadAttrs(const char *sysfspath,
 VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree)
 VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree)
 
-#endif /* __VIR_MDEV_H__ */
+#endif /* LIBVIRT_VIRMDEV_H */
diff --git a/src/util/virmodule.h b/src/util/virmodule.h
index cccd836b414272e955d873a8a7b78407b91ef737..de9f8ec07e5157aec01d561f90b5796b781d276a 100644
--- a/src/util/virmodule.h
+++ b/src/util/virmodule.h
@@ -19,11 +19,11 @@
  *
  */
 
-#ifndef __VIR_MODULE_H__
-# define __VIR_MODULE_H__
+#ifndef LIBVIRT_VIRMODULE_H
+# define LIBVIRT_VIRMODULE_H
 
 int virModuleLoad(const char *path,
                   const char *regfunc,
                   bool required);
 
-#endif /* __VIR_MODULE_H__ */
+#endif /* LIBVIRT_VIRMODULE_H */
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 76f53a64707dce2d379eccd2dd9e20b513413ab4..7ffd872b94c1bb5aae78a574411f8b2695f837b1 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_H__
-# define __VIR_NETDEV_H__
+#ifndef LIBVIRT_VIRNETDEV_H
+# define LIBVIRT_VIRNETDEV_H
 
 # include <net/if.h>
 
@@ -313,4 +313,4 @@ int virNetDevRunEthernetScript(const char *ifname, const char *script)
 
 VIR_DEFINE_AUTOPTR_FUNC(virNetDevRxFilter, virNetDevRxFilterFree)
 
-#endif /* __VIR_NETDEV_H__ */
+#endif /* LIBVIRT_VIRNETDEV_H */
diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index 8e786eff9ea2bcb68e03c8013b305170125be317..d243d7262a94ef4e434a99c379c530555954b04f 100644
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_BANDWIDTH_H__
-# define __VIR_NETDEV_BANDWIDTH_H__
+#ifndef LIBVIRT_VIRNETDEVBANDWIDTH_H
+# define LIBVIRT_VIRNETDEVBANDWIDTH_H
 
 # include "internal.h"
 # include "virmacaddr.h"
@@ -74,4 +74,4 @@ int virNetDevBandwidthUpdateFilter(const char *ifname,
                                    unsigned int id)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
     ATTRIBUTE_RETURN_CHECK;
-#endif /* __VIR_NETDEV_BANDWIDTH_H__ */
+#endif /* LIBVIRT_VIRNETDEVBANDWIDTH_H */
diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h
index b2967f1d42dd184a115891232375bae6414a75b8..f8cc70e7f0a51cf168f54e6193c6f84f0a76d582 100644
--- a/src/util/virnetdevbridge.h
+++ b/src/util/virnetdevbridge.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_BRIDGE_H__
-# define __VIR_NETDEV_BRIDGE_H__
+#ifndef LIBVIRT_VIRNETDEVBRIDGE_H
+# define LIBVIRT_VIRNETDEVBRIDGE_H
 
 # include "internal.h"
 # include "virmacaddr.h"
@@ -89,4 +89,4 @@ int virNetDevBridgeFDBAdd(const virMacAddr *mac, const char *ifname,
 int virNetDevBridgeFDBDel(const virMacAddr *mac, const char *ifname,
                           unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
-#endif /* __VIR_NETDEV_BRIDGE_H__ */
+#endif /* LIBVIRT_VIRNETDEVBRIDGE_H */
diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h
index 8ef85f58c478f09ea91851cd43970d94cfcc350b..1ecb4eae01ae3dd5084898f3c7b88b72824271ac 100644
--- a/src/util/virnetdevip.h
+++ b/src/util/virnetdevip.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEVIP_H__
-# define __VIR_NETDEVIP_H__
+#ifndef LIBVIRT_VIRNETDEVIP_H
+# define LIBVIRT_VIRNETDEVIP_H
 
 # include "virsocketaddr.h"
 
@@ -97,4 +97,4 @@ int virNetDevIPInfoAddToDev(const char *ifname,
 VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree)
 VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree)
 
-#endif /* __VIR_NETDEVIP_H__ */
+#endif /* LIBVIRT_VIRNETDEVIP_H */
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index a31401563c12342b89b487e33ba2d85948d441bc..a8dbc85da4c67b1c390ba7445f4bd544700be6f5 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __UTIL_MACVTAP_H__
-# define __UTIL_MACVTAP_H__
+#ifndef LIBVIRT_VIRNETDEVMACVLAN_H
+# define LIBVIRT_VIRNETDEVMACVLAN_H
 
 # include "internal.h"
 # include "virmacaddr.h"
@@ -111,4 +111,4 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname,
                                                  virNetDevVPortProfileOp vmOp)
 ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
 ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
-#endif /* __UTIL_MACVTAP_H__ */
+#endif /* LIBVIRT_VIRNETDEVMACVLAN_H */
diff --git a/src/util/virnetdevmidonet.h b/src/util/virnetdevmidonet.h
index 7c44c045bd9409ceaa1191595f8da249db56ac28..dde72c065311b85cf551d767a7a658ffde7fe4c4 100644
--- a/src/util/virnetdevmidonet.h
+++ b/src/util/virnetdevmidonet.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_MIDONET_H__
-# define __VIR_NETDEV_MIDONET_H__
+#ifndef LIBVIRT_VIRNETDEVMIDONET_H
+# define LIBVIRT_VIRNETDEVMIDONET_H
 
 # include "internal.h"
 # include "virnetdevvportprofile.h"
@@ -30,4 +30,4 @@ int virNetDevMidonetBindPort(const char *ifname,
 int virNetDevMidonetUnbindPort(virNetDevVPortProfilePtr virtualport)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_NETDEV_MIDONET_H__ */
+#endif /* LIBVIRT_VIRNETDEVMIDONET_H */
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index edb61baa76e370aafb29ad2991d0d5a6d74483ea..c9428f9e3e1917a6480b73eebb5620d2ee38cfbc 100644
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_OPENVSWITCH_H__
-# define __VIR_NETDEV_OPENVSWITCH_H__
+#ifndef LIBVIRT_VIRNETDEVOPENVSWITCH_H
+# define LIBVIRT_VIRNETDEVOPENVSWITCH_H
 
 # include "internal.h"
 # include "virnetdevvportprofile.h"
@@ -65,4 +65,4 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                                    virNetDevVlanPtr virtVlan)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_NETDEV_OPENVSWITCH_H__ */
+#endif /* LIBVIRT_VIRNETDEVOPENVSWITCH_H */
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index b4e73f28e7befb0ec32ec3b3106db3d568d8a342..226122aa2c56c18ac4b6ac6dc43a1d450866e418 100644
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_TAP_H__
-# define __VIR_NETDEV_TAP_H__
+#ifndef LIBVIRT_VIRNETDEVTAP_H
+# define LIBVIRT_VIRNETDEVTAP_H
 
 # include "internal.h"
 # include "virnetdev.h"
@@ -92,4 +92,4 @@ int virNetDevTapInterfaceStats(const char *ifname,
                                bool swapped)
     ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_NETDEV_TAP_H__ */
+#endif /* LIBVIRT_VIRNETDEVTAP_H */
diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h
index 9e5d6adb15da478236d86e17b6d7c85ae892c7e6..b00eb2b3a2e8bb31657f41474a53ecdc8878ff95 100644
--- a/src/util/virnetdevveth.h
+++ b/src/util/virnetdevveth.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_VETH_H__
-# define __VIR_NETDEV_VETH_H__
+#ifndef LIBVIRT_VIRNETDEVVETH_H
+# define LIBVIRT_VIRNETDEVVETH_H
 
 # include "internal.h"
 
@@ -28,4 +28,4 @@ int virNetDevVethCreate(char **veth1, char **veth2)
 int virNetDevVethDelete(const char *veth)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* __VIR_NETDEV_VETH_H__ */
+#endif /* LIBVIRT_VIRNETDEVVETH_H */
diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index 73e1ab40ad474490f75bd6bf35cefb739d41a415..816edce5314d04ff3a4bc4c93e55534e3b037666 100644
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_VLAN_H__
-# define __VIR_NETDEV_VLAN_H__
+#ifndef LIBVIRT_VIRNETDEVVLAN_H
+# define LIBVIRT_VIRNETDEVVLAN_H
 
 # include <virutil.h>
 
@@ -50,4 +50,4 @@ int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src);
 
 VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree)
 
-#endif /* __VIR_NETDEV_VLAN_H__ */
+#endif /* LIBVIRT_VIRNETDEVVLAN_H */
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index 2c6f8584159e997c858b7afbf750f74a2a371352..da52d00708de935ef237587cc67dedee4f93aa5d 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETDEV_VPORT_PROFILE_H__
-# define __VIR_NETDEV_VPORT_PROFILE_H__
+#ifndef LIBVIRT_VIRNETDEVVPORTPROFILE_H
+# define LIBVIRT_VIRNETDEVVPORTPROFILE_H
 
 # include "internal.h"
 # include "viruuid.h"
@@ -108,4 +108,4 @@ int virNetDevVPortProfileDisassociate(const char *ifname,
     ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
 
 
-#endif /* __VIR_NETDEV_VPORT_PROFILE_H__ */
+#endif /* LIBVIRT_VIRNETDEVVPORTPROFILE_H */
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index fd140f0d57c37049f7366c62e27c2e5a040e3f55..debbd60f80f0ab2f35a03b8eff276ffef49c1887 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_NETLINK_H__
-# define __VIR_NETLINK_H__
+#ifndef LIBVIRT_VIRNETLINK_H
+# define LIBVIRT_VIRNETLINK_H
 
 # include "internal.h"
 # include "virmacaddr.h"
@@ -163,4 +163,4 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
 int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
                                 unsigned int protocol);
 
-#endif /* __VIR_NETLINK_H__ */
+#endif /* LIBVIRT_VIRNETLINK_H */
diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h
index 64558ab0a591a11831b65c0e1ffd9fa8543bdd17..c3e600ff8871c7454eaac04a84f89fb4a10a8bc2 100644
--- a/src/util/virnodesuspend.h
+++ b/src/util/virnodesuspend.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_NODE_SUSPEND_H__
-# define __VIR_NODE_SUSPEND_H__
+#ifndef LIBVIRT_VIRNODESUSPEND_H
+# define LIBVIRT_VIRNODESUSPEND_H
 
 # include "internal.h"
 
@@ -30,4 +30,4 @@ int virNodeSuspend(unsigned int target,
 
 int virNodeSuspendGetTargetMask(unsigned int *bitmask);
 
-#endif /* __VIR_NODE_SUSPEND_H__ */
+#endif /* LIBVIRT_VIRNODESUSPEND_H */
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
index edc206100f78c1f900638cb3458f658f880ec613..cd7a3ec11fd7a48728db798c4c919d625da01086 100644
--- a/src/util/virnuma.h
+++ b/src/util/virnuma.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_NUMA_H__
-# define __VIR_NUMA_H__
+#ifndef LIBVIRT_VIRNUMA_H
+# define LIBVIRT_VIRNUMA_H
 
 # include "internal.h"
 # include "virbitmap.h"
@@ -64,4 +64,4 @@ int virNumaSetPagePoolSize(int node,
                            unsigned int page_size,
                            unsigned long long page_count,
                            bool add);
-#endif /* __VIR_NUMA_H__ */
+#endif /* LIBVIRT_VIRNUMA_H */
diff --git a/src/util/virobject.h b/src/util/virobject.h
index 6c48fb6249d08ae4631bca15280296a89f6bbdb0..b39b9946fffa955ca0a7c5b52289a5c0d89f333e 100644
--- a/src/util/virobject.h
+++ b/src/util/virobject.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_OBJECT_H__
-# define __VIR_OBJECT_H__
+#ifndef LIBVIRT_VIROBJECT_H
+# define LIBVIRT_VIROBJECT_H
 
 # include "internal.h"
 # include "virthread.h"
@@ -152,4 +152,4 @@ void
 virObjectListFreeCount(void *list,
                        size_t count);
 
-#endif /* __VIR_OBJECT_H__ */
+#endif /* LIBVIRT_VIROBJECT_H */
diff --git a/src/util/virpci.h b/src/util/virpci.h
index 293eaa9b0a1b37a70be2207f63b4dec9b0454da6..5b6330788bf6ab4bb55e8e02f5707e5a44f36f58 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_PCI_H__
-# define __VIR_PCI_H__
+#ifndef LIBVIRT_VIRPCI_H
+# define LIBVIRT_VIRPCI_H
 
 # include "internal.h"
 # include "virmdev.h"
@@ -275,4 +275,4 @@ VIR_DEFINE_AUTOPTR_FUNC(virPCIDevice, virPCIDeviceFree)
 VIR_DEFINE_AUTOPTR_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree)
 VIR_DEFINE_AUTOPTR_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree)
 
-#endif /* __VIR_PCI_H__ */
+#endif /* LIBVIRT_VIRPCI_H */
diff --git a/src/util/virperf.h b/src/util/virperf.h
index e926f91e0b170117d5b294f4317e996c1997f0af..0d026e80c207db15e520709848e90c01e0694c96 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_PERF_H__
-# define __VIR_PERF_H__
+#ifndef LIBVIRT_VIRPERF_H
+# define LIBVIRT_VIRPERF_H
 
 # include "virutil.h"
 # include "viralloc.h"
@@ -84,4 +84,4 @@ int virPerfReadEvent(virPerfPtr perf,
 
 VIR_DEFINE_AUTOPTR_FUNC(virPerf, virPerfFree)
 
-#endif /* __VIR_PERF_H__ */
+#endif /* LIBVIRT_VIRPERF_H */
diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h
index eb6516ca1503bec54c0a6026a411507441ed1985..6ff55e7b02727cad79b8e631e33ef281f5945038 100644
--- a/src/util/virpidfile.h
+++ b/src/util/virpidfile.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __VIR_PIDFILE_H__
-# define __VIR_PIDFILE_H__
+#ifndef LIBVIRT_VIRPIDFILE_H
+# define LIBVIRT_VIRPIDFILE_H
 
 # include <sys/types.h>
 # include "internal.h"
@@ -76,4 +76,4 @@ int virPidFileConstructPath(bool privileged,
 
 int virPidFileForceCleanupPath(const char *path) ATTRIBUTE_NONNULL(1);
 
-#endif /* __VIR_PIDFILE_H__ */
+#endif /* LIBVIRT_VIRPIDFILE_H */
diff --git a/src/util/virpolkit.h b/src/util/virpolkit.h
index 14ff0730d346762ce1e931530cf6f9dd66a4bb58..f23453401542a4f7f733e2ee0020667d0b67d610 100644
--- a/src/util/virpolkit.h
+++ b/src/util/virpolkit.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_POLKIT_H__
-# define __VIR_POLKIT_H__
+#ifndef LIBVIRT_VIRPOLKIT_H
+# define LIBVIRT_VIRPOLKIT_H
 
 # include "internal.h"
 # include "vircommand.h"
@@ -40,4 +40,4 @@ typedef virPolkitAgent *virPolkitAgentPtr;
 void virPolkitAgentDestroy(virPolkitAgentPtr cmd);
 virPolkitAgentPtr virPolkitAgentCreate(void);
 
-#endif /* __VIR_POLKIT_H__ */
+#endif /* LIBVIRT_VIRPOLKIT_H */
diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h
index de0209cdea1bdf38ee676b00e8f6d9ee20abc28a..3144b7bf98f7c5851c41b3f94953f4bf4d12f49b 100644
--- a/src/util/virportallocator.h
+++ b/src/util/virportallocator.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_PORT_ALLOCATOR_H__
-# define __VIR_PORT_ALLOCATOR_H__
+#ifndef LIBVIRT_VIRPORTALLOCATOR_H
+# define LIBVIRT_VIRPORTALLOCATOR_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -42,4 +42,4 @@ int virPortAllocatorRelease(unsigned short port);
 
 int virPortAllocatorSetUsed(unsigned short port);
 
-#endif /* __VIR_PORT_ALLOCATOR_H__ */
+#endif /* LIBVIRT_VIRPORTALLOCATOR_H */
diff --git a/src/util/virprobe.h b/src/util/virprobe.h
index 88cda2104f08be285f7ae678bca056830de026ea..5635e58252dca753b9d9203557b8056042f58a18 100644
--- a/src/util/virprobe.h
+++ b/src/util/virprobe.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_PROBE_H__
-# define __VIR_PROBE_H__
+#ifndef LIBVIRT_VIRPROBE_H
+# define LIBVIRT_VIRPROBE_H
 
 # include "internal.h"
 # include "virlog.h"
@@ -105,4 +105,4 @@
 #  define PROBE_QUIET(NAME, FMT, ...)
 # endif
 
-#endif /* __VIR_PROBE_H__ */
+#endif /* LIBVIRT_VIRPROBE_H */
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index b1166902f0ffcad19451df32bc078e43ab707317..e3944d3f1b87e0dc75f114ad3eb37f33aa942e27 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_PROCESS_H__
-# define __VIR_PROCESS_H__
+#ifndef LIBVIRT_VIRPROCESS_H
+# define LIBVIRT_VIRPROCESS_H
 
 # include <sys/types.h>
 
@@ -125,4 +125,4 @@ typedef enum {
 
 int virProcessNamespaceAvailable(unsigned int ns);
 
-#endif /* __VIR_PROCESS_H__ */
+#endif /* LIBVIRT_VIRPROCESS_H */
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
index 4a4d7e42cf750a6343bf5ccb79e0a33783744cb1..dc5497b6fde1f343e1fbaf95a9ab34f9ff2a3617 100644
--- a/src/util/virqemu.h
+++ b/src/util/virqemu.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VIR_QEMU_H_
-# define __VIR_QEMU_H_
+#ifndef LIBVIRT_VIRQEMU_H
+# define LIBVIRT_VIRQEMU_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -53,4 +53,4 @@ void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
                                       const char *alias)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
-#endif /* __VIR_QEMU_H_ */
+#endif /* LIBVIRT_VIRQEMU_H */
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index 8d1257906dd126f3a15cfd0fe014cea06c248a27..55cd0971ae3a77ec7e8027516c1b86d8351fda4c 100644
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_RANDOM_H__
-# define __VIR_RANDOM_H__
+#ifndef LIBVIRT_VIRRANDOM_H
+# define LIBVIRT_VIRRANDOM_H
 
 # include "internal.h"
 
@@ -28,4 +28,4 @@ int virRandomBytes(unsigned char *buf, size_t buflen)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE;
 int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_NOINLINE;
 
-#endif /* __VIR_RANDOM_H__ */
+#endif /* LIBVIRT_VIRRANDOM_H */
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index c823ebb6573311e363954c7aade7d7f616a02977..892b92559bb8c39a9849792a1b194b17ba8fe377 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#define __VIR_RESCTRL_PRIV_H_ALLOW__
+#define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW
 #include "virresctrlpriv.h"
 #include "viralloc.h"
 #include "virfile.h"
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 04202b5f092ade6cfbe68d689cda00150aae80d5..0aa8bf7ea3bfbe695cf0a10c42dc17d37ab5661c 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_RESCTRL_H__
-# define __VIR_RESCTRL_H__
+#ifndef LIBVIRT_VIRRESCTRL_H
+# define LIBVIRT_VIRRESCTRL_H
 
 # include "internal.h"
 
@@ -235,4 +235,4 @@ virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr monitor,
 void
 virResctrlMonitorFreeStats(virResctrlMonitorStatsPtr *stats,
                            size_t nstats);
-#endif /* __VIR_RESCTRL_H__ */
+#endif /* LIBVIRT_VIRRESCTRL_H */
diff --git a/src/util/virresctrlpriv.h b/src/util/virresctrlpriv.h
index f8743d81ea61cdfd63f0a1f6f81002b554cdd0f2..5f04c0c12ea86c68b85256c4ab8f64f2f5f1164e 100644
--- a/src/util/virresctrlpriv.h
+++ b/src/util/virresctrlpriv.h
@@ -16,16 +16,16 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_RESCTRL_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRRESCTRLPRIV_H_ALLOW
 # error "virresctrlpriv.h may only be included by virresctrl.c or test suites"
-#endif /* __VIR_RESCTRL_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRRESCTRLPRIV_H_ALLOW */
 
-#ifndef __VIR_RESCTRL_PRIV_H__
-# define __VIR_RESCTRL_PRIV_H__
+#ifndef LIBVIRT_VIRRESCTRLPRIV_H
+# define LIBVIRT_VIRRESCTRLPRIV_H
 
 # include "virresctrl.h"
 
 virResctrlAllocPtr
 virResctrlAllocGetUnused(virResctrlInfoPtr resctrl);
 
-#endif /* __VIR_RESCTRL_PRIV_H__ */
+#endif /* LIBVIRT_VIRRESCTRLPRIV_H */
diff --git a/src/util/virrotatingfile.h b/src/util/virrotatingfile.h
index 7848443101a6142b7d212b895576c688d7662477..1dc48fb947d23f009434aee3f962c343b53c4fba 100644
--- a/src/util/virrotatingfile.h
+++ b/src/util/virrotatingfile.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_ROTATING_FILE_H__
-# define __VIR_ROTATING_FILE_H__
+#ifndef LIBVIRT_VIRROTATINGFILE_H
+# define LIBVIRT_VIRROTATINGFILE_H
 
 # include "internal.h"
 
@@ -59,4 +59,4 @@ ssize_t virRotatingFileReaderConsume(virRotatingFileReaderPtr file,
 void virRotatingFileWriterFree(virRotatingFileWriterPtr file);
 void virRotatingFileReaderFree(virRotatingFileReaderPtr file);
 
-#endif /* __VIR_ROTATING_FILE_H__ */
+#endif /* LIBVIRT_VIRROTATINGFILE_H */
diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index 3cb50cb168f96c61fba99c7e3dec7bac5db0464b..fd5986d2c02225d504481f01dd7bdb4ed2d1d081 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SCSI_H__
-# define __VIR_SCSI_H__
+#ifndef LIBVIRT_VIRSCSI_H
+# define LIBVIRT_VIRSCSI_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -95,4 +95,4 @@ virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list,
 
 VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree)
 
-#endif /* __VIR_SCSI_H__ */
+#endif /* LIBVIRT_VIRSCSI_H */
diff --git a/src/util/virscsihost.h b/src/util/virscsihost.h
index c35ccb9f501d11fc123efa2afc3e151721cfb2a6..1e8b8803ced5ba4f06d6eea3becd620e9a2668b9 100644
--- a/src/util/virscsihost.h
+++ b/src/util/virscsihost.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SCSI_HOST_H__
-# define __VIR_SCSI_HOST_H__
+#ifndef LIBVIRT_VIRSCSIHOST_H
+# define LIBVIRT_VIRSCSIHOST_H
 
 # include "internal.h"
 
@@ -37,4 +37,4 @@ char *virSCSIHostGetNameByParentaddr(unsigned int domain,
                                      unsigned int function,
                                      unsigned int unique_id);
 
-#endif /* __VIR_SCSI_HOST_H__ */
+#endif /* LIBVIRT_VIRSCSIHOST_H */
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 7123de8bc86a1fb35a0fca1d3162d7b9cc086552..5440db16b2b933e5b34b0960ada30f8db53de8be 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SCSIHOST_H__
-# define __VIR_SCSIHOST_H__
+#ifndef LIBVIRT_VIRSCSIVHOST_H
+# define LIBVIRT_VIRSCSIVHOST_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -63,4 +63,4 @@ int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE;
 
 VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree)
 
-#endif /* __VIR_SCSIHOST_H__ */
+#endif /* LIBVIRT_VIRSCSIVHOST_H */
diff --git a/src/util/virseclabel.h b/src/util/virseclabel.h
index 94c4dfc39634713d9d64b0bb9e624ad311e3ebc9..4480def79e21d093082857f12b7cbea8883ca4e2 100644
--- a/src/util/virseclabel.h
+++ b/src/util/virseclabel.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SECLABEL_H
-# define __SECLABEL_H
+#ifndef LIBVIRT_VIRSECLABEL_H
+# define LIBVIRT_VIRSECLABEL_H
 
 typedef enum {
     VIR_DOMAIN_SECLABEL_DEFAULT,
@@ -68,4 +68,4 @@ virSecurityDeviceLabelDefCopy(const virSecurityDeviceLabelDef *src)
 void virSecurityLabelDefFree(virSecurityLabelDefPtr def);
 void virSecurityDeviceLabelDefFree(virSecurityDeviceLabelDefPtr def);
 
-#endif /* __SECLABEL_H */
+#endif /* LIBVIRT_VIRSECLABEL_H */
diff --git a/src/util/virsecret.h b/src/util/virsecret.h
index a56e0c0c5745d098b988c895877ca1f926f4d478..9fdd25b53c3cd87af01b8eb14adb6eeea95e6aab 100644
--- a/src/util/virsecret.h
+++ b/src/util/virsecret.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_SECRET_H__
-# define __VIR_SECRET_H__
+#ifndef LIBVIRT_VIRSECRET_H
+# define LIBVIRT_VIRSECRET_H
 
 # include "internal.h"
 
@@ -56,4 +56,4 @@ int virSecretLookupParseSecret(xmlNodePtr secretnode,
 void virSecretLookupFormatSecret(virBufferPtr buf,
                                  const char *secrettype,
                                  virSecretLookupTypeDefPtr def);
-#endif /* __VIR_SECRET_H__ */
+#endif /* LIBVIRT_VIRSECRET_H */
diff --git a/src/util/virsexpr.h b/src/util/virsexpr.h
index 7b8358cd7247dc34f0990a8c4f4b002591264223..4469207a75de2e0b22522d9548476c957ec5c282 100644
--- a/src/util/virsexpr.h
+++ b/src/util/virsexpr.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _LIBVIR_SEXPR_H_
-# define _LIBVIR_SEXPR_H_
+#ifndef LIBVIRT_VIRSEXPR_H
+# define LIBVIRT_VIRSEXPR_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -66,4 +66,4 @@ int sexpr_int(const struct sexpr *sexpr, const char *name);
 double sexpr_float(const struct sexpr *sexpr, const char *name);
 uint64_t sexpr_u64(const struct sexpr *sexpr, const char *name);
 
-#endif /* _LIBVIR_SEXPR_H_ */
+#endif /* LIBVIRT_VIRSEXPR_H */
diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index cfc79cf2ceebb7868fef6517c574b7c6373f970c..64bcbb36dc5c179290374a34694c4abb04dc0000 100644
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SOCKETADDR_H__
-# define __VIR_SOCKETADDR_H__
+#ifndef LIBVIRT_VIRSOCKETADDR_H
+# define LIBVIRT_VIRSOCKETADDR_H
 
 # include <netinet/in.h>
 # include <sys/socket.h>
@@ -162,4 +162,4 @@ void virSocketAddrFree(virSocketAddrPtr addr);
 
 VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree)
 
-#endif /* __VIR_SOCKETADDR_H__ */
+#endif /* LIBVIRT_VIRSOCKETADDR_H */
diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h
index 1134b0fe9d5d55a951bb9e7cd27bd47f6cd50902..421f0a2bcc12d930fb66663f7401e9b8b852a7af 100644
--- a/src/util/virstorageencryption.h
+++ b/src/util/virstorageencryption.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_ENCRYPTION_H__
-# define __VIR_STORAGE_ENCRYPTION_H__
+#ifndef LIBVIRT_VIRSTORAGEENCRYPTION_H
+# define LIBVIRT_VIRSTORAGEENCRYPTION_H
 
 # include "internal.h"
 # include "virbuffer.h"
@@ -93,4 +93,4 @@ enum {
 
 int virStorageGenerateQcowPassphrase(unsigned char *dest);
 
-#endif /* __VIR_STORAGE_ENCRYPTION_H__ */
+#endif /* LIBVIRT_VIRSTORAGEENCRYPTION_H */
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index f283e3cb08a0a299e08cb095aa253ad9fbb2adb4..1d6161a2c77c6c17c9d85d087dbc09b0f1c18929 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_FILE_H__
-# define __VIR_STORAGE_FILE_H__
+#ifndef LIBVIRT_VIRSTORAGEFILE_H
+# define LIBVIRT_VIRSTORAGEFILE_H
 
 # include <sys/stat.h>
 
@@ -540,4 +540,4 @@ void virStorageFileReportBrokenChain(int errcode,
                                      virStorageSourcePtr src,
                                      virStorageSourcePtr parent);
 
-#endif /* __VIR_STORAGE_FILE_H__ */
+#endif /* LIBVIRT_VIRSTORAGEFILE_H */
diff --git a/src/util/virstoragefilebackend.h b/src/util/virstoragefilebackend.h
index 66868643670a4f1682d9c83ff41d2303470c2440..c93bc4033a07fed004cb19b032a137264dbfea4c 100644
--- a/src/util/virstoragefilebackend.h
+++ b/src/util/virstoragefilebackend.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STORAGE_FILE_BACKEND_H__
-# define __VIR_STORAGE_FILE_BACKEND_H__
+#ifndef LIBVIRT_VIRSTORAGEFILEBACKEND_H
+# define LIBVIRT_VIRSTORAGEFILEBACKEND_H
 
 # include <sys/stat.h>
 
@@ -100,4 +100,4 @@ struct _virStorageFileBackend {
 
 int virStorageFileBackendRegister(virStorageFileBackendPtr backend);
 
-#endif /* __VIR_STORAGE_FILE_BACKEND_H__ */
+#endif /* LIBVIRT_VIRSTORAGEFILEBACKEND_H */
diff --git a/src/util/virstring.h b/src/util/virstring.h
index ee53ff2f5eae30c0d5a80d8b34f81b01fac0af2d..42848e62b1e4532d5335144f89412aa6c7a4641e 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_STRING_H__
-# define __VIR_STRING_H__
+#ifndef LIBVIRT_VIRSTRING_H
+# define LIBVIRT_VIRSTRING_H
 
 # include <stdarg.h>
 
@@ -309,4 +309,4 @@ int virStringParsePort(const char *str,
 
 VIR_DEFINE_AUTOPTR_FUNC(virString, virStringListFree)
 
-#endif /* __VIR_STRING_H__ */
+#endif /* LIBVIRT_VIRSTRING_H */
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index b6785066f11e218ca0837f5f18cc6b118df83d86..6cc1952a3a03fbf016c53604070535e38df044dc 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -34,7 +34,7 @@
 #include "virfile.h"
 #include "virstring.h"
 
-#define __VIR_SYSINFO_PRIV_H_ALLOW__
+#define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW
 #include "virsysinfopriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_SYSINFO
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 33541701f9b1f652bce0d0bf3b88874d762f14dd..f1ba3ff6c70698c6bc91ebeefa2b7981c1c0d4b0 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_SYSINFOS_H__
-# define __VIR_SYSINFOS_H__
+#ifndef LIBVIRT_VIRSYSINFO_H
+# define LIBVIRT_VIRSYSINFO_H
 
 # include "internal.h"
 # include "virutil.h"
@@ -152,4 +152,4 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src,
 
 VIR_ENUM_DECL(virSysinfo)
 
-#endif /* __VIR_SYSINFOS_H__ */
+#endif /* LIBVIRT_VIRSYSINFO_H */
diff --git a/src/util/virsysinfopriv.h b/src/util/virsysinfopriv.h
index 607a9354fb7f3ec0f7d8c32909708a65593fea79..3ef675441e8007df540338a296a510406037b714 100644
--- a/src/util/virsysinfopriv.h
+++ b/src/util/virsysinfopriv.h
@@ -17,12 +17,12 @@
  *
  */
 
-#ifndef __VIR_SYSINFO_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRSYSINFOPRIV_H_ALLOW
 # error "virsysinfopriv.h may only be included by virsysinfo.c or test suites"
-#endif /* __VIR_SYSINFO_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRSYSINFOPRIV_H_ALLOW */
 
-#ifndef __VIR_SYSINFO_PRIV_H__
-# define __VIR_SYSINFO_PRIV_H__
+#ifndef LIBVIRT_VIRSYSINFOPRIV_H
+# define LIBVIRT_VIRSYSINFOPRIV_H
 
 void
 virSysinfoSetup(const char *dmidecode,
@@ -41,4 +41,4 @@ virSysinfoReadS390(void);
 virSysinfoDefPtr
 virSysinfoReadX86(void);
 
-#endif /* __VIR_SYSINFO_PRIV_H__ */
+#endif /* LIBVIRT_VIRSYSINFOPRIV_H */
diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 3be963d704ea7283ade55f873938ed2b17b4111e..f492ac1859d1d541cfc34057a6234d8d40b04926 100644
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -26,7 +26,7 @@
 # include <sys/un.h>
 #endif
 
-#define __VIR_SYSTEMD_PRIV_H_ALLOW__ 1
+#define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW
 #include "virsystemdpriv.h"
 
 #include "virsystemd.h"
diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h
index 9aedb40b86f1aeb756659e96e69833f9bb94cbf5..7d9c0ebd624283d97a6d0dcdaf9c38ea3d88fe39 100644
--- a/src/util/virsystemd.h
+++ b/src/util/virsystemd.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_SYSTEMD_H__
-# define __VIR_SYSTEMD_H__
+#ifndef LIBVIRT_VIRSYSTEMD_H
+# define LIBVIRT_VIRSYSTEMD_H
 
 # include "internal.h"
 
@@ -51,4 +51,4 @@ int virSystemdCanHybridSleep(bool *result);
 
 char *virSystemdGetMachineNameByPID(pid_t pid);
 
-#endif /* __VIR_SYSTEMD_H__ */
+#endif /* LIBVIRT_VIRSYSTEMD_H */
diff --git a/src/util/virsystemdpriv.h b/src/util/virsystemdpriv.h
index c5423cf426a1fce9cdbf13d233178ad0ea9a00cb..be96f698f31c7640ae18cfcc5ce27e49bacf1f60 100644
--- a/src/util/virsystemdpriv.h
+++ b/src/util/virsystemdpriv.h
@@ -19,15 +19,15 @@
  *
  */
 
-#ifndef __VIR_SYSTEMD_PRIV_H_ALLOW__
+#ifndef LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW
 # error "virsystemdpriv.h may only be included by virsystemd.c or test suites"
-#endif /* __VIR_SYSTEMD_PRIV_H_ALLOW__ */
+#endif /* LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW */
 
-#ifndef __VIR_SYSTEMD_PRIV_H__
-# define __VIR_SYSTEMD_PRIV_H__
+#ifndef LIBVIRT_VIRSYSTEMDPRIV_H
+# define LIBVIRT_VIRSYSTEMDPRIV_H
 
 # include "virsystemd.h"
 
 void virSystemdHasMachinedResetCachedValue(void);
 
-#endif /* __VIR_SYSTEMD_PRIV_H__ */
+#endif /* LIBVIRT_VIRSYSTEMDPRIV_H */
diff --git a/src/util/virthread.h b/src/util/virthread.h
index e4348e87a997c8c9703215b6e47775a38609d0db..6af4492d4218e9bf98869397c76796846119f7a1 100644
--- a/src/util/virthread.h
+++ b/src/util/virthread.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __THREADS_H_
-# define __THREADS_H_
+#ifndef LIBVIRT_VIRTHREAD_H
+# define LIBVIRT_VIRTHREAD_H
 
 # include "internal.h"
 # include "virerror.h"
@@ -213,4 +213,4 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
         return 0; \
     }
 
-#endif /* __THREADS_H_ */
+#endif /* LIBVIRT_VIRTHREAD_H */
diff --git a/src/util/virthreadjob.h b/src/util/virthreadjob.h
index 343b8b041a19462ff459ec08eed1edea06518bc9..697a932625828547459593c557cf37cf99ef6b75 100644
--- a/src/util/virthreadjob.h
+++ b/src/util/virthreadjob.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_THREAD_JOB_H__
-# define __VIR_THREAD_JOB_H__
+#ifndef LIBVIRT_VIRTHREADJOB_H
+# define LIBVIRT_VIRTHREADJOB_H
 
 
 const char *virThreadJobGet(void);
@@ -28,4 +28,4 @@ void virThreadJobSetWorker(const char *caller);
 void virThreadJobSet(const char *caller);
 void virThreadJobClear(int rv);
 
-#endif /* __VIR_THREAD_JOB_H__ */
+#endif /* LIBVIRT_VIRTHREADJOB_H */
diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h
index 12f12e4fc37fb8101adc3a99b841c1f3ab82e57b..e3ff36998d302cb2fd63b8cec83e26c72a57ccdb 100644
--- a/src/util/virthreadpool.h
+++ b/src/util/virthreadpool.h
@@ -21,8 +21,8 @@
  *     Daniel P. Berrange <berrange@redhat.com>
  */
 
-#ifndef __VIR_THREADPOOL_H__
-# define __VIR_THREADPOOL_H__
+#ifndef LIBVIRT_VIRTHREADPOOL_H
+# define LIBVIRT_VIRTHREADPOOL_H
 
 # include "internal.h"
 
@@ -60,4 +60,4 @@ int virThreadPoolSetParameters(virThreadPoolPtr pool,
                                long long int maxWorkers,
                                long long int prioWorkers);
 
-#endif /* __VIR_THREADPOOL_H__ */
+#endif /* LIBVIRT_VIRTHREADPOOL_H */
diff --git a/src/util/virtime.h b/src/util/virtime.h
index 340ea5d58813090ea3a446afe4a0308de1297963..01f6b0c7fa6c2c1f4afd084c1ab7025e41796f7c 100644
--- a/src/util/virtime.h
+++ b/src/util/virtime.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_TIME_H__
-# define __VIR_TIME_H__
+#ifndef LIBVIRT_VIRTIME_H
+# define LIBVIRT_VIRTIME_H
 
 # include <time.h>
 
@@ -73,4 +73,4 @@ int virTimeBackOffStart(virTimeBackOffVar *var,
 
 bool virTimeBackOffWait(virTimeBackOffVar *var);
 
-#endif /* __VIR_TIME_H__ */
+#endif /* LIBVIRT_VIRTIME_H */
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index a363f37ec00257ca16fe842f56d12e171ca9161b..796b9c088c6ebd7b4b1c7140f882b06a5ba02391 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -18,9 +18,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_TPM_H__
-# define __VIR_TPM_H__
+#ifndef LIBVIRT_VIRTPM_H
+# define LIBVIRT_VIRTPM_H
 
 char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_NOINLINE;
 
-#endif /* __VIR_TPM_H__ */
+#endif /* LIBVIRT_VIRTPM_H */
diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h
index 6df63a1e5cdac7127efbb0ea7e6a59f5a9e04386..4cc65cf91c448bf1335bf8c3e8e0c8b8d237ac63 100644
--- a/src/util/virtypedparam.h
+++ b/src/util/virtypedparam.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_TYPED_PARAM_H_
-# define __VIR_TYPED_PARAM_H_
+#ifndef LIBVIRT_VIRTYPEDPARAM_H
+# define LIBVIRT_VIRTYPEDPARAM_H
 
 # include "internal.h"
 # include "virutil.h"
@@ -134,4 +134,4 @@ VIR_ENUM_DECL(virTypedParameter)
         } \
     } while (0)
 
-#endif /* __VIR_TYPED_PARAM_H_ */
+#endif /* LIBVIRT_VIRTYPEDPARAM_H */
diff --git a/src/util/viruri.h b/src/util/viruri.h
index 7850c38c224b0af702e5356aaa70a742f2df31fc..b6e97dafe66abee26d1334548a6f58461d9c1ec7 100644
--- a/src/util/viruri.h
+++ b/src/util/viruri.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_URI_H__
-# define __VIR_URI_H__
+#ifndef LIBVIRT_VIRURI_H
+# define LIBVIRT_VIRURI_H
 
 # include <libxml/uri.h>
 
@@ -64,4 +64,4 @@ int virURIResolveAlias(virConfPtr conf, const char *alias, char **uri);
 
 # define VIR_URI_SERVER(uri) ((uri) && (uri)->server ? (uri)->server : "localhost")
 
-#endif /* __VIR_URI_H__ */
+#endif /* LIBVIRT_VIRURI_H */
diff --git a/src/util/virusb.h b/src/util/virusb.h
index 59531277485fa15653b200187a755a04b83e3a78..e589a4531089d34ffc1e1f9b9241cedfd9df57f0 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_USB_H__
-# define __VIR_USB_H__
+#ifndef LIBVIRT_VIRUSB_H
+# define LIBVIRT_VIRUSB_H
 
 # include "internal.h"
 # include "virobject.h"
@@ -98,4 +98,4 @@ virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list,
 
 VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree)
 
-#endif /* __VIR_USB_H__ */
+#endif /* LIBVIRT_VIRUSB_H */
diff --git a/src/util/virutil.h b/src/util/virutil.h
index a02a03f034747952f19b3d4b285af2af56b43c5f..908d8920ec336480991c9bf44c717bc7c9397f1c 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_UTIL_H__
-# define __VIR_UTIL_H__
+#ifndef LIBVIRT_VIRUTIL_H
+# define LIBVIRT_VIRUTIL_H
 
 # include "internal.h"
 # include <unistd.h>
@@ -233,4 +233,4 @@ char *virHostGetDRMRenderNode(void) ATTRIBUTE_NOINLINE;
 # define VIR_ASSIGN_IS_OVERFLOW(lvalue, rvalue) \
     (((lvalue) = (rvalue)) != (rvalue))
 
-#endif /* __VIR_UTIL_H__ */
+#endif /* LIBVIRT_VIRUTIL_H */
diff --git a/src/util/viruuid.h b/src/util/viruuid.h
index d5a334b0cef8a854c54fa726640c6be1d219fc5f..70223b3bb2a47a65ad484f196ded18dddaabe8ed 100644
--- a/src/util/viruuid.h
+++ b/src/util/viruuid.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_UUID_H__
-# define __VIR_UUID_H__
+#ifndef LIBVIRT_VIRUUID_H
+# define LIBVIRT_VIRUUID_H
 
 # include "internal.h"
 
@@ -55,4 +55,4 @@ int virUUIDParse(const char *uuidstr,
 const char *virUUIDFormat(const unsigned char *uuid,
                           char *uuidstr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-#endif /* __VIR_UUID_H__ */
+#endif /* LIBVIRT_VIRUUID_H */
diff --git a/src/util/virvhba.h b/src/util/virvhba.h
index 32792918ae1c6f270436d53ad3252ae68885c7e7..4d15833e85762a517405ada464aa8527ab7dd573 100644
--- a/src/util/virvhba.h
+++ b/src/util/virvhba.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_VHBA_H__
-# define __VIR_VHBA_H__
+#ifndef LIBVIRT_VIRVHBA_H
+# define LIBVIRT_VIRVHBA_H
 
 # include "internal.h"
 
@@ -59,4 +59,4 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix,
                           const char *fabric_wwn)
     ATTRIBUTE_NONNULL(2);
 
-#endif /* __VIR_VHBA_H__ */
+#endif /* LIBVIRT_VIRVHBA_H */
diff --git a/src/util/virvsock.h b/src/util/virvsock.h
index 080a322420bfc9a2b62495a66f936a03e26dc1bf..268e1219164d6e110cc698f285fe4b83ee762089 100644
--- a/src/util/virvsock.h
+++ b/src/util/virvsock.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_VSOCK_H__
-# define __VIR_VSOCK_H__
+#ifndef LIBVIRT_VIRVSOCK_H
+# define LIBVIRT_VIRVSOCK_H
 
 int
 virVsockSetGuestCid(int fd,
@@ -26,4 +26,4 @@ virVsockSetGuestCid(int fd,
 int
 virVsockAcquireGuestCid(int fd,
                         unsigned int *guest_cid);
-#endif /* __VIR_VSOCK_H__ */
+#endif /* LIBVIRT_VIRVSOCK_H */
diff --git a/src/util/virxdrdefs.h b/src/util/virxdrdefs.h
index 40074dde3194113f7538c0982c579aea091c84dc..794606638d19bc39e07977e3093292dc16b894e4 100644
--- a/src/util/virxdrdefs.h
+++ b/src/util/virxdrdefs.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XDRDEFS_H__
-# define __VIR_XDRDEFS_H__
+#ifndef LIBVIRT_VIRXDRDEFS_H
+# define LIBVIRT_VIRXDRDEFS_H
 
 /* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
  * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
@@ -40,4 +40,4 @@
 #  define IXDR_GET_U_INT32 IXDR_GET_U_LONG
 # endif
 
-#endif /* __VIR_XDRDEFS_H__ */
+#endif /* LIBVIRT_VIRXDRDEFS_H */
diff --git a/src/util/virxml.h b/src/util/virxml.h
index 43ce031082db38dfdb74b106cbe558d1289b0398..8d4ab0a4278f108737541b46f70e75c164318353 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -20,8 +20,8 @@
  * Daniel Veillard <veillard@redhat.com>
  */
 
-#ifndef __VIR_XML_H__
-# define __VIR_XML_H__
+#ifndef LIBVIRT_VIRXML_H
+# define LIBVIRT_VIRXML_H
 
 # include "internal.h"
 
@@ -221,4 +221,4 @@ virXMLFormatElement(virBufferPtr buf,
                     virBufferPtr attrBuf,
                     virBufferPtr childBuf);
 
-#endif /* __VIR_XML_H__ */
+#endif /* LIBVIRT_VIRXML_H */
diff --git a/src/vbox/vbox_MSCOMGlue.h b/src/vbox/vbox_MSCOMGlue.h
index cdc38f8310a4c2b8cac8ac852771bfa9650aa4d1..dd42f031489aac489d64478c45c2c83e61802d3a 100644
--- a/src/vbox/vbox_MSCOMGlue.h
+++ b/src/vbox/vbox_MSCOMGlue.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VBOX_MSCOMGLUE_H__
-# define __VBOX_MSCOMGLUE_H__
+#ifndef LIBVIRT_VBOX_MSCOMGLUE_H
+# define LIBVIRT_VBOX_MSCOMGLUE_H
 
 # include "vbox_CAPI_v3_2.h"
 
@@ -45,4 +45,4 @@ nsresult vboxArrayGetWithUintArg(vboxArray *array, void *self, void *getter, PRU
 void vboxArrayRelease(vboxArray *array);
 # define vboxArrayUnalloc vboxArrayRelease
 
-#endif /* __VBOX_MSCOMGLUE_H__ */
+#endif /* LIBVIRT_VBOX_MSCOMGLUE_H */
diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h
index 5709ff8b4abac4b7a3659e66b370db90ed02c5ba..c67f6fba4268ceb0bdb1ab7090178745e516a5cf 100644
--- a/src/vbox/vbox_common.h
+++ b/src/vbox/vbox_common.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VBOX_COMMON_H
-# define VBOX_COMMON_H
+#ifndef LIBVIRT_VBOX_COMMON_H
+# define LIBVIRT_VBOX_COMMON_H
 
 # ifdef ___VirtualBox_CXPCOM_h
 #  error this file should not be included after vbox_CAPI_v*.h
@@ -453,4 +453,4 @@ typedef nsISupports IKeyboard;
         } \
     } while (0)
 
-#endif /* VBOX_COMMON_H */
+#endif /* LIBVIRT_VBOX_COMMON_H */
diff --git a/src/vbox/vbox_driver.h b/src/vbox/vbox_driver.h
index 38aaaf6e3989a6834b582817d130b06b5a6f24b5..fa30c4a3f5bc819c12f0cb45fe9f68ea531e3584 100644
--- a/src/vbox/vbox_driver.h
+++ b/src/vbox/vbox_driver.h
@@ -22,8 +22,8 @@
  * additional information or have any questions.
  */
 
-#ifndef VBOX_DRIVER_H
-# define VBOX_DRIVER_H
+#ifndef LIBVIRT_VBOX_DRIVER_H
+# define LIBVIRT_VBOX_DRIVER_H
 
 # include "internal.h"
 
@@ -39,4 +39,4 @@ int vboxStorageRegister(void);
 int vboxRegister(void);
 # endif
 
-#endif /* VBOX_DRIVER_H */
+#endif /* LIBVIRT_VBOX_DRIVER_H */
diff --git a/src/vbox/vbox_get_driver.h b/src/vbox/vbox_get_driver.h
index 84a1f8ab46b7859cdffe180d179d2f82f4620202..08e39ad1577cd06634fb25b10dd53abc2d5fe2f9 100644
--- a/src/vbox/vbox_get_driver.h
+++ b/src/vbox/vbox_get_driver.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VBOX_GET_DRIVER_H
-# define VBOX_GET_DRIVER_H
+#ifndef LIBVIRT_VBOX_GET_DRIVER_H
+# define LIBVIRT_VBOX_GET_DRIVER_H
 
 # include "internal.h"
 
@@ -25,4 +25,4 @@ virHypervisorDriverPtr vboxGetHypervisorDriver(uint32_t uVersion);
 virNetworkDriverPtr vboxGetNetworkDriver(uint32_t uVersion);
 virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion);
 
-#endif /* VBOX_GET_DRIVER_H */
+#endif /* LIBVIRT_VBOX_GET_DRIVER_H */
diff --git a/src/vbox/vbox_glue.h b/src/vbox/vbox_glue.h
index 080479c74a22fff8a01fcb1c1d5ed721643153e2..39281e0d78e732430677c5f05557c42b96ec1ba2 100644
--- a/src/vbox/vbox_glue.h
+++ b/src/vbox/vbox_glue.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VBOX_GLUE_H__
-# define __VBOX_GLUE_H__
+#ifndef LIBVIRT_VBOX_GLUE_H
+# define LIBVIRT_VBOX_GLUE_H
 
 # ifdef WIN32
 #  include "vbox_MSCOMGlue.h"
@@ -28,4 +28,4 @@
 #  include "vbox_XPCOMCGlue.h"
 # endif
 
-#endif /* __VBOX_GLUE_H__ */
+#endif /* LIBVIRT_VBOX_GLUE_H */
diff --git a/src/vbox/vbox_snapshot_conf.h b/src/vbox/vbox_snapshot_conf.h
index 7ba3ca03eaea337ec94807c4a51c2f1860a7d5f3..72b90e698f55b5269b5cab90ae9599ef985c83d2 100644
--- a/src/vbox/vbox_snapshot_conf.h
+++ b/src/vbox/vbox_snapshot_conf.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VBOX_SNAPSHOT_CONF_H
-# define VBOX_SNAPSHOT_CONF_H
+#ifndef LIBVIRT_VBOX_SNAPSHOT_CONF_H
+# define LIBVIRT_VBOX_SNAPSHOT_CONF_H
 
 # include "internal.h"
 
@@ -138,4 +138,4 @@ virVBoxSnapshotConfSnapshotPtr
 virVBoxSnapshotConfSnapshotByName(virVBoxSnapshotConfSnapshotPtr snapshot,
                                   const char *snapshotName);
 
-#endif /* VBOX_SNAPSHOT_CONF_H */
+#endif /* LIBVIRT_VBOX_SNAPSHOT_CONF_H */
diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index eb4e148909dd6d367dab60cbd13649383e62f451..5f3df5fb8786b7e5298728fd84693342ad1b86c0 100644
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VBOX_UNIFORMED_API_H
-# define VBOX_UNIFORMED_API_H
+#ifndef LIBVIRT_VBOX_UNIFORMED_API_H
+# define LIBVIRT_VBOX_UNIFORMED_API_H
 
 # include "internal.h"
 
@@ -566,4 +566,4 @@ void vbox50InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
 void vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
 void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
 
-#endif /* VBOX_UNIFORMED_API_H */
+#endif /* LIBVIRT_VBOX_UNIFORMED_API_H */
diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h
index e7ba403848e1317eedae236e899749275cda271f..1edd962686188ffe13b00e2ff376bb50d4ce6117 100644
--- a/src/vmware/vmware_conf.h
+++ b/src/vmware/vmware_conf.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VMWARE_CONF_H
-# define VMWARE_CONF_H
+#ifndef LIBVIRT_VMWARE_CONF_H
+# define LIBVIRT_VMWARE_CONF_H
 
 # define NOGUI "nogui"
 
@@ -85,4 +85,4 @@ int vmwareExtractPid(const char * vmxPath);
 
 char *vmwareCopyVMXFileName(const char *datastorePath, void *opaque);
 
-#endif /* VMWARE_CONF_H */
+#endif /* LIBVIRT_VMWARE_CONF_H */
diff --git a/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h
index 94ed04d023a2a6b3ac5ad8a011b79d489e52cbc6..e66d222a518fcb32bbf2a0526bb58082c46ca5a7 100644
--- a/src/vmware/vmware_driver.h
+++ b/src/vmware/vmware_driver.h
@@ -16,9 +16,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VMWARE_DRIVER_H
-# define VMWARE_DRIVER_H
+#ifndef LIBVIRT_VMWARE_DRIVER_H
+# define LIBVIRT_VMWARE_DRIVER_H
 
 int vmwareRegister(void);
 
-#endif /* VMWARE_DRIVER_H */
+#endif /* LIBVIRT_VMWARE_DRIVER_H */
diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index 6b3d880d61b4871e7a4a7d584e602ace7fc7ed8e..cb99e84d18c0db775562757ba7267cf2d15a9b76 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_VMX_H__
-# define __VIR_VMX_H__
+#ifndef LIBVIRT_VMX_H
+# define LIBVIRT_VMX_H
 
 # include "internal.h"
 # include "virconf.h"
@@ -140,4 +140,4 @@ int virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def,
 
 int virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer);
 
-#endif /* __VIR_VMX_H__ */
+#endif /* LIBVIRT_VMX_H */
diff --git a/src/vz/vz_driver.h b/src/vz/vz_driver.h
index 82c77fd0ece54e34ea20d484e4a9323a6fcea57b..593a585075cfc36f21c5c60c8005e23bc3ad58d5 100644
--- a/src/vz/vz_driver.h
+++ b/src/vz/vz_driver.h
@@ -20,9 +20,9 @@
  *
  */
 
-#ifndef PARALLELS_DRIVER_H
-# define PARALLELS_DRIVER_H
+#ifndef LIBVIRT_VZ_DRIVER_H
+# define LIBVIRT_VZ_DRIVER_H
 
 int vzRegister(void);
 
-#endif /* PARALLELS_DRIVER_H */
+#endif /* LIBVIRT_VZ_DRIVER_H */
diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h
index d201d6a10da81d35d93d1a1cb7a2fcba7e68e490..e412b821bbf9ddc4527b61d04a265d3cc4576fc2 100644
--- a/src/vz/vz_sdk.h
+++ b/src/vz/vz_sdk.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __VZ_SDK_H__
-# define __VZ_SDK_H__
+#ifndef LIBVIRT_VZ_SDK_H
+# define LIBVIRT_VZ_SDK_H
 
 # include <Parallels.h>
 
@@ -95,4 +95,4 @@ prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name);
 int prlsdkCancelJob(virDomainObjPtr dom);
 int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize);
 
-#endif /* __VZ_SDK_H__ */
+#endif /* LIBVIRT_VZ_SDK_H */
diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h
index 93db255f953be9454d18d1f6ea55509a385a6bc4..758ab6f1aec0f76fa261e05e0b26bed4194395b6 100644
--- a/src/vz/vz_utils.h
+++ b/src/vz/vz_utils.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef PARALLELS_UTILS_H
-# define PARALLELS_UTILS_H
+#ifndef LIBVIRT_VZ_UTILS_H
+# define LIBVIRT_VZ_UTILS_H
 
 # include <Parallels.h>
 
@@ -158,4 +158,4 @@ vzDomainObjEndJob(virDomainObjPtr dom);
 int
 vzDomainJobUpdateTime(vzDomainJobObjPtr job);
 
-#endif /* PARALLELS_UTILS_H */
+#endif /* LIBVIRT_VZ_UTILS_H */
diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h
index df469aff345fb954769e2c6681ceb6e15cef69eb..85bbe067762c6906eafcc1664e32ba30e617b4cb 100644
--- a/src/xenapi/xenapi_driver.h
+++ b/src/xenapi/xenapi_driver.h
@@ -17,9 +17,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XENAPI_PRIV_H__
-# define __VIR_XENAPI_PRIV_H__
+#ifndef LIBVIRT_XENAPI_DRIVER_H
+# define LIBVIRT_XENAPI_DRIVER_H
 
 int xenapiRegister(void);
 
-#endif /* __VIR_XENAPI_PRIV_H__ */
+#endif /* LIBVIRT_XENAPI_DRIVER_H */
diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
index 7d8d8c66d2de8826c4955fbf6fd8cbd9f173d93a..590a96f532d747c09e9dc145eff3db6804b6a8c4 100644
--- a/src/xenapi/xenapi_driver_private.h
+++ b/src/xenapi/xenapi_driver_private.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XENAPI_H__
-# define __VIR_XENAPI_H__
+#ifndef LIBVIRT_XENAPI_DRIVER_PRIVATE_H
+# define LIBVIRT_XENAPI_DRIVER_PRIVATE_H
 
 # include <libxml/tree.h>
 # include <xen/api/xen_common.h>
@@ -58,4 +58,4 @@ struct _xenapiPrivate {
     virDomainXMLOptionPtr xmlopt;
 };
 
-#endif /* __VIR_XENAPI_H__ */
+#endif /* LIBVIRT_XENAPI_DRIVER_PRIVATE_H */
diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h
index ae33e8fedb3f635b153399620e5e47c04899f868..70a0e5fc13b4d7bf655089b71b05868465263fb5 100644
--- a/src/xenapi/xenapi_utils.h
+++ b/src/xenapi/xenapi_utils.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XENAPI_UTILS__
-# define __VIR_XENAPI_UTILS__
+#ifndef LIBVIRT_XENAPI_UTILS_H
+# define LIBVIRT_XENAPI_UTILS_H
 
 # include <xen/api/xen_all.h>
 # include "internal.h"
@@ -76,4 +76,4 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr defPtr,
 int
 allocStringMap (xen_string_string_map **strings, char *key, char *val);
 
-#endif /* __VIR_XENAPI_UTILS__ */
+#endif /* LIBVIRT_XENAPI_UTILS_H */
diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h
index 369bba26d8c54f0580f3e8ae3ae00e174174ae77..b22d18aa677b90a0562b05e4473a462e28ffe2fc 100644
--- a/src/xenconfig/xen_common.h
+++ b/src/xenconfig/xen_common.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XEN_COMMON_H__
-# define __VIR_XEN_COMMON_H__
+#ifndef LIBVIRT_XEN_COMMON_H
+# define LIBVIRT_XEN_COMMON_H
 
 # include "internal.h"
 # include "virconf.h"
@@ -69,4 +69,4 @@ char *xenMakeIPList(virNetDevIPInfoPtr guestIP);
 
 int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def);
 
-#endif /* __VIR_XEN_COMMON_H__ */
+#endif /* LIBVIRT_XEN_COMMON_H */
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index 342ccab6f594c92b72689f4271f79315e4ea18fb..0cec2a4068456530e883cdb82fbfcc9211f71044 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XEN_SXPR_H__
-# define __VIR_XEN_SXPR_H__
+#ifndef LIBVIRT_XEN_SXPR_H
+# define LIBVIRT_XEN_SXPR_H
 
 # include "internal.h"
 # include "virconf.h"
@@ -66,4 +66,4 @@ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf);
 
 char * xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def);
 
-#endif /* __VIR_XEN_SXPR_H__ */
+#endif /* LIBVIRT_XEN_SXPR_H */
diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h
index 588d8d1143ddb761a4fd43632f5e2de2cf041d8c..e519186d4694c74c3d3034749527703d9950ff58 100644
--- a/src/xenconfig/xen_xl.h
+++ b/src/xenconfig/xen_xl.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_XEN_XL_H__
-# define __VIR_XEN_XL_H__
+#ifndef LIBVIRT_XEN_XL_H
+# define LIBVIRT_XEN_XL_H
 
 # include "virconf.h"
 # include "domain_conf.h"
@@ -34,4 +34,4 @@ virConfPtr xenFormatXL(virDomainDefPtr def, virConnectPtr);
 
 const char *xenTranslateCPUFeature(const char *feature_name, bool from_libxl);
 
-#endif /* __VIR_XEN_XL_H__ */
+#endif /* LIBVIRT_XEN_XL_H */
diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h
index c0699c673d7deb471b4e4cc3775341b865fb8e16..b0a73fc09bcc0454bf60a0d0efa5cdfc317eefa2 100644
--- a/src/xenconfig/xen_xm.h
+++ b/src/xenconfig/xen_xm.h
@@ -20,8 +20,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XEN_XM_H__
-# define __VIR_XEN_XM_H__
+#ifndef LIBVIRT_XEN_XM_H
+# define LIBVIRT_XEN_XM_H
 
 # include "internal.h"
 # include "virconf.h"
@@ -32,4 +32,4 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def);
 virDomainDefPtr xenParseXM(virConfPtr conf,
                            virCapsPtr caps, virDomainXMLOptionPtr xmlopt);
 
-#endif /* __VIR_XEN_XM_H__ */
+#endif /* LIBVIRT_XEN_XM_H */
diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h
index e2250dbd6ad097e8516a5616b28a8ab7dc211f4f..7cba0bff8659baa264094877e13c7870ec2fbc46 100644
--- a/src/xenconfig/xenxs_private.h
+++ b/src/xenconfig/xenxs_private.h
@@ -19,8 +19,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_XENXS_PRIVATE_H__
-# define __VIR_XENXS_PRIVATE_H__
+#ifndef LIBVIRT_XENXS_PRIVATE_H
+# define LIBVIRT_XENXS_PRIVATE_H
 
 # include "internal.h"
 
@@ -43,4 +43,4 @@
 #  define DEFAULT_VIF_SCRIPT "vif-bridge"
 # endif
 
-#endif /* __VIR_XENXS_PRIVATE_H__ */
+#endif /* LIBVIRT_XENXS_PRIVATE_H */
diff --git a/tests/cputest.c b/tests/cputest.c
index 64d85f34dbec00bbb588b4aa0ced0f471becc220..b75d864d8ee9e9164d348b13cd1cc951ef10e6c1 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -38,9 +38,8 @@
 #if WITH_QEMU && WITH_YAJL
 # include "testutilsqemu.h"
 # include "qemumonitortestutils.h"
-# define __QEMU_CAPSPRIV_H_ALLOW__
+# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # include "qemu/qemu_capspriv.h"
-# undef __QEMU_CAPSPRIV_H_ALLOW__
 #endif
 
 #define VIR_FROM_THIS VIR_FROM_CPU
diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index 5e3d8906c5d872e01d086cee0832cfb29dad3e05..91bb6e6b8a2b67b93cdca5a95fee3b10c9b151e7 100644
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -28,10 +28,10 @@
 # include "network/bridge_driver_platform.h"
 # include "virbuffer.h"
 
-# define __VIR_FIREWALL_PRIV_H_ALLOW__
+# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 # include "virfirewallpriv.h"
 
-# define __VIR_COMMAND_PRIV_H_ALLOW__
+# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c
index 607342330458ffc130ad86332399b759af37c1e3..68b69a6e1fa037ed729626fabba6672d2975f4aa 100644
--- a/tests/nwfilterebiptablestest.c
+++ b/tests/nwfilterebiptablestest.c
@@ -26,10 +26,10 @@
 #include "virbuffer.h"
 #include "virfirewall.h"
 
-#define __VIR_FIREWALL_PRIV_H_ALLOW__
+#define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 #include "virfirewallpriv.h"
 
-#define __VIR_COMMAND_PRIV_H_ALLOW__
+#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 043b7d170e153212bf7066bad5a31570b147b377..b4cfe5769e601572ec44243f65ec855ccf3c2fa5 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -27,10 +27,10 @@
 # include "nwfilter/nwfilter_ebiptables_driver.h"
 # include "virbuffer.h"
 
-# define __VIR_FIREWALL_PRIV_H_ALLOW__
+# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 # include "virfirewallpriv.h"
 
-# define __VIR_COMMAND_PRIV_H_ALLOW__
+# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
 
 # define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index a043b0fa64cba1b6c8a96ece8a728468b3f1458e..b3a9a4b9fc286a5918e69737ff0ecbe7705cb4a9 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -22,9 +22,9 @@
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
-#define __QEMU_CAPSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 #include "qemu/qemu_capspriv.h"
-#define __QEMU_MONITOR_PRIV_H_ALLOW__
+#define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW
 #include "qemu/qemu_monitor_priv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c
index 708c245561d722837210574713edaed719a30b46..14c0ecad979cd831b8172974f1851b03a58a18bb 100644
--- a/tests/qemucapsprobe.c
+++ b/tests/qemucapsprobe.c
@@ -23,7 +23,7 @@
 #include "virarch.h"
 #include "virthread.h"
 #include "qemu/qemu_capabilities.h"
-#define __QEMU_CAPSPRIV_H_ALLOW__ 1
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 #include "qemu/qemu_capspriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c
index 7752e3157cb9e9759e685457e2cd1aaa5b4df1a8..e028ada8eb0dd9440aedec9bd214c37c12b9b1c7 100644
--- a/tests/qemucpumock.c
+++ b/tests/qemucpumock.c
@@ -20,9 +20,8 @@
 #include "conf/cpu_conf.h"
 #include "cpu/cpu.h"
 #include "qemu/qemu_capabilities.h"
-#define __QEMU_CAPSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 #include "qemu/qemu_capspriv.h"
-#undef __QEMU_CAPSPRIV_H_ALLOW__
 #include "testutilshostcpus.h"
 #include "virarch.h"
 
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index bf334c75ee9e0550cb5234c9b1b035850ea99833..aa49097a4a1c57b14ac2a201fc4b8d5ce50c068e 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -22,7 +22,7 @@
 #include "qemu/qemu_alias.h"
 #include "qemu/qemu_conf.h"
 #include "qemu/qemu_hotplug.h"
-#define __QEMU_HOTPLUGPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW
 #include "qemu/qemu_hotplugpriv.h"
 #include "qemumonitortestutils.h"
 #include "testutils.h"
diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c
index e0117d026152e434a0b2aba64dc9a930aba84655..dcefde2dbc3fcfc1ca491dec57f81ff50cb753b1 100644
--- a/tests/qemumigparamstest.c
+++ b/tests/qemumigparamstest.c
@@ -26,7 +26,7 @@
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
 #include "qemu/qemu_migration_params.h"
-#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
 #include "qemu/qemu_migration_paramspriv.h"
 #include "qemu/qemu_monitor.h"
 
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 0e7d27a610f9368d7e141e24dba5a40014c03113..1a8a31717fd6c37ea8f6940489e32e9afe1ee750 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -33,7 +33,7 @@
 #include "cpu/cpu.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_migration_params.h"
-#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__
+#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW
 #include "qemu/qemu_migration_paramspriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index cc9e0bd0f482f966f3d7b8ab4452ec5db2a86923..4a108c382d7a3ecfac7ede08d5373e9e64f869b7 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -26,7 +26,7 @@
 #include "qemumonitortestutils.h"
 
 #include "virthread.h"
-#define __QEMU_PROCESS_PRIV_H_ALLOW__
+#define LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW
 #include "qemu/qemu_processpriv.h"
 #include "qemu/qemu_monitor.h"
 #include "qemu/qemu_agent.h"
diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index 855e625a4f6b27abfe07cb0a7ed5052f685471b3..d2520e08a4abad8af6b8f0cbaade97dec09a5af8 100644
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __VIR_QEMU_MONITOR_TEST_UTILS_H__
-# define __VIR_QEMU_MONITOR_TEST_UTILS_H__
+#ifndef LIBVIRT_QEMUMONITORTESTUTILS_H
+# define LIBVIRT_QEMUMONITORTESTUTILS_H
 
 # include "domain_conf.h"
 # include "qemu/qemu_conf.h"
@@ -101,4 +101,4 @@ qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test);
 qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test);
 virDomainObjPtr qemuMonitorTestGetDomainObj(qemuMonitorTestPtr test);
 
-#endif /* __VIR_QEMU_MONITOR_TEST_UTILS_H__ */
+#endif /* LIBVIRT_QEMUMONITORTESTUTILS_H */
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ddc488be87fe7b455f5415feda046ff3d46acd68..287e9d4ea3dc3a0a9e4ef8b6260021f00d47adf3 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -24,9 +24,8 @@
 # include "storage/storage_driver.h"
 # include "virmock.h"
 
-# define __QEMU_CAPSPRIV_H_ALLOW__
+# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # include "qemu/qemu_capspriv.h"
-# undef __QEMU_CAPSPRIV_H_ALLOW__
 
 # include "testutilsqemu.h"
 
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index 88c125236b910b2c7077b74305986f887d51b22d..616af22d735e56f9ffe3c8bf1a2d9579f610fd06 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__
+#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW
 #include "storage/storage_backend_sheepdog_priv.h"
 #include "virstring.h"
 
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 62cf5878fff9cb9bd886e5d92e12214ba78dcf2c..7fa9a2dfd66a8e7e5916a55b9a674db356a0d691 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -31,7 +31,7 @@
 #include "virfile.h"
 #include "virstring.h"
 
-#define __VIR_SYSINFO_PRIV_H_ALLOW__
+#define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW
 #include "virsysinfopriv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/testutils.h b/tests/testutils.h
index 8531b2a73557368dd4c737b09942677e0ef2e7b5..11d99a74b8254b2d0af69e8309fac4ee5e251f88 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -20,8 +20,8 @@
  * Karel Zak <kzak@redhat.com>
  */
 
-#ifndef __VIR_TEST_UTILS_H__
-# define __VIR_TEST_UTILS_H__
+#ifndef LIBVIRT_TESTUTILS_H
+# define LIBVIRT_TESTUTILS_H
 
 # include "viralloc.h"
 # include "virfile.h"
@@ -166,4 +166,4 @@ int testCompareDomXML2XMLFiles(virCapsPtr caps,
                                unsigned int parseFlags,
                                testCompareDomXML2XMLResult expectResult);
 
-#endif /* __VIR_TEST_UTILS_H__ */
+#endif /* LIBVIRT_TESTUTILS_H */
diff --git a/tests/testutilshostcpus.h b/tests/testutilshostcpus.h
index 07e7302d7f920b4636a9d14d19c47e8886a22cb0..32929a095354b863014d96006ceef619d47ab566 100644
--- a/tests/testutilshostcpus.h
+++ b/tests/testutilshostcpus.h
@@ -14,8 +14,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TESTUTILSHOSTCPUS_H
-# define TESTUTILSHOSTCPUS_H
+#ifndef LIBVIRT_TESTUTILSHOSTCPUS_H
+# define LIBVIRT_TESTUTILSHOSTCPUS_H
 
 # include "conf/cpu_conf.h"
 # include "internal.h"
@@ -166,4 +166,4 @@ testUtilsHostCpusGetDefForArch(virArch arch)
     return NULL;
 }
 
-#endif /* TESTUTILSHOSTCPUS_H */
+#endif /* LIBVIRT_TESTUTILSHOSTCPUS_H */
diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h
index 0bc69a903f5bb75d08e3e3fe04875e5b5c596b4e..16f1986ecaa821b0bb434fb19b937d48ddce79ca 100644
--- a/tests/testutilslxc.h
+++ b/tests/testutilslxc.h
@@ -14,8 +14,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TESTUTILSLXC_H
-# define TESTUTILSLXC_H
+#ifndef LIBVIRT_TESTUTILSLXC_H
+# define LIBVIRT_TESTUTILSLXC_H
 
 # include "capabilities.h"
 
@@ -24,4 +24,4 @@
 
 virCapsPtr testLXCCapsInit(void);
 
-#endif /* TESTUTILSLXC_H */
+#endif /* LIBVIRT_TESTUTILSLXC_H */
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 5add246162de07e51b7c24a00c29a67d95aecab8..1736bad03246c52eb3212c55e0790d9144cac983 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -8,7 +8,7 @@
 # include "cpu_conf.h"
 # include "qemu/qemu_driver.h"
 # include "qemu/qemu_domain.h"
-# define __QEMU_CAPSPRIV_H_ALLOW__
+# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
 # include "qemu/qemu_capspriv.h"
 # include "virstring.h"
 # include "virfilecache.h"
diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index 1aa0034bb91896fe0bec0974d2d1c4f77a0c6d8a..5ae7f194737bd872673f25c5dfeaaf50fc53297b 100644
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -14,8 +14,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TESTUTILSQEMU_H
-# define TESTUTILSQEMU_H
+#ifndef LIBVIRT_TESTUTILSQEMU_H
+# define LIBVIRT_TESTUTILSQEMU_H
 
 # ifdef WITH_QEMU
 
@@ -65,4 +65,4 @@ char *testQemuGetLatestCapsForArch(const char *dirname,
 
 # endif
 
-#endif /* TESTUTILSQEMU_H */
+#endif /* LIBVIRT_TESTUTILSQEMU_H */
diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h
index 081d12ea63422fd267bd4a80e4fbee05d29354c6..73984e994642f188937b34116db89b39f87335e2 100644
--- a/tests/testutilsqemuschema.h
+++ b/tests/testutilsqemuschema.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __TESTUTILSQEMUSCHEMA_H__
-# define __TESTUTILSQEMUSCHEMA_H__
+#ifndef LIBVIRT_TESTUTILSQEMUSCHEMA_H
+# define LIBVIRT_TESTUTILSQEMUSCHEMA_H
 
 # include "virhash.h"
 # include "virjson.h"
@@ -35,4 +35,4 @@ testQEMUSchemaGetLatest(void);
 virHashTablePtr
 testQEMUSchemaLoad(void);
 
-#endif /* __TESTUTILSQEMUSCHEMA_H__ */
+#endif /* LIBVIRT_TESTUTILSQEMUSCHEMA_H */
diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h
index 0fceb93ae8e5c041063105ffe32b886b2d0a3f6d..9164a59507069ebb5f881869557834140ac448ae 100644
--- a/tests/testutilsxen.h
+++ b/tests/testutilsxen.h
@@ -14,8 +14,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TESTUTILSXEN_H_
-# define _TESTUTILSXEN_H_
+#ifndef LIBVIRT_TESTUTILSXEN_H
+# define LIBVIRT_TESTUTILSXEN_H
 
 # include "capabilities.h"
 # ifdef WITH_LIBXL
@@ -24,4 +24,4 @@
 
 virCapsPtr testXLInitCaps(void);
 
-#endif /* _TESTUTILSXEN_H_ */
+#endif /* LIBVIRT_TESTUTILSXEN_H */
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 5eda6fe725593aa46b6e4fcb5e71f54634c1553c..20f4c57b04b5558b8d01923b04b074376447539b 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -23,7 +23,7 @@
 #ifdef __linux__
 
 
-# define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
+# define LIBVIRT_VIRCGROUPPRIV_H_ALLOW
 # include "vircgrouppriv.h"
 # include "virstring.h"
 # include "virerror.h"
diff --git a/tests/virdbustest.c b/tests/virdbustest.c
index b62a42eca7416c3323d3872e4bfe9201a98c63f7..ec380e8fc2191118bc7a53a4ce0e46904be52b55 100644
--- a/tests/virdbustest.c
+++ b/tests/virdbustest.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#define __VIR_DBUS_PRIV_H_ALLOW__
+#define LIBVIRT_VIRDBUSPRIV_H_ALLOW
 #include "virdbuspriv.h"
 #include "virlog.h"
 #include "testutils.h"
diff --git a/tests/virfilewrapper.h b/tests/virfilewrapper.h
index 441013cec34ca373acdce5f76bf1f9f208a7bbff..9e3816b64493d946ca269015ee3fdd6643c29149 100644
--- a/tests/virfilewrapper.h
+++ b/tests/virfilewrapper.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_FILE_MOCK_H__
-# define __VIR_FILE_MOCK_H__
+#ifndef LIBVIRT_VIRFILEWRAPPER_H
+# define LIBVIRT_VIRFILEWRAPPER_H
 
 int
 virFileWrapperAddPrefix(const char *prefix,
@@ -29,4 +29,4 @@ virFileWrapperRemovePrefix(const char *prefix);
 void
 virFileWrapperClearPrefixes(void);
 
-#endif /* __VIR_FILE_MOCK_H__ */
+#endif /* LIBVIRT_VIRFILEWRAPPER_H */
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
index 71935761027736ca6df5d2f6aeedcd1a6a0397c3..63b9ced82002ebd9ed11be6d9e5f131cb4069304 100644
--- a/tests/virfirewalltest.c
+++ b/tests/virfirewalltest.c
@@ -18,18 +18,17 @@
 
 #include <config.h>
 
-#define __VIR_FIREWALL_PRIV_H_ALLOW__
-#define __VIR_COMMAND_PRIV_H_ALLOW__
-#define __VIR_DBUS_PRIV_H_ALLOW__
-
 #include "testutils.h"
 
 #if defined(__linux__)
 
 # include "virbuffer.h"
+# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
+# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW
 # include "virfirewallpriv.h"
 # include "virmock.h"
+# define LIBVIRT_VIRDBUSPRIV_H_ALLOW
 # include "virdbuspriv.h"
 
 # define VIR_FROM_THIS VIR_FROM_FIREWALL
diff --git a/tests/virhashdata.h b/tests/virhashdata.h
index 557ed8e923186b3a9f2fa25417f9df658ec18377..309519962d560629e6ebb444f2df3d411eaa8cfb 100644
--- a/tests/virhashdata.h
+++ b/tests/virhashdata.h
@@ -14,8 +14,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIRHASHDATA_H
-# define VIRHASHDATA_H
+#ifndef LIBVIRT_VIRHASHDATA_H
+# define LIBVIRT_VIRHASHDATA_H
 
 const char *uuids[] = {
 /* [  2] */ "a9b02f96-e430-4f7c-a7ff-a647d080447a",
@@ -284,4 +284,4 @@ const char *uuids_new[] = {
     "53c215dd-bdba-4fdc-887a-86ab6f860df4",
 };
 
-#endif /* VIRHASHDATA_H */
+#endif /* LIBVIRT_VIRHASHDATA_H */
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 219de942b79169ee55ec8763ba150d3bf4c2cd61..bb60dd3ffcf0b6fb17e0aaa54378204fb7294989 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -4,7 +4,7 @@
 
 #include "testutils.h"
 #include "internal.h"
-#define __VIR_HOSTCPU_PRIV_H_ALLOW__
+#define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW
 #include "virhostcpupriv.h"
 #include "virfile.h"
 #include "virstring.h"
diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
index 32b8a17b90aeb9bb2eb942f3500d827f3629bd0e..cc552a5cfe7460cd6224a86bac28ae843b2e6972 100644
--- a/tests/viriscsitest.c
+++ b/tests/viriscsitest.c
@@ -27,8 +27,7 @@ main(void)
     return EXIT_AM_SKIP;
 }
 #else
-# define __VIR_COMMAND_PRIV_H_ALLOW__
-
+# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
 # include "viriscsi.h"
 
diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index 879ed54036fb6d47816b6d82b344e0c14917d179..c90830a23cc4f27f071ac1c7f371a8c02817e234 100644
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -22,7 +22,7 @@
 
 #ifdef __linux__
 
-# define __VIR_COMMAND_PRIV_H_ALLOW__
+# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 # include "vircommandpriv.h"
 # include "virkmod.h"
 # include "virstring.h"
diff --git a/tests/virmock.h b/tests/virmock.h
index 09efc7478df1873542f981f7db976c6b623a1631..853dbb8be2bb3b8eb1d07f75a8dde19b623b9547 100644
--- a/tests/virmock.h
+++ b/tests/virmock.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_MOCK_H__
-# define __VIR_MOCK_H__
+#ifndef LIBVIRT_VIRMOCK_H
+# define LIBVIRT_VIRMOCK_H
 
 # if HAVE_DLFCN_H
 #  include <dlfcn.h>
@@ -300,4 +300,4 @@
         } \
     } while (0)
 
-#endif /* __VIR_MOCK_H__ */
+#endif /* LIBVIRT_VIRMOCK_H */
diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index 68e7595689c82a31b9821a8924cd02dbd34e4556..96776fa033490cce66a1535392b15a214c5992f5 100644
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -19,7 +19,7 @@
 #include <config.h>
 
 #include "testutils.h"
-#define __VIR_COMMAND_PRIV_H_ALLOW__
+#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"
 #include "virnetdevbandwidth.h"
 #include "netdev_bandwidth_conf.c"
diff --git a/tests/virnettlshelpers.h b/tests/virnettlshelpers.h
index 2ca4b52c3cab889f4c2dfa768c1d4e75fdee3648..3315a054e40b84674581c231b618f7fdd8b377f3 100644
--- a/tests/virnettlshelpers.h
+++ b/tests/virnettlshelpers.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIRNETTLSHELPERS_H
-# define VIRNETTLSHELPERS_H
+#ifndef LIBVIRT_VIRNETTLSHELPERS_H
+# define LIBVIRT_VIRNETTLSHELPERS_H
 
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
@@ -79,4 +79,4 @@ void testTLSCleanup(const char *keyfile);
 
 # endif
 
-#endif /* VIRNETTLSHELPERS_H */
+#endif /* LIBVIRT_VIRNETTLSHELPERS_H */
diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c
index d75c73f49e43d9a2813c6b2f11664115f8c30005..5abbb11e9ac7322227355c6e73cac00d1345a82e 100644
--- a/tests/virresctrltest.c
+++ b/tests/virresctrltest.c
@@ -2,7 +2,7 @@
 
 #include "testutils.h"
 #include "virfilewrapper.h"
-#define __VIR_RESCTRL_PRIV_H_ALLOW__
+#define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW
 #include "virresctrlpriv.h"
 
 
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index 66f24143d0e50aa56ef1686ab5c1bded1e61395c..82c02decd13a45d927258bebe09cd5a659d9ced2 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -24,7 +24,7 @@
 
 # include <dbus/dbus.h>
 
-# define __VIR_SYSTEMD_PRIV_H_ALLOW__ 1
+# define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW
 # include "virsystemdpriv.h"
 
 # include "virsystemd.h"
diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h
index 325058d4b833c7b710a7554c4502053a52c34b33..4c7525a0d034285554594efa72d7764744880e0e 100644
--- a/tools/nss/libvirt_nss.h
+++ b/tools/nss/libvirt_nss.h
@@ -23,8 +23,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __LIBVIRT_NSS_H__
-# define __LIBVIRT_NSS_H__
+#ifndef LIBVIRT_NSS_H
+# define LIBVIRT_NSS_H
 
 # include <nss.h>
 # include <netdb.h>
@@ -61,4 +61,4 @@ nss_module_register(const char *name, unsigned int *size,
                     nss_module_unregister_fn *unregister);
 # endif /* HAVE_BSD_NSS */
 
-#endif /* __LIBVIRT_NSS_H__ */
+#endif /* LIBVIRT_NSS_H */
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 343b2b9d6c7f4a894795abc4554be03e34f5687e..4069d976b8a196e194ee13beaecb04a1a60460ac 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef VIRSH_COMPLETER
-# define VIRSH_COMPLETER
+#ifndef LIBVIRT_VIRSH_COMPLETER_H
+# define LIBVIRT_VIRSH_COMPLETER_H
 
 # include "vsh.h"
 
@@ -109,4 +109,4 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl,
 char ** virshCellnoCompleter(vshControl *ctl,
                              const vshCmd *cmd,
                              unsigned int flags);
-#endif /* VIRSH_COMPLETER */
+#endif /* LIBVIRT_VIRSH_COMPLETER_H */
diff --git a/tools/virsh-console.h b/tools/virsh-console.h
index c3fa38340e7c7158075799d49d16d6a70a2d4570..bc1a70b5180823118a28038905dd2aa10564bf1e 100644
--- a/tools/virsh-console.h
+++ b/tools/virsh-console.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __VIR_CONSOLE_H__
-# define __VIR_CONSOLE_H__
+#ifndef LIBVIRT_VIRSH_CONSOLE_H
+# define LIBVIRT_VIRSH_CONSOLE_H
 
 # ifndef WIN32
 
@@ -32,4 +32,4 @@ int virshRunConsole(vshControl *ctl,
 
 # endif /* !WIN32 */
 
-#endif /* __VIR_CONSOLE_H__ */
+#endif /* LIBVIRT_VIRSH_CONSOLE_H */
diff --git a/tools/virsh-domain-monitor.h b/tools/virsh-domain-monitor.h
index 08ccab59029a074dca74d8361551e1d3080d6eeb..d641df4c131dd329fbf86dbe542bb456ece29d8f 100644
--- a/tools/virsh-domain-monitor.h
+++ b/tools/virsh-domain-monitor.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_DOMAIN_MONITOR_H
-# define VIRSH_DOMAIN_MONITOR_H
+#ifndef LIBVIRT_VIRSH_DOMAIN_MONITOR_H
+# define LIBVIRT_VIRSH_DOMAIN_MONITOR_H
 
 # include "virsh.h"
 
@@ -34,4 +34,4 @@ char *virshGetDomainDescription(vshControl *ctl, virDomainPtr dom,
 
 extern const vshCmdDef domMonitoringCmds[];
 
-#endif /* VIRSH_DOMAIN_MONITOR_H */
+#endif /* LIBVIRT_VIRSH_DOMAIN_MONITOR_H */
diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h
index d4407c6a771b5a39a1665cfb7cdd22a5e1ad8053..71d7902fee3b1dd4672353dc61cdc206f8e8159c 100644
--- a/tools/virsh-domain.h
+++ b/tools/virsh-domain.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_DOMAIN_H
-# define VIRSH_DOMAIN_H
+#ifndef LIBVIRT_VIRSH_DOMAIN_H
+# define LIBVIRT_VIRSH_DOMAIN_H
 
 # include "virsh.h"
 
@@ -38,4 +38,4 @@ extern virshDomainEventCallback virshDomainEventCallbacks[];
 
 extern const vshCmdDef domManagementCmds[];
 
-#endif /* VIRSH_DOMAIN_H */
+#endif /* LIBVIRT_VIRSH_DOMAIN_H */
diff --git a/tools/virsh-host.h b/tools/virsh-host.h
index 7bc3bd54faf41013b9afa3267b4c254cc0897db6..cdec9ae920b4bb026b0951a6c2f8de6d36f76344 100644
--- a/tools/virsh-host.h
+++ b/tools/virsh-host.h
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef VIRSH_HOST_H
-# define VIRSH_HOST_H
+#ifndef LIBVIRT_VIRSH_HOST_H
+# define LIBVIRT_VIRSH_HOST_H
 
 # include "virsh.h"
 
 extern const vshCmdDef hostAndHypervisorCmds[];
 
-#endif /* VIRSH_HOST_H */
+#endif /* LIBVIRT_VIRSH_HOST_H */
diff --git a/tools/virsh-interface.h b/tools/virsh-interface.h
index f02bbdbc943b421382cb8c7a0ac0cb1449b71346..03e6ec28a5456075c31c5caf797db5fc3f44b19f 100644
--- a/tools/virsh-interface.h
+++ b/tools/virsh-interface.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_INTERFACE_H
-# define VIRSH_INTERFACE_H
+#ifndef LIBVIRT_VIRSH_INTERFACE_H
+# define LIBVIRT_VIRSH_INTERFACE_H
 
 # include "virsh.h"
 
@@ -39,4 +39,4 @@ virInterfacePtr virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
 
 extern const vshCmdDef ifaceCmds[];
 
-#endif /* VIRSH_INTERFACE_H */
+#endif /* LIBVIRT_VIRSH_INTERFACE_H */
diff --git a/tools/virsh-network.h b/tools/virsh-network.h
index 0e1174946705aaff0acdede9fb44507c2cd9ab16..2aeb8944841f4ba6855b3aaab057fe6cc2a39476 100644
--- a/tools/virsh-network.h
+++ b/tools/virsh-network.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_NETWORK_H
-# define VIRSH_NETWORK_H
+#ifndef LIBVIRT_VIRSH_NETWORK_H
+# define LIBVIRT_VIRSH_NETWORK_H
 
 # include "virsh.h"
 
@@ -39,4 +39,4 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd,
 
 extern const vshCmdDef networkCmds[];
 
-#endif /* VIRSH_NETWORK_H */
+#endif /* LIBVIRT_VIRSH_NETWORK_H */
diff --git a/tools/virsh-nodedev.h b/tools/virsh-nodedev.h
index d32ca39c527b1be46a72194fa8777d6fe886e156..8be21d1b179c6c5644424791ad6b167e345e977d 100644
--- a/tools/virsh-nodedev.h
+++ b/tools/virsh-nodedev.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_NODEDEV_H
-# define VIRSH_NODEDEV_H
+#ifndef LIBVIRT_VIRSH_NODEDEV_H
+# define LIBVIRT_VIRSH_NODEDEV_H
 
 # include "virsh.h"
 
@@ -38,4 +38,4 @@ extern virshNodedevEventCallback virshNodedevEventCallbacks[];
 
 extern const vshCmdDef nodedevCmds[];
 
-#endif /* VIRSH_NODEDEV_H */
+#endif /* LIBVIRT_VIRSH_NODEDEV_H */
diff --git a/tools/virsh-nwfilter.h b/tools/virsh-nwfilter.h
index d8ca0e39607b0cf1b360341efa142515d8484801..14292424fa38a8bf026ce5893b2051dedde3c54d 100644
--- a/tools/virsh-nwfilter.h
+++ b/tools/virsh-nwfilter.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_NWFILTER_H
-# define VIRSH_NWFILTER_H
+#ifndef LIBVIRT_VIRSH_NWFILTER_H
+# define LIBVIRT_VIRSH_NWFILTER_H
 
 # include "virsh.h"
 
@@ -47,4 +47,4 @@ virshCommandOptNWFilterBindingBy(vshControl *ctl, const vshCmd *cmd,
 
 extern const vshCmdDef nwfilterCmds[];
 
-#endif /* VIRSH_NWFILTER_H */
+#endif /* LIBVIRT_VIRSH_NWFILTER_H */
diff --git a/tools/virsh-pool.h b/tools/virsh-pool.h
index 0df7a2e18d6ce9fd8c703fdc4434bfe0ec2d3c90..c6edfa5541249b0ab69990a0dbedd8cf29d2309b 100644
--- a/tools/virsh-pool.h
+++ b/tools/virsh-pool.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_POOL_H
-# define VIRSH_POOL_H
+#ifndef LIBVIRT_VIRSH_POOL_H
+# define LIBVIRT_VIRSH_POOL_H
 
 # include "virsh.h"
 
@@ -47,4 +47,4 @@ extern virshPoolEventCallback virshPoolEventCallbacks[];
 
 extern const vshCmdDef storagePoolCmds[];
 
-#endif /* VIRSH_POOL_H */
+#endif /* LIBVIRT_VIRSH_POOL_H */
diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h
index b68d366b2c6f5171688e13a931af54e0cfa3150e..03b7a6a16c998d4ef606f113d39a75e9dc92d0c7 100644
--- a/tools/virsh-secret.h
+++ b/tools/virsh-secret.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_SECRET_H
-# define VIRSH_SECRET_H
+#ifndef LIBVIRT_VIRSH_SECRET_H
+# define LIBVIRT_VIRSH_SECRET_H
 
 # include "virsh.h"
 
@@ -38,4 +38,4 @@ extern virshSecretEventCallback virshSecretEventCallbacks[];
 
 extern const vshCmdDef secretCmds[];
 
-#endif /* VIRSH_SECRET_H */
+#endif /* LIBVIRT_VIRSH_SECRET_H */
diff --git a/tools/virsh-snapshot.h b/tools/virsh-snapshot.h
index 2756d382b80943b02940eccbad323407dfe0626c..e999a9bb7b62fb385ca0e1619e1a69ec94606b96 100644
--- a/tools/virsh-snapshot.h
+++ b/tools/virsh-snapshot.h
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef VIRSH_SNAPSHOT_H
-# define VIRSH_SNAPSHOT_H
+#ifndef LIBVIRT_VIRSH_SNAPSHOT_H
+# define LIBVIRT_VIRSH_SNAPSHOT_H
 
 # include "virsh.h"
 
 extern const vshCmdDef snapshotCmds[];
 
-#endif /* VIRSH_SNAPSHOT_H */
+#endif /* LIBVIRT_VIRSH_SNAPSHOT_H */
diff --git a/tools/virsh-util.h b/tools/virsh-util.h
index 9a0af3513dd3b2201bfb2caad0efe036d63dfbd9..fb2ed277aff3e35caf439ceecb6914e25994a323 100644
--- a/tools/virsh-util.h
+++ b/tools/virsh-util.h
@@ -16,8 +16,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VIRSH_UTIL_H
-# define VIRSH_UTIL_H
+#ifndef LIBVIRT_VIRSH_UTIL_H
+# define LIBVIRT_VIRSH_UTIL_H
 
 # include "virsh.h"
 
@@ -104,4 +104,4 @@ virshDomainGetXML(vshControl *ctl,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
 
-#endif /* VIRSH_UTIL_H */
+#endif /* LIBVIRT_VIRSH_UTIL_H */
diff --git a/tools/virsh-volume.h b/tools/virsh-volume.h
index 60f647776e8ef369503c9e0e7cdf8fa023a9edac..ce4ee8a4900a5a684af14a6f5d82f5849fcbd0fd 100644
--- a/tools/virsh-volume.h
+++ b/tools/virsh-volume.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef VIRSH_VOLUME_H
-# define VIRSH_VOLUME_H
+#ifndef LIBVIRT_VIRSH_VOLUME_H
+# define LIBVIRT_VIRSH_VOLUME_H
 
 # include "virsh.h"
 
@@ -40,4 +40,4 @@ virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
 
 extern const vshCmdDef storageVolCmds[];
 
-#endif /* VIRSH_VOLUME_H */
+#endif /* LIBVIRT_VIRSH_VOLUME_H */
diff --git a/tools/virsh.h b/tools/virsh.h
index 6ff5c74b5e409a5861a43f116ca5bb72a0e090f8..dcf98c773b0317ff765e1ffe937b84e3baf3f595 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -22,8 +22,8 @@
  * Daniel P. Berrange <berrange@redhat.com>
  */
 
-#ifndef VIRSH_H
-# define VIRSH_H
+#ifndef LIBVIRT_VIRSH_H
+# define LIBVIRT_VIRSH_H
 
 # include <stdarg.h>
 # include <unistd.h>
@@ -176,4 +176,4 @@ typedef enum {
 
 virConnectPtr virshConnect(vshControl *ctl, const char *uri, bool readonly);
 
-#endif /* VIRSH_H */
+#endif /* LIBVIRT_VIRSH_H */
diff --git a/tools/virt-admin-completer.h b/tools/virt-admin-completer.h
index 311f47fcf66fd66c224d3e08e72f7bd6a5cccb0a..5358276dafa97de0c1ad15f70c4aadec94fe4355 100644
--- a/tools/virt-admin-completer.h
+++ b/tools/virt-admin-completer.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef VIRT_ADMIN_COMPLETER
-# define VIRT_ADMIN_COMPLETER
+#ifndef LIBVIRT_VIRT_ADMIN_COMPLETER_H
+# define LIBVIRT_VIRT_ADMIN_COMPLETER_H
 
 # include "vsh.h"
 
@@ -30,4 +30,4 @@ char **
 vshAdmServerCompleter(vshControl *ctl,
                       const vshCmd *cmd,
                       unsigned int flags);
-#endif /* VIRT_ADMIN_COMPLETER */
+#endif /* LIBVIRT_VIRT_ADMIN_COMPLETER_H */
diff --git a/tools/virt-admin.h b/tools/virt-admin.h
index 62228ccab18990a6cc129c91d62d9d6ce7e74c7a..de5a65ebdc23e684791becfacd92e4e8fa478503 100644
--- a/tools/virt-admin.h
+++ b/tools/virt-admin.h
@@ -20,8 +20,8 @@
  * Erik Skultety <eskultet@redhat.com>
  */
 
-#ifndef VIRT_ADMIN_H
-# define VIRT_ADMIN_H
+#ifndef LIBVIRT_VIRT_ADMIN_H
+# define LIBVIRT_VIRT_ADMIN_H
 
 # include "internal.h"
 # include "vsh.h"
@@ -43,4 +43,4 @@ struct _vshAdmControl {
     bool wantReconnect;
 };
 
-#endif /* VIRT_ADMIN_H */
+#endif /* LIBVIRT_VIRT_ADMIN_H */
diff --git a/tools/virt-host-validate-bhyve.h b/tools/virt-host-validate-bhyve.h
index 290d4336f846f319d5c3dde9c982732c91d82e22..c9a3f2b5b4690aa9ed72dc88d756e5016ac4cd5a 100644
--- a/tools/virt-host-validate-bhyve.h
+++ b/tools/virt-host-validate-bhyve.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIRT_HOST_VALIDATE_BHYVE_H__
-# define __VIRT_HOST_VALIDATE_BHYVE_H__
+#ifndef LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H
+# define LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H
 
 int virHostValidateBhyve(void);
 
-#endif /* __VIRT_HOST_VALIDATE_BHYVE_H__ */
+#endif /* LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H */
diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h
index b23dd7cdbeb233915df312594e52593897f96bc9..c2e11dae01cf171a298fe24608e925158adf3576 100644
--- a/tools/virt-host-validate-common.h
+++ b/tools/virt-host-validate-common.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __VIRT_HOST_VALIDATE_COMMON_H__
-# define __VIRT_HOST_VALIDATE_COMMON_H__
+#ifndef LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H
+# define LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H
 
 # include "internal.h"
 # include "virutil.h"
@@ -84,4 +84,4 @@ int virHostValidateCGroupControllers(const char *hvname,
 int virHostValidateIOMMU(const char *hvname,
                          virHostValidateLevel level);
 
-#endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */
+#endif /* LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H */
diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h
index 17b02a3e302d32f00a9a84c43ec22ed8fbdc8e01..b8d3dd8eb04ef69d2a1f81b9b1f13301052b75a0 100644
--- a/tools/virt-host-validate-lxc.h
+++ b/tools/virt-host-validate-lxc.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIRT_HOST_VALIDATE_LXC_H__
-# define __VIRT_HOST_VALIDATE_LXC_H__
+#ifndef LIBVIRT_VIRT_HOST_VALIDATE_LXC_H
+# define LIBVIRT_VIRT_HOST_VALIDATE_LXC_H
 
 int virHostValidateLXC(void);
 
-#endif /* __VIRT_HOST_VALIDATE_LXC_H__ */
+#endif /* LIBVIRT_VIRT_HOST_VALIDATE_LXC_H */
diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h
index 8a0ce4617a7e52304977ed420aebc58c747da000..031029dd61c32fdb404778cccdb0f5787a1833ea 100644
--- a/tools/virt-host-validate-qemu.h
+++ b/tools/virt-host-validate-qemu.h
@@ -19,9 +19,9 @@
  *
  */
 
-#ifndef __VIRT_HOST_VALIDATE_QEMU_H__
-# define __VIRT_HOST_VALIDATE_QEMU_H__
+#ifndef LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H
+# define LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H
 
 int virHostValidateQEMU(void);
 
-#endif /* __VIRT_HOST_VALIDATE_QEMU_H__ */
+#endif /* LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H */
diff --git a/tools/vsh-table.h b/tools/vsh-table.h
index 15a9f8957b97e4ea386ae2dd575285eb712af65a..e5b8a9f48030e39c5040a1f890ca1ca4533ff7f3 100644
--- a/tools/vsh-table.h
+++ b/tools/vsh-table.h
@@ -18,8 +18,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef VSH_TABLE_H
-# define VSH_TABLE_H
+#ifndef LIBVIRT_VSH_TABLE_H
+# define LIBVIRT_VSH_TABLE_H
 
 # include "vsh.h"
 
@@ -34,4 +34,4 @@ int vshTableRowAppend(vshTablePtr table, const char *arg, ...);
 void vshTablePrintToStdout(vshTablePtr table, vshControl *ctl);
 char *vshTablePrintToString(vshTablePtr table, bool header);
 
-#endif /* VSH_TABLE_H */
+#endif /* LIBVIRT_VSH_TABLE_H */
diff --git a/tools/vsh.h b/tools/vsh.h
index 8b4f544a61aa5b1bb3b19aa64bdebb5c1dd9d213..d5f15622f8700c776f2f791b491bf05d2ddf3910 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -22,8 +22,8 @@
  * Daniel P. Berrange <berrange@redhat.com>
  */
 
-#ifndef VSH_H
-# define VSH_H
+#ifndef LIBVIRT_VSH_H
+# define LIBVIRT_VSH_H
 
 # include <stdarg.h>
 # include <unistd.h>
@@ -587,4 +587,4 @@ char *_vshStrdup(vshControl *ctl, const char *s, const char *filename,
 # define VSH_REQUIRE_OPTION_VAR(VARNAME1, VARNAME2) \
     VSH_REQUIRE_OPTION_EXPR(#VARNAME1, VARNAME1, #VARNAME2, VARNAME2)
 
-#endif /* VSH_H */
+#endif /* LIBVIRT_VSH_H */
diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h
index 896b33fb6c3d5bc6976b7e4e47c8d78485518eb6..4f2a275ba6bd4230bb7ffac350c3cf43783bbe7c 100644
--- a/tools/wireshark/src/packet-libvirt.h
+++ b/tools/wireshark/src/packet-libvirt.h
@@ -17,8 +17,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _PACKET_LIBVIRT_H_
-# define _PACKET_LIBVIRT_H_
+#ifndef LIBVIRT_PACKET_LIBVIRT_H
+# define LIBVIRT_PACKET_LIBVIRT_H
 
 # include "libvirt/libvirt.h"
 
@@ -112,4 +112,4 @@ static gboolean dissect_xdr_array(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, in
 
 # include "libvirt/protocol.h"
 
-#endif /* _PACKET_LIBVIRT_H_ */
+#endif /* LIBVIRT_PACKET_LIBVIRT_H */