diff --git a/src/vbox/vbox_V2_2.c b/src/vbox/vbox_V2_2.c
index 6d7d37b434cf87a8d87517b39120e574d3ab9e19..a6cb17039211d909176d5b6762590097a14f4941 100644
--- a/src/vbox/vbox_V2_2.c
+++ b/src/vbox/vbox_V2_2.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    2002000
+#define VBOX_API_VERSION 2002000
 /** Version specific prefix. */
-#define NAME(name)  vbox22##name
+#define NAME(name) vbox22##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V3_0.c b/src/vbox/vbox_V3_0.c
index 0b0456a916080de4263bc9c06b785bbbb2ee7461..72de5bd930e12a48ccd7e8965adbd92daaf1df07 100644
--- a/src/vbox/vbox_V3_0.c
+++ b/src/vbox/vbox_V3_0.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    3000000
+#define VBOX_API_VERSION 3000000
 /** Version specific prefix. */
-#define NAME(name)  vbox30##name
+#define NAME(name) vbox30##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V3_1.c b/src/vbox/vbox_V3_1.c
index 33bf13f856afbfce411d72e6ee3cbe5a720c730a..0da16b45cf305a45858f133d7d46775c9c159b8f 100644
--- a/src/vbox/vbox_V3_1.c
+++ b/src/vbox/vbox_V3_1.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    3001000
+#define VBOX_API_VERSION 3001000
 /** Version specific prefix. */
-#define NAME(name)  vbox31##name
+#define NAME(name) vbox31##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V3_2.c b/src/vbox/vbox_V3_2.c
index df03d38e8e57854bd397901669591706d6efa457..8b53d77a3ac79f213cfc6f7d93c42f876868a734 100644
--- a/src/vbox/vbox_V3_2.c
+++ b/src/vbox/vbox_V3_2.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    3002000
+#define VBOX_API_VERSION 3002000
 /** Version specific prefix. */
-#define NAME(name)  vbox32##name
+#define NAME(name) vbox32##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_0.c b/src/vbox/vbox_V4_0.c
index 8017f0124709b55d74f472c356f993af6f9526f3..e4dc13a92bbbad8877a79372f9d308c707caebd3 100644
--- a/src/vbox/vbox_V4_0.c
+++ b/src/vbox/vbox_V4_0.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4000000
+#define VBOX_API_VERSION 4000000
 /** Version specific prefix. */
-#define NAME(name)  vbox40##name
+#define NAME(name) vbox40##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_1.c b/src/vbox/vbox_V4_1.c
index b9de7fdf865bda40be9563eccaad23d80e40009a..b3e8eda209afa01e17a61a04d88c4e55fbea9c2d 100644
--- a/src/vbox/vbox_V4_1.c
+++ b/src/vbox/vbox_V4_1.c
@@ -30,8 +30,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4001000
+#define VBOX_API_VERSION 4001000
 /** Version specific prefix. */
-#define NAME(name)  vbox41##name
+#define NAME(name) vbox41##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_2.c b/src/vbox/vbox_V4_2.c
index 59a34915c03bc435cf7bee3d45825b21c77e2e03..00b1e42d38333d5a82ecb420362b85a45791993f 100644
--- a/src/vbox/vbox_V4_2.c
+++ b/src/vbox/vbox_V4_2.c
@@ -6,8 +6,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4002000
+#define VBOX_API_VERSION 4002000
 /** Version specific prefix. */
-#define NAME(name)  vbox42##name
+#define NAME(name) vbox42##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_2_20.c b/src/vbox/vbox_V4_2_20.c
index a0928bd4f580a5556d0db1dc568903c65d975f7e..73a2f644d2c90d5112e78f3c7ee77bab1bf479e4 100644
--- a/src/vbox/vbox_V4_2_20.c
+++ b/src/vbox/vbox_V4_2_20.c
@@ -6,8 +6,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4002020
+#define VBOX_API_VERSION 4002020
 /** Version specific prefix. */
-#define NAME(name)  vbox42_20##name
+#define NAME(name) vbox42_20##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_3.c b/src/vbox/vbox_V4_3.c
index 258f2c6b00fe490e39ed6e731e6158b41c91858a..97810ddfcf00040621b08c3be6ca052acb126d07 100644
--- a/src/vbox/vbox_V4_3.c
+++ b/src/vbox/vbox_V4_3.c
@@ -6,8 +6,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4003000
+#define VBOX_API_VERSION 4003000
 /** Version specific prefix. */
-#define NAME(name)  vbox43##name
+#define NAME(name) vbox43##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_V4_3_4.c b/src/vbox/vbox_V4_3_4.c
index 23869ad6a63d055b3b6d9a8bfcc4af12afc7a4fd..19ee5ef2a2a12a4f1d5634251d4197e07f2e79c4 100644
--- a/src/vbox/vbox_V4_3_4.c
+++ b/src/vbox/vbox_V4_3_4.c
@@ -6,8 +6,8 @@
 #include <config.h>
 
 /** The API Version */
-#define VBOX_API_VERSION    4003004
+#define VBOX_API_VERSION 4003004
 /** Version specific prefix. */
-#define NAME(name)  vbox43_4##name
+#define NAME(name) vbox43_4##name
 
 #include "vbox_tmpl.c"
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 944eb95e8a3f3c5b6093e639b6aac815eaa2afa8..ff03279ed1ad357b8fecd361ffbeb2f2c4c89a56 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -54,11 +54,11 @@ VIR_LOG_INIT("vbox.vbox_XPCOMCGlue");
 #if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || \
     defined(__FreeBSD__) || defined(__OpenBSD__) || \
     defined(__FreeBSD_kernel__)
-# define DYNLIB_NAME    "VBoxXPCOMC.so"
+# define DYNLIB_NAME "VBoxXPCOMC.so"
 #elif defined(__APPLE__)
-# define DYNLIB_NAME    "VBoxXPCOMC.dylib"
+# define DYNLIB_NAME "VBoxXPCOMC.dylib"
 #elif defined(_MSC_VER) || defined(__OS2__)
-# define DYNLIB_NAME    "VBoxXPCOMC.dll"
+# define DYNLIB_NAME "VBoxXPCOMC.dll"
 #else
 # error "Port me"
 #endif