diff --git a/HACKING b/HACKING
index 4cf290696b2cf58bb2dd966ec72468fcbf9d14de..88a42864b86b52c823fdf091baad8e1bf5527237 100644
--- a/HACKING
+++ b/HACKING
@@ -477,7 +477,7 @@ Use parenthesis when checking if a macro is defined, and use indentation to
 track nesting:
 
   #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE)
-  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
+  # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c)
   #endif
 
 
diff --git a/docs/hacking.html.in b/docs/hacking.html.in
index 6a92f462a07b39f74c6639236ca28c32b6098518..bc76542071c423da8aa67d1d5739a52fdcd47ced 100644
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
@@ -614,7 +614,7 @@
     </p>
 <pre>
   #if defined(HAVE_POSIX_FALLOCATE) &amp;&amp; !defined(HAVE_FALLOCATE)
-  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
+  # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c)
   #endif
 </pre>
 
diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c
index 2a5a83b3eb368fc37f966765d754dfc19ca15b6b..d6cfe4658cd684a19df1abcd299ae9fb3cd0317d 100644
--- a/examples/object-events/event-test.c
+++ b/examples/object-events/event-test.c
@@ -10,7 +10,7 @@
 #include <libvirt/virterror.h>
 
 #define VIR_DEBUG(fmt) printf("%s:%d: " fmt "\n", __func__, __LINE__)
-#define STREQ(a,b) (strcmp(a,b) == 0)
+#define STREQ(a, b) (strcmp(a, b) == 0)
 
 #ifndef ATTRIBUTE_UNUSED
 # define ATTRIBUTE_UNUSED __attribute__((__unused__))
diff --git a/src/driver.h b/src/driver.h
index 158df79e5cfc129bec349a486a1b3317a2709051..ba7c1fc7a438e2048124ac37baa29d8fa9d2a08c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -78,7 +78,7 @@ typedef enum {
  *   != 0  Feature is supported.
  *   0     Feature is not supported.
  */
-# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature)                     \
+# define VIR_DRV_SUPPORTS_FEATURE(drv, conn, feature)                   \
     ((drv)->connectSupportsFeature ?                                    \
         (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0)
 
diff --git a/src/internal.h b/src/internal.h
index d355344ab1bc3e74a3de5820cc55b122fb04bca2..f6a88b2c961aa0548dbdc1c974b0cb21a9412a7c 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -78,16 +78,16 @@
 # endif
 
 /* String equality tests, suggested by Jim Meyering. */
-# define STREQ(a,b) (strcmp(a,b) == 0)
-# define STRCASEEQ(a,b) (c_strcasecmp(a,b) == 0)
-# define STRNEQ(a,b) (strcmp(a,b) != 0)
-# define STRCASENEQ(a,b) (c_strcasecmp(a,b) != 0)
-# define STREQLEN(a,b,n) (strncmp(a,b,n) == 0)
-# define STRCASEEQLEN(a,b,n) (c_strncasecmp(a,b,n) == 0)
-# define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0)
-# define STRCASENEQLEN(a,b,n) (c_strncasecmp(a,b,n) != 0)
-# define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0)
-# define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL)
+# define STREQ(a, b) (strcmp(a, b) == 0)
+# define STRCASEEQ(a, b) (c_strcasecmp(a, b) == 0)
+# define STRNEQ(a, b) (strcmp(a, b) != 0)
+# define STRCASENEQ(a, b) (c_strcasecmp(a, b) != 0)
+# define STREQLEN(a, b, n) (strncmp(a, b, n) == 0)
+# define STRCASEEQLEN(a, b, n) (c_strncasecmp(a, b, n) == 0)
+# define STRNEQLEN(a, b, n) (strncmp(a, b, n) != 0)
+# define STRCASENEQLEN(a, b, n) (c_strncasecmp(a, b, n) != 0)
+# define STRPREFIX(a, b) (strncmp(a, b, strlen(b)) == 0)
+# define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL)
 
 # define STREQ_NULLABLE(a, b)                           \
     ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b))
@@ -109,7 +109,7 @@
 #    define __GNUC_PREREQ(maj, min)                                        \
     ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
 #   else
-#    define __GNUC_PREREQ(maj,min) 0
+#    define __GNUC_PREREQ(maj, min) 0
 #   endif
 
 /* Work around broken limits.h on debian etch */
@@ -162,10 +162,10 @@
  */
 #  ifndef ATTRIBUTE_FMT_PRINTF
 #   if __GNUC_PREREQ (4, 4)
-#    define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) \
+#    define ATTRIBUTE_FMT_PRINTF(fmtpos, argpos) \
     __attribute__((__format__ (__gnu_printf__, fmtpos, argpos)))
 #   else
-#    define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) \
+#    define ATTRIBUTE_FMT_PRINTF(fmtpos, argpos) \
     __attribute__((__format__ (__printf__, fmtpos, argpos)))
 #   endif
 #  endif
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 367d0ceb1c0e25659243b176e6d33138188bd2c6..0a40e94cb33c611bb08a72bae7f3f62d106cd671 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -99,7 +99,7 @@ static int virLockManagerLockDaemonLoadConfig(const char *configFile)
     if (!(conf = virConfReadFile(configFile, 0)))
         return -1;
 
-#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) {               \
+#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) {              \
         virReportError(VIR_ERR_INTERNAL_ERROR,                          \
                        "%s: %s: expected type " #typ,                   \
                        configFile, (name));                             \
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index ea43051ee6830ddc7f10d366afda5a72aaccd804..aade437e5eb8bc6f1a97cf4a4bcea4afe464969e 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -118,7 +118,7 @@ static int virLockManagerSanlockLoadConfig(const char *configFile)
     if (!(conf = virConfReadFile(configFile, 0)))
         return -1;
 
-#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) {               \
+#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) {              \
         virReportError(VIR_ERR_INTERNAL_ERROR,                          \
                        "%s: %s: expected type " #typ,                   \
                        configFile, (name));                             \
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index b5fd3cb3ad3d67ca81a854737c72deb54d8841d7..17df7a84c0e6ffeedbfc02f51577deaeb0b91332 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -259,7 +259,7 @@ virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg,
     if (!conf)
         goto done;
 
-#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) {               \
+#define CHECK_TYPE(name, typ) if (p && p->type != (typ)) {              \
         virReportError(VIR_ERR_INTERNAL_ERROR,                          \
                        "%s: %s: expected type " #typ,                   \
                        filename, (name));                               \
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index bfd05530e090b15d32fbd39ccf637a35103b110d..a2f58ba11cba54bcf3c059aa30146b9e964db4b4 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -1229,7 +1229,7 @@ virNWFilterSnoopRateLimit(virNWFilterSnoopRateLimitConfPtr rl)
 {
     time_t now = time(0);
     int diff;
-# define IN_BURST(n,b) ((n)-(b) <= 1) /* bursts span 2 discrete seconds */
+# define IN_BURST(n, b) ((n)-(b) <= 1) /* bursts span 2 discrete seconds */
 
     if (rl->prev != now && !IN_BURST(now, rl->burst)) {
         rl->prev = now;
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 25e6d5e6ece36f85711c18316127a3a01d517e8e..e2ec54f5ba476596b5fb3a6e7333767b488dfdff 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -347,7 +347,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (!(conf = virConfReadFile(filename, 0)))
         goto cleanup;
 
-#define CHECK_TYPE(name,typ)                          \
+#define CHECK_TYPE(name, typ)                         \
     if (p && p->type != (typ)) {                      \
         virReportError(VIR_ERR_INTERNAL_ERROR,        \
                        "%s: %s: expected type " #typ, \
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index c04f1bdd3d53109462fa069de18231f989e49b5b..84e7ba01c3576d1e5de913b2aa10b74313995b6d 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -48,7 +48,7 @@
 #include "virstring.h"
 
 /* we don't need to include the full internal.h just for this */
-#define STREQ(a,b) (strcmp(a,b) == 0)
+#define STREQ(a, b) (strcmp(a, b) == 0)
 
 /* Make the comparisons below fail if your parted headers
    are so old that they lack the definition.  */