diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 7dc0618cd2..11b61c91e9 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_device_monitor.c: device monitor functions for managing VMware ESX
  *                       host devices
diff --git a/src/esx/esx_device_monitor.h b/src/esx/esx_device_monitor.h
index a1efdcb6e8..1b2795e5b2 100644
--- a/src/esx/esx_device_monitor.h
+++ b/src/esx/esx_device_monitor.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_device_monitor.h: device monitor methods for managing VMware ESX
  *                       host devices
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 6a2efe31b2..2512a6e8ef 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_driver.c: core driver functions for managing VMware ESX hosts
  *
diff --git a/src/esx/esx_driver.h b/src/esx/esx_driver.h
index 9df348dd69..0de6a648c2 100644
--- a/src/esx/esx_driver.h
+++ b/src/esx/esx_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_driver.h: core driver functions for managing VMware ESX hosts
  *
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index dcb9f038a7..193565ea3f 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_interface_driver.c: interface driver functions for managing VMware ESX
  *                         host interfaces
diff --git a/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h
index 8cacc44fe9..cf0c4bd326 100644
--- a/src/esx/esx_interface_driver.h
+++ b/src/esx/esx_interface_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_interface_driver.h: interface driver functions for managing VMware ESX
  *                         host interfaces
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index c8b53b1a16..4449ced13a 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_network_driver.c: network driver functions for managing VMware ESX
  *                       host networks
diff --git a/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h
index 69fb48ae92..7a8a225f9f 100644
--- a/src/esx/esx_network_driver.h
+++ b/src/esx/esx_network_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_network_driver.h: network driver functions for managing VMware ESX
  *                       host networks
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 3b932de1c4..b764e2dcf8 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_nwfilter_driver.c: nwfilter driver functions for managing VMware ESX
  *                        firewall rules
diff --git a/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h
index a53aba3561..4fa88c3107 100644
--- a/src/esx/esx_nwfilter_driver.h
+++ b/src/esx/esx_nwfilter_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_nwfilter_driver.h: nwfilter driver functions for managing VMware ESX
  *                        firewall rules
diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h
index 83e945f13c..05ee1d6aa9 100644
--- a/src/esx/esx_private.h
+++ b/src/esx/esx_private.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_private.h: private driver struct for the VMware ESX driver
  *
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 5607a2efb3..327536911b 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_secret_driver.c: secret driver functions for VMware ESX secret manipulation
  *
diff --git a/src/esx/esx_secret_driver.h b/src/esx/esx_secret_driver.h
index 7434c3fb14..07f8b13ed3 100644
--- a/src/esx/esx_secret_driver.h
+++ b/src/esx/esx_secret_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_secret_driver.h: secret driver functions for VMware ESX secret manipulation
  *
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 66b91d1659..b7287fbf23 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_backend_iscsi.c: ESX storage backend for iSCSI handling
  *
diff --git a/src/esx/esx_storage_backend_iscsi.h b/src/esx/esx_storage_backend_iscsi.h
index 00c9e2940e..da461c1cd0 100644
--- a/src/esx/esx_storage_backend_iscsi.h
+++ b/src/esx/esx_storage_backend_iscsi.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_backend_iscsi.h: ESX storage backend for iSCSI handling
  *
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index f4a5d5043f..64b93f7954 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_backend_vmfs.c: ESX storage driver backend for
  *                             managing VMFS datastores
diff --git a/src/esx/esx_storage_backend_vmfs.h b/src/esx/esx_storage_backend_vmfs.h
index 9071642db7..4dad9bcd9a 100644
--- a/src/esx/esx_storage_backend_vmfs.h
+++ b/src/esx/esx_storage_backend_vmfs.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_backend_vmfs.h: ESX storage driver backend for
  *                             managing VMFS datastores
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index 926c5f2969..6353dfc507 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_driver.c: storage driver functions for managing VMware ESX
  *                       host storage
diff --git a/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h
index eab0c6f5d4..871e59c3f3 100644
--- a/src/esx/esx_storage_driver.h
+++ b/src/esx/esx_storage_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_storage_driver.h: storage driver methods for managing VMware ESX
  *                       host storage
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 39b7c0e66d..f4d1f941d5 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_util.c: utility functions for the VMware ESX driver
  *
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 777ce30b92..e554b6347f 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi.c: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index aeee953aa7..7cc2f71a0a 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi.h: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 519daf6546..0a3b3dd93c 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi_methods.c: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h
index 0b4131a887..a68ff1bb8d 100644
--- a/src/esx/esx_vi_methods.h
+++ b/src/esx/esx_vi_methods.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi_methods.h: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 2d6f8dba25..8eff66e1c8 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi_types.c: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h
index 92dc16f73a..34901d7e9d 100644
--- a/src/esx/esx_vi_types.h
+++ b/src/esx/esx_vi_types.h
@@ -1,4 +1,3 @@
-
 /*
  * esx_vi_types.h: client for the VMware VI API 2.5 to manage ESX hosts
  *
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 83ea72a303..413fa10b48 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_device_monitor.c: device monitor functions for managing
  *                          Microsoft Hyper-V host devices
diff --git a/src/hyperv/hyperv_device_monitor.h b/src/hyperv/hyperv_device_monitor.h
index 17a20cfdfa..36459b6258 100644
--- a/src/hyperv/hyperv_device_monitor.h
+++ b/src/hyperv/hyperv_device_monitor.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_device_monitor.h: device monitor functions for managing
  *                          Microsoft Hyper-V host devices
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 6680e665ca..b2c367525a 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_driver.c: core driver functions for managing Microsoft Hyper-V hosts
  *
diff --git a/src/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h
index 166cdce5b7..e7c249a328 100644
--- a/src/hyperv/hyperv_driver.h
+++ b/src/hyperv/hyperv_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_driver.h: core driver functions for managing Microsoft Hyper-V hosts
  *
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 62123a4f36..fbdd1a685a 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_interface_driver.c: interface driver functions for managing
  *                            Microsoft Hyper-V host interfaces
diff --git a/src/hyperv/hyperv_interface_driver.h b/src/hyperv/hyperv_interface_driver.h
index 1012990b81..2ab022530b 100644
--- a/src/hyperv/hyperv_interface_driver.h
+++ b/src/hyperv/hyperv_interface_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_interface_driver.h: interface driver functions for managing
  *                            Microsoft Hyper-V host interfaces
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index e23f53a16c..32f3d83058 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_network_driver.c: network driver functions for managing
  *                          Microsoft Hyper-V host networks
diff --git a/src/hyperv/hyperv_network_driver.h b/src/hyperv/hyperv_network_driver.h
index 047560e014..231d94bc68 100644
--- a/src/hyperv/hyperv_network_driver.h
+++ b/src/hyperv/hyperv_network_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_network_driver.h: network driver functions for managing
  *                          Microsoft Hyper-V host networks
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 034323845b..b71c66c624 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_nwfilter_driver.c: nwfilter driver functions for managing
  *                           Microsoft Hyper-V firewall rules
diff --git a/src/hyperv/hyperv_nwfilter_driver.h b/src/hyperv/hyperv_nwfilter_driver.h
index 73dfedd5bc..d5918cb9b0 100644
--- a/src/hyperv/hyperv_nwfilter_driver.h
+++ b/src/hyperv/hyperv_nwfilter_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_nwfilter_driver.h: nwfilter driver functions for managing
  *                           Microsoft Hyper-V firewall rules
diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index 9c9fd3eb8a..574bb5fe8c 100644
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_private.h: private driver struct for the Microsoft Hyper-V driver
  *
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 3f9f8f5188..1c4aae6476 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_secret_driver.c: secret driver functions for Microsoft Hyper-V
  *                         secret manipulation
diff --git a/src/hyperv/hyperv_secret_driver.h b/src/hyperv/hyperv_secret_driver.h
index 8b990c0a66..40bb3ada4c 100644
--- a/src/hyperv/hyperv_secret_driver.h
+++ b/src/hyperv/hyperv_secret_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_secret_driver.h: secret driver functions for Microsoft Hyper-V
  *                         secret manipulation
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 5acc4d8fe8..81fa74a75b 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_storage_driver.c: storage driver functions for managing
  *                          Microsoft Hyper-V host storage
diff --git a/src/hyperv/hyperv_storage_driver.h b/src/hyperv/hyperv_storage_driver.h
index 34844d825f..651fb51926 100644
--- a/src/hyperv/hyperv_storage_driver.h
+++ b/src/hyperv/hyperv_storage_driver.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_storage_driver.h: storage driver methods for managing
  *                          Microsoft Hyper-V host storage
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index e14c63422b..95d0b79590 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_util.c: utility functions for the Microsoft Hyper-V driver
  *
diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h
index f8d6e55805..ededa3166f 100644
--- a/src/hyperv/hyperv_util.h
+++ b/src/hyperv/hyperv_util.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_util.h: utility functions for the Microsoft Hyper-V driver
  *
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index a603badcf3..6fbe54d5a1 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_wmi.c: general WMI over WSMAN related functions and structures for
  *               managing Microsoft Hyper-V hosts
diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index 85a2bbc6ff..5fbbbac0d7 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_wmi.h: general WMI over WSMAN related functions and structures for
  *               managing Microsoft Hyper-V hosts
diff --git a/src/hyperv/hyperv_wmi_classes.c b/src/hyperv/hyperv_wmi_classes.c
index 5204238742..00bee2e8f3 100644
--- a/src/hyperv/hyperv_wmi_classes.c
+++ b/src/hyperv/hyperv_wmi_classes.c
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_wmi_classes.c: WMI classes for managing Microsoft Hyper-V hosts
  *
diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index 4b6c745cfd..ac7a3b8ab0 100644
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -1,4 +1,3 @@
-
 /*
  * hyperv_wmi_classes.h: WMI classes for managing Microsoft Hyper-V hosts
  *
diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h
index a0ac7a5f22..f66ed8622c 100644
--- a/src/hyperv/openwsman.h
+++ b/src/hyperv/openwsman.h
@@ -1,4 +1,3 @@
-
 /*
  * openwsman.h: workarounds for bugs in openwsman
  *
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 0bbec2ea95..5d5473edc9 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1,4 +1,3 @@
-
 /*
  * qemu_migration.c: QEMU migration handling
  *
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 239671548a..b8b0610050 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1,4 +1,3 @@
-
 /*
  * virt-aa-helper: wrapper program used by AppArmor security driver.
  *
diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index c87004a10a..fbf42d8f1d 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -1,4 +1,3 @@
-
 /*
  * vbox_MSCOMGlue.c: glue to the MSCOM based VirtualBox API
  *
diff --git a/src/vbox/vbox_MSCOMGlue.h b/src/vbox/vbox_MSCOMGlue.h
index 0e573db6a1..cdc38f8310 100644
--- a/src/vbox/vbox_MSCOMGlue.h
+++ b/src/vbox/vbox_MSCOMGlue.h
@@ -1,4 +1,3 @@
-
 /*
  * vbox_MSCOMGlue.h: glue to the MSCOM based VirtualBox API
  *
diff --git a/src/vbox/vbox_glue.c b/src/vbox/vbox_glue.c
index 602d4679a2..afd6af4ee7 100644
--- a/src/vbox/vbox_glue.c
+++ b/src/vbox/vbox_glue.c
@@ -1,4 +1,3 @@
-
 /*
  * vbox_glue.c: glue to the VirtualBox API
  *
diff --git a/src/vbox/vbox_glue.h b/src/vbox/vbox_glue.h
index dcc249595d..080479c74a 100644
--- a/src/vbox/vbox_glue.h
+++ b/src/vbox/vbox_glue.h
@@ -1,4 +1,3 @@
-
 /*
  * vbox_glue.h: glue to the VirtualBox API
  *
diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index d07bba2e36..6a68c8b281 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -1,4 +1,3 @@
-
 /*
  * vmx.h: VMware VMX parsing/formatting functions
  *
diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h
index dbfe834166..3f9a67b7f4 100644
--- a/tests/testutilslxc.h
+++ b/tests/testutilslxc.h
@@ -1,4 +1,3 @@
-
 #include "capabilities.h"
 
 #define FAKEDEVDIR0 "/fakedevdir0/bla/fasl"
diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h
index 7f27e225cc..54155e5e76 100644
--- a/tests/testutilsxen.h
+++ b/tests/testutilsxen.h
@@ -1,4 +1,3 @@
-
 #include "capabilities.h"
 
 virCapsPtr testXenCapsInit(void);
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 7597bd44e6..d6bc51a231 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -1,4 +1,3 @@
-
 #include <config.h>
 
 #include <stdio.h>