[libvirt] [PATCH] Remove all Author(s): lines from source file headers

13 Dec 2018

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index 18a1c5bce3..567fc651f3 100755
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#     Daniel P. Berrange <berrange@redhat.com>
 
 use strict;
 use warnings;
diff --git a/build-aux/check-spacing.pl b/build-aux/check-spacing.pl
index a32e355be6..33377f3dd3 100755
--- a/build-aux/check-spacing.pl
+++ b/build-aux/check-spacing.pl
@@ -16,9 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#     Daniel P. Berrange <berrange@redhat.com>
 
 use strict;
 use warnings;
diff --git a/cfg.mk b/cfg.mk
index c468d153eb..bf233dfcd8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1050,6 +1050,11 @@ sc_prohibit_http_urls:
 	halt='Links must use https:// protocol' \
 	  $(_sc_search_regexp)
 
+sc_prohibit_author:
+	@prohibit="(\*|#)\s*Authors?:" \
+	halt="Author: statements are prohibited in source comments" \
+	  $(_sc_search_regexp)
+
 # Alignment is usually achieved through spaces (at least two of them)
 # or tabs (at least one of them) right before the trailing backslash
 sc_prohibit_backslash_alignment:
diff --git a/docs/reformat-news.py b/docs/reformat-news.py
index d8726f1a1c..955ce2d45b 100755
--- a/docs/reformat-news.py
+++ b/docs/reformat-news.py
@@ -17,9 +17,6 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
-#
-# Authors:
-#     Andrea Bolognani <abologna@redhat.com>
 
 from __future__ import print_function
 
diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c
index 919932b0e8..ac816044ef 100644
--- a/examples/domsuspend/suspend.c
+++ b/examples/domsuspend/suspend.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c
index 2077c49fbd..fb631781fd 100644
--- a/examples/domtop/domtop.c
+++ b/examples/domtop/domtop.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/examples/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert
index 5260eb708f..d94befd7fc 100644
--- a/examples/lxcconvert/virt-lxc-convert
+++ b/examples/lxcconvert/virt-lxc-convert
@@ -17,7 +17,6 @@
 #  License along with this library.  If not, see
 #  <http://www.gnu.org/licenses/>.
 #
-#  Author: Cedric Bosdonnat <cbosdonnat@suse.com>
 
 handler_cleanup()
 {
diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp
index 97337d6a0b..fd4fe4664d 100644
--- a/examples/systemtap/events.stp
+++ b/examples/systemtap/events.stp
@@ -16,7 +16,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Daniel P. Berrange <berrange@redhat.com>
 #
 # This script will monitor all operation of the libvirt event loop
 # in both client and server. Example output is:
diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp
index e01b2f79a6..0c9cc38692 100644
--- a/examples/systemtap/lock-debug.stp
+++ b/examples/systemtap/lock-debug.stp
@@ -16,7 +16,6 @@
 #
 # Debug RWLock mechanisms as well.
 #
-# Author: Martin Kletzander <mkletzan@redhat.com>
 
 
 global mx_tolock
diff --git a/examples/systemtap/qemu-monitor.stp b/examples/systemtap/qemu-monitor.stp
index 171d9d8933..192bac4f8e 100644
--- a/examples/systemtap/qemu-monitor.stp
+++ b/examples/systemtap/qemu-monitor.stp
@@ -16,7 +16,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Daniel P. Berrange <berrange@redhat.com>
 #
 # This script will monitor all messages sent/received between libvirt
 # and the QEMU monitor
diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp
index c8d5c179c1..f7db0a03aa 100644
--- a/examples/systemtap/rpc-monitor.stp
+++ b/examples/systemtap/rpc-monitor.stp
@@ -16,7 +16,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Daniel P. Berrange <berrange@redhat.com>
 #
 # This script will monitor all RPC messages going in/out of libvirtd and
 # any connected clients. Example output:
diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h
index 161727ed8f..190bda7567 100644
--- a/include/libvirt/libvirt-admin.h
+++ b/include/libvirt/libvirt-admin.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #ifndef __VIR_ADMIN_H__
diff --git a/include/libvirt/libvirt-common.h.in b/include/libvirt/libvirt-common.h.in
index 0e8ada4552..4661ee9857 100644
--- a/include/libvirt/libvirt-common.h.in
+++ b/include/libvirt/libvirt-common.h.in
@@ -3,7 +3,6 @@
  * Summary: common macros and enums for the libvirt and libvirt-admin library
  * Description: Provides common macros and enums needed by both libvirt and
  *              libvirt-admin libraries
- * Author: Erik Skultety <eskultet@redhat.com>
  *
  * Copyright (C) 2015 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h
index 20771f9b1e..139fe35986 100644
--- a/include/libvirt/libvirt-domain-snapshot.h
+++ b/include/libvirt/libvirt-domain-snapshot.h
@@ -2,7 +2,6 @@
  * libvirt-domain-snapshot.h
  * Summary: APIs for management of domain snapshots
  * Description: Provides APIs for the management of domain snapshots
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index bcc66653be..9f56a40d9c 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2,7 +2,6 @@
  * libvirt-domain.h
  * Summary: APIs for management of domains
  * Description: Provides APIs for the management of domains
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2015 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-event.h b/include/libvirt/libvirt-event.h
index 838cb54878..f818712cea 100644
--- a/include/libvirt/libvirt-event.h
+++ b/include/libvirt/libvirt-event.h
@@ -2,7 +2,6 @@
  * libvirt-event.h
  * Summary: APIs for management of events
  * Description: Provides APIs for the management of events
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
index a04d669901..5ce5d6ea2b 100644
--- a/include/libvirt/libvirt-host.h
+++ b/include/libvirt/libvirt-host.h
@@ -2,7 +2,6 @@
  * libvirt-host.h
  * Summary: APIs for management of hosts
  * Description: Provides APIs for the management of hosts
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-interface.h b/include/libvirt/libvirt-interface.h
index 60c53e6b4d..7dc7622085 100644
--- a/include/libvirt/libvirt-interface.h
+++ b/include/libvirt/libvirt-interface.h
@@ -2,7 +2,6 @@
  * libvirt-interface.h
  * Summary: APIs for management of interfaces
  * Description: Provides APIs for the management of interfaces
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-lxc.h b/include/libvirt/libvirt-lxc.h
index 0d16a5c44d..64697d8f6c 100644
--- a/include/libvirt/libvirt-lxc.h
+++ b/include/libvirt/libvirt-lxc.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LXC_H__
diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h
index 308f27f64f..87d2235956 100644
--- a/include/libvirt/libvirt-network.h
+++ b/include/libvirt/libvirt-network.h
@@ -2,7 +2,6 @@
  * libvirt-network.h
  * Summary: APIs for management of networks
  * Description: Provides APIs for the management of networks
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h
index 25e87248fd..9dc58b8ac2 100644
--- a/include/libvirt/libvirt-nodedev.h
+++ b/include/libvirt/libvirt-nodedev.h
@@ -2,7 +2,6 @@
  * libvirt-nodedev.h
  * Summary: APIs for management of nodedevs
  * Description: Provides APIs for the management of nodedevs
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-nwfilter.h b/include/libvirt/libvirt-nwfilter.h
index 20e6d1ff9a..8501b847a7 100644
--- a/include/libvirt/libvirt-nwfilter.h
+++ b/include/libvirt/libvirt-nwfilter.h
@@ -2,7 +2,6 @@
  * libvirt-nwfilter.h
  * Summary: APIs for management of nwfilters
  * Description: Provides APIs for the management of nwfilters
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h
index 2bb8ee8685..a97df8dda9 100644
--- a/include/libvirt/libvirt-qemu.h
+++ b/include/libvirt/libvirt-qemu.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Chris Lalancette <clalance@redhat.com>
  */
 
 #ifndef __VIR_QEMU_H__
diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h
index 5df0b8ff89..e46162da28 100644
--- a/include/libvirt/libvirt-secret.h
+++ b/include/libvirt/libvirt-secret.h
@@ -2,7 +2,6 @@
  * libvirt-secret.h
  * Summary: APIs for management of secrets
  * Description: Provides APIs for the management of secrets
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014, 2016 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h
index 413d9f6c4c..17906da890 100644
--- a/include/libvirt/libvirt-storage.h
+++ b/include/libvirt/libvirt-storage.h
@@ -2,7 +2,6 @@
  * libvirt-storage.h
  * Summary: APIs for management of storage pools and volumes
  * Description: Provides APIs for the management of storage pools and volumes
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2016 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h
index 86f96b1580..7d3a3d98e1 100644
--- a/include/libvirt/libvirt-stream.h
+++ b/include/libvirt/libvirt-stream.h
@@ -2,7 +2,6 @@
  * libvirt-stream.h
  * Summary: APIs for management of streams
  * Description: Provides APIs for the management of streams
- * Author: Daniel Veillard <veillard@redhat.com>
  *
  * Copyright (C) 2006-2014 Red Hat, Inc.
  *
diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index 36f6d60775..d555ac798f 100644
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_VIRLIB_H__
diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h
index 57aadb8d16..095c6cb1e4 100644
--- a/include/libvirt/virterror.h
+++ b/include/libvirt/virterror.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_VIRERR_H__
diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x
index d19d132b79..42e215d23a 100644
--- a/src/admin/admin_protocol.x
+++ b/src/admin/admin_protocol.x
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 %#include <libvirt/libvirt-admin.h>
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
index b29d109f6a..e112c1f115 100644
--- a/src/admin/admin_remote.c
+++ b/src/admin/admin_remote.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Erik Skultety <eskultet@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c
index f2c1a8f8ec..f2a38f6dfa 100644
--- a/src/admin/admin_server.c
+++ b/src/admin/admin_server.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors: Erik Skultety <eskultet@redhat.com>
- *          Martin Kletzander <mkletzan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h
index 3e0c35fa29..dc0f31e54b 100644
--- a/src/admin/admin_server.h
+++ b/src/admin/admin_server.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors: Erik Skultety <eskultet@redhat.com>
- *          Martin Kletzander <mkletzan@redhat.com>
  */
 
 #ifndef __ADMIN_SERVER_H__
diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
index b78ff902c0..1c5485bce9 100644
--- a/src/admin/admin_server_dispatch.c
+++ b/src/admin/admin_server_dispatch.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/admin/admin_server_dispatch.h b/src/admin/admin_server_dispatch.h
index c998cf3cba..322bba7dd8 100644
--- a/src/admin/admin_server_dispatch.h
+++ b/src/admin/admin_server_dispatch.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #ifndef __ADMIN_SERVER_DISPATCH_H__
diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c
index a59dfe4519..201044d9e6 100644
--- a/src/bhyve/bhyve_device.c
+++ b/src/bhyve/bhyve_device.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy
  */
 
 #include <config.h>
diff --git a/src/bhyve/bhyve_device.h b/src/bhyve/bhyve_device.h
index 1144f51dbe..48e7db438e 100644
--- a/src/bhyve/bhyve_device.h
+++ b/src/bhyve/bhyve_device.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy
  */
 
 #ifndef __BHYVE_DEVICE_H__
diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 3c23441969..e54af75f4d 100644
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy
  */
 
 #include <config.h>
diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h
index bbc8ecd8cf..82b0b9b346 100644
--- a/src/bhyve/bhyve_domain.h
+++ b/src/bhyve/bhyve_domain.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy
  */
 
 #ifndef __BHYVE_DOMAIN_H__
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 4d4f85f5bf..4998100bc2 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy
  */
 
 #include <config.h>
diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h
index fb57d287e1..c9bcbb9418 100644
--- a/src/bhyve/bhyve_driver.h
+++ b/src/bhyve/bhyve_driver.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
  */
 
 #ifndef __BHYVE_DRIVER_H__
diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c
index 4d5262c104..faf1ebe5f5 100644
--- a/src/bhyve/bhyve_monitor.c
+++ b/src/bhyve/bhyve_monitor.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Conrad Meyer <cse.cem@gmail.com>
  */
 
 #include <config.h>
diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h
index 226d87832f..f376941bc6 100644
--- a/src/bhyve/bhyve_monitor.h
+++ b/src/bhyve/bhyve_monitor.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Conrad Meyer <cse.cem@gmail.com>
  */
 
 #ifndef BHYVE_MONITOR_H
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index 14137d179b..1c9191fb96 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
  */
 
 #include <config.h>
diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h
index 1e45ef258f..793685c338 100644
--- a/src/bhyve/bhyve_parse_command.h
+++ b/src/bhyve/bhyve_parse_command.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
  */
 
 #ifndef __BHYVE_PARSE_COMMAND_H__
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index ef4e5ff53d..8e9bba0dbe 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 45b331a7be..c861ad5536 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_CAPABILITIES_H
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 863413e75e..a8e0fbe8ae 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 9f2e7ee264..7792a4b449 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_CPU_CONF_H__
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 44b210d5ec..32628c6448 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 867b633903..320c6b55a1 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __DEVICE_CONF_H__
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 6e983e4fec..618fce44f0 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 183235309b..a0c853b7af 100644
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __DOMAIN_ADDR_H__
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index fc13338d64..ce176f7940 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h
index 474ccb6b8a..17e43b8cea 100644
--- a/src/conf/domain_audit.h
+++ b/src/conf/domain_audit.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_DOMAIN_AUDIT_H__
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 3b87bdf98c..ba2b6ba70f 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index 45ebc436b9..16b9677124 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __DOMAIN_CAPABILITIES_H__
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ae8fb5a501..d8dfd1656f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b24e6ec3de..26b07d6804 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __DOMAIN_CONF_H
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 97520706c9..1bba4a2520 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ben Guthro
  */
 
 #include <config.h>
diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h
index 3992a29c58..4266930272 100644
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ben Guthro
  */
 
 #include "internal.h"
diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c
index e75fb598e8..495fafcd61 100644
--- a/src/conf/domain_nwfilter.c
+++ b/src/conf/domain_nwfilter.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h
index 6bda228fc8..8f1bcbacad 100644
--- a/src/conf/domain_nwfilter.h
+++ b/src/conf/domain_nwfilter.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 #ifndef DOMAIN_NWFILTER_H
 # define DOMAIN_NWFILTER_H
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 0a4b28f489..c4d2e1b9ab 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  *         Laine Stump <laine@redhat.com>
  */
 
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index 9ae2ceddb6..af19f0d53b 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  *         Laine Stump <laine@redhat.com>
  */
 
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 80b113196a..3113cde888 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 30f988953c..37049cc69a 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_BANDWIDTH_CONF_H__
diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index dff49c6e94..15230c6219 100644
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Laine Stump <laine@redhat.com>
- *     James Robson <jrobson@websense.com>
  */
 
 #include <config.h>
diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h
index ceef78eec0..4f21873aad 100644
--- a/src/conf/netdev_vlan_conf.h
+++ b/src/conf/netdev_vlan_conf.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Laine Stump <laine@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_VLAN_CONF_H__
diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index 24052bf784..660478d128 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index a70256dc7e..29f627367f 100644
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_VPORT_PROFILE_CONF_H__
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 39a13b433d..e035d8aba7 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 54c8ed1c4c..6ae39dbeaf 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __NETWORK_CONF_H__
diff --git a/src/conf/network_event.c b/src/conf/network_event.c
index 5f8ad30d26..e3d2f2b6b3 100644
--- a/src/conf/network_event.c
+++ b/src/conf/network_event.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Cedric Bosdonnat
  */
 
 #include <config.h>
diff --git a/src/conf/network_event.h b/src/conf/network_event.h
index 51bd949bee..269475a3b1 100644
--- a/src/conf/network_event.h
+++ b/src/conf/network_event.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Cedric Bosdonnat
  */
 
 #include "internal.h"
diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c
index 29e978bbdf..6de4ab1f58 100644
--- a/src/conf/networkcommon_conf.c
+++ b/src/conf/networkcommon_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h
index 70e46793f6..636a647e94 100644
--- a/src/conf/networkcommon_conf.h
+++ b/src/conf/networkcommon_conf.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __NETWORKCOMMON_CONF_H__
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 74a7bc3933..97ad2f3cce 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David F. Lively <dlively@virtualiron.com>
  */
 
 #include <config.h>
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index fde239183d..24355f86ab 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David F. Lively <dlively@virtualiron.com>
  */
 
 #ifndef __VIR_NODE_DEVICE_CONF_H__
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 97a3ca485d..dd421d19eb 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index 85269be565..0b8d388347 100644
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #ifndef __NUMA_CONF_H__
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 120ca5ec14..8dcdc9d8d2 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -21,8 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 9f8ad51bf2..9d94dd7937 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -20,8 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 #ifndef NWFILTER_CONF_H
 # define NWFILTER_CONF_H
diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c
index 14a62c1a74..eb1ed76af8 100644
--- a/src/conf/nwfilter_ipaddrmap.c
+++ b/src/conf/nwfilter_ipaddrmap.c
@@ -4,9 +4,6 @@
  *
  * Copyright (C) 2010, 2012 IBM Corp.
  *
- * Author:
- *     Stefan Berger <stefanb@linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h
index 2c9cdb9601..272440966b 100644
--- a/src/conf/nwfilter_ipaddrmap.h
+++ b/src/conf/nwfilter_ipaddrmap.h
@@ -4,9 +4,6 @@
  *
  * Copyright (C) 2010, 2012 IBM Corp.
  *
- * Author:
- *     Stefan Berger <stefanb@linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index ffffc6bae8..4b85f22950 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h
index f7355c37df..c02ddd20a6 100644
--- a/src/conf/nwfilter_params.h
+++ b/src/conf/nwfilter_params.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 #ifndef NWFILTER_PARAMS_H
 # define NWFILTER_PARAMS_H
diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index bf514384ed..667852fe22 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ben Guthro
  */
 
 #include <config.h>
diff --git a/src/conf/object_event.h b/src/conf/object_event.h
index 70e9579e81..c1e87a2423 100644
--- a/src/conf/object_event.h
+++ b/src/conf/object_event.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ben Guthro
  */
 
 #include "internal.h"
diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h
index 27b461f177..a45902827d 100644
--- a/src/conf/object_event_private.h
+++ b/src/conf/object_event_private.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ben Guthro
  */
 
 #include "datatypes.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 7a2e4b28aa..3a5aa72563 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 19f612b8fe..4b824e4023 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #ifndef __VIR_SECRET_CONF_H__
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 5a511b4495..7386b4a74f 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Eric Blake <eblake@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index 20a42bd572..531bf0b759 100644
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Eric Blake <eblake@redhat.com>
  */
 
 #ifndef __SNAPSHOT_CONF_H
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index bf3ca2b87b..55db7a96f5 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 4d7abbbc98..37cb3096fa 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_CONF_H__
diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index 416a7a129c..5090a67a4f 100644
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h
index e1990e8e2d..652767583b 100644
--- a/src/conf/virchrdev.h
+++ b/src/conf/virchrdev.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
  */
 #ifndef __VIR_CHRDEV_H__
 # define __VIR_CHRDEV_H__
diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 805fe9440a..384d97d768 100644
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h
index 7e2dece3aa..6e09133b32 100644
--- a/src/conf/virdomainobjlist.h
+++ b/src/conf/virdomainobjlist.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIRDOMAINOBJLIST_H__
diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 7ce59f7c6e..7e8437988f 100644
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/conf/virnwfilterbindingobjlist.h b/src/conf/virnwfilterbindingobjlist.h
index dfda2bea85..7cdae901f2 100644
--- a/src/conf/virnwfilterbindingobjlist.h
+++ b/src/conf/virnwfilterbindingobjlist.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NWFILTER_BINDING_OBJ_LIST_H__
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index cc93c49418..a223ff06e8 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 81119b6aeb..592586d913 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_CPU_H__
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index cc7da44ac4..65d69c00af 100644
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Chuck Short <chuck.short@canonical.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu_arm.h b/src/cpu/cpu_arm.h
index 846a679f69..c77d102847 100644
--- a/src/cpu/cpu_arm.h
+++ b/src/cpu/cpu_arm.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Chuck Short <chuck.short@canonical.com>
  */
 
 #ifndef __VIR_CPU_ARM_H__
diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 4585e5ca83..83151c1c54 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
index 4596987150..130738b1ab 100644
--- a/src/cpu/cpu_map.h
+++ b/src/cpu/cpu_map.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_CPU_MAP_H__
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 858f40e0f0..9c75c4a2f2 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -17,11 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Anton Blanchard <anton@au.ibm.com>
- *      Prerna Saxena <prerna@linux.vnet.ibm.com>
- *      Li Zhang <zhlcindy@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu_ppc64.h b/src/cpu/cpu_ppc64.h
index a6c965928a..752f603cf6 100644
--- a/src/cpu/cpu_ppc64.h
+++ b/src/cpu/cpu_ppc64.h
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Anton Blanchard <anton@au.ibm.com>
- *      Prerna Saxena <prerna@linux.vnet.ibm.com>
  */
 
 #ifndef __VIR_CPU_PPC64_H__
diff --git a/src/cpu/cpu_ppc64_data.h b/src/cpu/cpu_ppc64_data.h
index ddbffaef05..ef89a3610b 100644
--- a/src/cpu/cpu_ppc64_data.h
+++ b/src/cpu/cpu_ppc64_data.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Li Zhang <zhlcindy@linux.vnet.ibm.com>
  */
 
 #ifndef __VIR_CPU_PPC64_DATA_H__
diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index 1abbb584a1..8f52924383 100644
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Thang Pham <thang.pham@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu_s390.h b/src/cpu/cpu_s390.h
index 7e0117c87c..8a6ad9692c 100644
--- a/src/cpu/cpu_s390.h
+++ b/src/cpu/cpu_s390.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Thang Pham <thang.pham@us.ibm.com>
  */
 
 #ifndef __VIR_CPU_S390X_H__
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index ebfa74fccd..d3a88da21d 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h
index 5d14d83e1b..b6ad687f85 100644
--- a/src/cpu/cpu_x86.h
+++ b/src/cpu/cpu_x86.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_CPU_X86_H__
diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
index f52bba821f..32da772002 100644
--- a/src/cpu/cpu_x86_data.h
+++ b/src/cpu/cpu_x86_data.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_CPU_X86_DATA_H__
diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl
old mode 100755
new mode 100644
index 92c76a66eb..c5fce248b4
--- a/src/dtrace2systemtap.pl
+++ b/src/dtrace2systemtap.pl
@@ -16,7 +16,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Daniel P. Berrange <berrange@redhat.com>
 #
 # Generate a set of systemtap probe definitions corresponding to
 # DTrace probe markers in libvirt.so
diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 8ca7f9012e..a28d1353c1 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Laine Stump <laine@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/interface/interface_driver.h b/src/interface/interface_driver.h
index 80ada5c81d..59d8564801 100644
--- a/src/interface/interface_driver.h
+++ b/src/interface/interface_driver.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author:  Laine Stump <laine@redhat.com>
  */
 
 
diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 4d3f241592..fb0190042a 100644
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
index 9bf0174b95..47a06a39f2 100644
--- a/src/libvirt-lxc.c
+++ b/src/libvirt-lxc.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index 43f63839eb..1afb5fe529 100644
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Chris Lalancette <clalance@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index 58ec13fbe5..111fb462e4 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h
index 992b780771..7d3fc3e183 100644
--- a/src/libxl/libxl_capabilities.h
+++ b/src/libxl/libxl_capabilities.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #ifndef LIBXL_CAPABILITIES_H
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 8116d2aaf8..73e988a3dc 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -18,10 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@novell.com>
- *     Markus Groß <gross@univention.de>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 61f586f048..f7364597ed 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -17,10 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@novell.com>
- *     Markus Groß <gross@univention.de>
  */
 
 #ifndef LIBXL_CONF_H
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 6d1e15b14c..3ada51f517 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h
index 3bce93500c..40c15f9d24 100644
--- a/src/libxl/libxl_domain.h
+++ b/src/libxl/libxl_domain.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@suse.com>
  */
 
 #ifndef LIBXL_DOMAIN_H
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index eb719345e8..3d03e7320a 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -18,11 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@novell.com>
- *     Markus Groß <gross@univention.de>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h
index a33d60cbf2..db161760f5 100644
--- a/src/libxl/libxl_driver.h
+++ b/src/libxl/libxl_driver.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@novell.com>
  */
 
 #ifndef LIBXL_DRIVER_H
diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c
index 9e6e504445..7c97da45d5 100644
--- a/src/libxl/libxl_logger.c
+++ b/src/libxl/libxl_logger.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Cédric Bosdonnat <cbosdonnat@suse.com>
  */
 #include <config.h>
 
diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h
index 68dc1e53f1..6b7adf816c 100644
--- a/src/libxl/libxl_logger.h
+++ b/src/libxl/libxl_logger.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Cédric Bosdonnat <cbosdonnat@suse.com>
  */
 
 #ifndef __LIBXL_LOGGER_H
diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index bb00927133..cd33efa417 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@suse.com>
- *     Chunyan Liu <cyliu@suse.com>
  */
 
 #include <config.h>
diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h
index 42897426da..db5cdfcd03 100644
--- a/src/libxl/libxl_migration.h
+++ b/src/libxl/libxl_migration.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Jim Fehlig <jfehlig@suse.com>
  */
 
 #ifndef LIBXL_MIGRATION_H
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 5bd7c4600a..06616310b1 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/locking/lock_daemon.h b/src/locking/lock_daemon.h
index da62edc2f7..7cdf79fb69 100644
--- a/src/locking/lock_daemon.h
+++ b/src/locking/lock_daemon.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOCK_DAEMON_H__
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index efa5655a30..03feeb02a5 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/locking/lock_daemon_config.h b/src/locking/lock_daemon_config.h
index 3e642208f5..9b2a8c2ebb 100644
--- a/src/locking/lock_daemon_config.h
+++ b/src/locking/lock_daemon_config.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOCK_DAEMON_CONFIG_H__
diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 1b479db55d..7f3c806220 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/locking/lock_daemon_dispatch.h b/src/locking/lock_daemon_dispatch.h
index a193a583e4..153f22b1ca 100644
--- a/src/locking/lock_daemon_dispatch.h
+++ b/src/locking/lock_daemon_dispatch.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOCK_DAEMON_DISPATCH_H__
diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index edf93ad712..b84d7dc737 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h
index 8d55bb244f..7634f9e7fb 100644
--- a/src/logging/log_daemon.h
+++ b/src/logging/log_daemon.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOG_DAEMON_H__
diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c
index 3226b2c484..ec6d0686f4 100644
--- a/src/logging/log_daemon_config.c
+++ b/src/logging/log_daemon_config.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h
index 53101b0610..35914fc4ef 100644
--- a/src/logging/log_daemon_config.h
+++ b/src/logging/log_daemon_config.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOG_DAEMON_CONFIG_H__
diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c
index ec691127ab..0442e8cd94 100644
--- a/src/logging/log_daemon_dispatch.c
+++ b/src/logging/log_daemon_dispatch.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/logging/log_daemon_dispatch.h b/src/logging/log_daemon_dispatch.h
index af3e3b47a1..13101c4fea 100644
--- a/src/logging/log_daemon_dispatch.h
+++ b/src/logging/log_daemon_dispatch.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOG_DAEMON_DISPATCH_H__
diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 5364e06dff..9e1f1f1577 100644
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h
index 70be567ccc..16bcd0df65 100644
--- a/src/logging/log_handler.h
+++ b/src/logging/log_handler.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_LOG_HANDLER_H__
diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c
index e84abdbef9..cd7935802d 100644
--- a/src/logging/log_manager.c
+++ b/src/logging/log_manager.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h
index 7f8e51838b..0f3d55a5f0 100644
--- a/src/logging/log_manager.h
+++ b/src/logging/log_manager.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index cecab7611d..c8fa8c4f44 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -4,9 +4,6 @@
  *
  * lxc_conf.c: config functions for managing linux containers
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index 5fb4bb1b0d..eecc4c7c0b 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -4,9 +4,6 @@
  *
  * lxc_conf.h: header file for linux container config functions
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index d834bf01d7..905645a41c 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -5,10 +5,6 @@
  *
  * lxc_container.c: Performs container setup tasks
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *  Daniel P. Berrange <berrange@redhat.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h
index 641e2d4607..d647a629fc 100644
--- a/src/lxc/lxc_container.h
+++ b/src/lxc/lxc_container.h
@@ -3,9 +3,6 @@
  *
  * lxc_container.h: Performs container setup tasks
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 7bcfc0d965..99360397a7 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -4,9 +4,6 @@
  *
  * lxc_controller.c: linux container process controller
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 990871d9b3..de045c80bb 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4,9 +4,6 @@
  *
  * lxc_driver.c: linux container driver functions
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h
index 656831cce8..851fc2d85d 100644
--- a/src/lxc/lxc_driver.h
+++ b/src/lxc/lxc_driver.h
@@ -3,9 +3,6 @@
  *
  * lxc_driver.h: header file for linux container driver functions
  *
- * Authors:
- *  David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 9b889c4b27..e0b77031da 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -4,9 +4,6 @@
  *
  * lxc_fuse.c: fuse filesystem support for libvirt lxc
  *
- * Authors:
- *  Gao feng <gaofeng at cn.fujitsu.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index 38bbe22f7b..bf22758c4a 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -3,9 +3,6 @@
  *
  * lxc_fuse.c: fuse filesystem support for libvirt lxc
  *
- * Authors:
- *  Gao feng <gaofeng at cn.fujitsu.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index fb980efb27..6dbed9b9a4 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h
index b3bc45e2b1..f48b1805aa 100644
--- a/src/lxc/lxc_hostdev.h
+++ b/src/lxc/lxc_hostdev.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __LXC_HOSTDEV_H__
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 0d21d9fb2b..1eee3fc2bb 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Cedric Bosdonnat <cbosdonnat@suse.com>
  */
 
 #include <config.h>
diff --git a/src/lxc/lxc_native.h b/src/lxc/lxc_native.h
index 15fa0d5474..2c13c00658 100644
--- a/src/lxc/lxc_native.h
+++ b/src/lxc/lxc_native.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Cedric Bosdonnat <cbosdonnat@suse.com>
  */
 
 #ifndef __LXC_NATIVE_H__
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4bbc4f5a6d..aed80c04d5 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index b70881a690..dff37930d3 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
index fb09954b8f..dd08222653 100644
--- a/src/network/bridge_driver_linux.c
+++ b/src/network/bridge_driver_linux.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_nop.c
index 5e1acd07b4..ce529a60a1 100644
--- a/src/network/bridge_driver_nop.c
+++ b/src/network/bridge_driver_nop.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/network/bridge_driver_platform.c b/src/network/bridge_driver_platform.c
index 1d2fc02477..9ddcb71063 100644
--- a/src/network/bridge_driver_platform.c
+++ b/src/network/bridge_driver_platform.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h
index 706000df4e..8507ec4b97 100644
--- a/src/network/bridge_driver_platform.h
+++ b/src/network/bridge_driver_platform.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_BRIDGE_DRIVER_PLATFORM_H__
diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 40b89ac939..d59ef34f20 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -18,8 +18,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
- *
  * For IPv6 support, use dnsmasq >= 2.67
  */
 
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 0bcb3de053..8fb00d0c86 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David F. Lively <dlively@virtualiron.com>
  */
 
 #include <config.h>
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index 83a9449139..037fc72bce 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David F. Lively <dlively@virtualiron.com>
  */
 
 #ifndef __VIR_NODE_DEVICE_H__
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 298c08ccb6..b77c743305 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David F. Lively <dlively@virtualiron.com>
  */
 
 #include <config.h>
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index f134719b82..aa86058113 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Dave Allan <dallan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
index adbdaf27a8..af877160cd 100644
--- a/src/node_device/node_device_udev.h
+++ b/src/node_device/node_device_udev.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Dave Allan <dallan@redhat.com>
  */
 
 #include <libudev.h>
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index e40f649ed5..58f0057c3f 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -5,10 +5,6 @@
  * Copyright (C) 2012-2014 Red Hat, Inc.
  * Copyright (C) 2011,2012 IBM Corp.
  *
- * Authors:
- *    David L Stevens <dlstevens@us.ibm.com>
- *    Stefan Berger <stefanb@linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -22,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Based in part on work by Stefan Berger <stefanb@us.ibm.com>
  */
 
 /*
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h
index c693e1adbd..028c236a96 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.h
+++ b/src/nwfilter/nwfilter_dhcpsnoop.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: David L Stevens <dlstevens@us.ibm.com>
  */
 
 #ifndef __NWFILTER_DHCPSNOOP_H
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 1ab906fd5a..0e29d3e19e 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -20,9 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *         Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h
index ad56e7bb2f..1dfb9b31e6 100644
--- a/src/nwfilter/nwfilter_driver.h
+++ b/src/nwfilter/nwfilter_driver.h
@@ -20,9 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *         Stefan Berger <stefanb@us.ibm.com>
  */
 
 #ifndef __VIR_NWFILTER_DRIVER_H__
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 5be1c9b07a..75ec1962b6 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h
index 098d5dd75f..2b6b74277f 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.h
+++ b/src/nwfilter/nwfilter_ebiptables_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 #ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__
 # define VIR_NWFILTER_EBTABLES_DRIVER_H__
diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index a2ad95d209..655f088a17 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h
index 2cd19c90fc..57ce5d05ec 100644
--- a/src/nwfilter/nwfilter_gentech_driver.h
+++ b/src/nwfilter/nwfilter_gentech_driver.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 #ifndef __NWFILTER_GENTECH_DRIVER_H
 # define __NWFILTER_GENTECH_DRIVER_H
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index e6cb9964ac..cd66e3ea7d 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h
index 7f17244100..40d00ed68a 100644
--- a/src/nwfilter/nwfilter_learnipaddr.h
+++ b/src/nwfilter/nwfilter_learnipaddr.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #ifndef __NWFILTER_LEARNIPADDR_H
diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h
index d2ac0077db..64fa5bcbb5 100644
--- a/src/nwfilter/nwfilter_tech_driver.h
+++ b/src/nwfilter/nwfilter_tech_driver.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@us.ibm.com>
  */
 
 #ifndef __NWFILTER_TECH_DRIVER_H__
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 75d094fcfa..be5f89ea45 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -19,11 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Shuveb Hussain <shuveb@binarykarma.com>
- * Anoop Joe Cyriac <anoop@binarykarma.com>
- *
  */
 
 #include <config.h>
diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index be7e16df53..e1e0066df6 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -19,11 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Shuveb Hussain <shuveb@binarykarma.com>
- * Anoop Joe Cyriac <anoop@binarykarma.com>
- *
  */
 
 #ifndef OPENVZ_CONF_H
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 0dbd7be0e6..a570532808 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -19,11 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Shuveb Hussain <shuveb@binarykarma.com>
- * Anoop Joe Cyriac <anoop@binarykarma.com>
- *
  */
 
 #include <config.h>
diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h
index fb120c987c..d78a877c51 100644
--- a/src/openvz/openvz_driver.h
+++ b/src/openvz/openvz_driver.h
@@ -18,11 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Shuveb Hussain <shuveb@binarykarma.com>
- * Anoop Joe Cyriac <anoop@binarykarma.com>
- *
  */
 
 
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 3143140626..4acc6ce734 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -4,9 +4,6 @@
  *
  * phyp_driver.c: ssh layer to access Power Hypervisors
  *
- * Authors:
- *  Eduardo Otubo <otubo at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h
index a82aafd649..c6410bcc41 100644
--- a/src/phyp/phyp_driver.h
+++ b/src/phyp/phyp_driver.h
@@ -4,9 +4,6 @@
  *
  * phyp_driver.c: ssh layer to access Power Hypervisors
  *
- * Authors:
- *  Eduardo Otubo <otubo at linux.vnet.ibm.com>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index d842b0e6dc..2ff16182ff 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 4354b7e0cf..219cb9e1dd 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 815caec465..585cc972ba 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 33b9937ea4..441cb16bc1 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_ALIAS_H__
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9258bf6ee3..a04775c6b0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c109887c0c..2a3057e249 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_CAPABILITIES_H__
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index 8d1a40fe74..3262a63eae 100644
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Pavel Fedin <p.fedin@samsung.com>
  */
 
 #ifndef __QEMU_CAPSPRIV_H_ALLOW__
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 3a6efdc4f1..4931fb6575 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index c2fca7fc1d..4541c644ee 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_CGROUP_H__
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1a1cb9cbbd..66a4a35184 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 5cd744b8bf..2ee0633d6c 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_COMMAND_H__
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index a946b05d5d..b03e38b831 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 8986350fad..b70a0cda7c 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMUD_CONF_H
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 73a1241b56..05ea128525 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index b7347c72ce..cc17d622a2 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_DOMAIN_H__
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 4cee6633ac..bd6c4031e0 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h
index 89d7a5ac3e..62d92777bc 100644
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_DOMAIN_ADDRESS_H__
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d0cf2c115a..d1ec112086 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h
index df7533a8a2..2e7ed9331e 100644
--- a/src/qemu/qemu_driver.h
+++ b/src/qemu/qemu_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_DRIVER_H__
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 27cf118c14..5775563508 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index c26cdd50b2..f5d6945636 100644
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 #ifndef __QEMU_EXTDEVICE_H__
 # define __QEMU_EXTDEVICE_H__
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index bba141c9ee..a487e1d3aa 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h
index 9a7c7f143c..1f5542b129 100644
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_HOSTDEV_H__
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 4e795c7859..72b09f92ca 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 0297e42a98..bccf112206 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_HOTPLUG_H__
diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index a3f13093f5..4c066d2ef3 100644
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Matthew J. Rosato <mjrosato@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index 45fdbc4b8e..08df5619ea 100644
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Matthew J. Rosato <mjrosato@linux.vnet.ibm.com>
  */
 
 #ifndef __QEMU_INTERFACE_H__
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1d40aef127..713fe2fab4 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 66bfdb0e5c..5d30973a37 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index dfcc6d88b5..1c0245534c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index c3abd0ddf0..a82814dde6 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index f98c7d1421..0b2c1a6aed 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index 5cb5dba441..8b9a9caeb3 100644
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index d91fc8d901..c4650f01e0 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h
index a4db1a50ca..ffada71f58 100644
--- a/src/qemu/qemu_parse_command.h
+++ b/src/qemu/qemu_parse_command.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __QEMU_PARSE_COMMAND_H__
diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
index aedee735b4..5faa34a4fd 100644
--- a/src/qemu/qemu_security.c
+++ b/src/qemu/qemu_security.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
index 45d26a0dbf..8bb50c9534 100644
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __QEMU_SECURITY_H__
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index af85f7b25f..15b6ab8870 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h
index c7eeaafeb9..93a45b9691 100644
--- a/src/qemu/qemu_tpm.h
+++ b/src/qemu/qemu_tpm.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 #ifndef __QEMU_TPM_H__
 # define __QEMU_TPM_H__
diff --git a/src/remote/lxc_protocol.x b/src/remote/lxc_protocol.x
index 1cde90ef18..bbdad584b8 100644
--- a/src/remote/lxc_protocol.x
+++ b/src/remote/lxc_protocol.x
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Berrange <berrange@redhat.com>
  */
 
 %#include "internal.h"
diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x
index f6b88a984c..423e8fadaf 100644
--- a/src/remote/qemu_protocol.x
+++ b/src/remote/qemu_protocol.x
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Chris Lalancette <clalance@redhat.com>
  */
 
 %#include "internal.h"
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index c14a561618..f0dd7597e6 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index 2834da04a9..365a31c372 100644
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index 27e0c635f1..a56aa9065a 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_config.h
index 49ea80104b..c5595fa878 100644
--- a/src/remote/remote_daemon_config.h
+++ b/src/remote/remote_daemon_config.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __REMOTE_DAEMON_CONFIG_H__
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index e62ebfb596..402ef83ad1 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon_dispatch.h
index 015ab977fc..d3b8cf2346 100644
--- a/src/remote/remote_daemon_dispatch.h
+++ b/src/remote/remote_daemon_dispatch.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __REMOTE_DAEMON_DISPATCH_H__
diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c
index 38d50d1d1c..1f6e783881 100644
--- a/src/remote/remote_daemon_stream.c
+++ b/src/remote/remote_daemon_stream.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/remote/remote_daemon_stream.h b/src/remote/remote_daemon_stream.h
index 832e1f7547..2c1eeddb18 100644
--- a/src/remote/remote_daemon_stream.h
+++ b/src/remote/remote_daemon_stream.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index dc61391553..058e4c926b 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard Jones <rjones@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index 4033a3cd2c..c125a3de82 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard Jones <rjones@redhat.com>
  */
 
 #ifndef __VIR_REMOTE_INTERNAL_H__
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 7630b2ed15..b9d26b1849 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard Jones <rjones@redhat.com>
  */
 
 /* Notes:
diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl
old mode 100755
new mode 100644
index c0d3435096..6693d4d6f5
--- a/src/rpc/gensystemtap.pl
+++ b/src/rpc/gensystemtap.pl
@@ -16,8 +16,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Daniel P. Berrange <berrange@redhat.com>
-#
 # Generate a set of systemtap functions for translating various
 # RPC enum values into strings
 #
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 04bba82112..fc18e6a204 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h
index 2297cd95e8..26043ff67a 100644
--- a/src/rpc/virkeepalive.h
+++ b/src/rpc/virkeepalive.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_KEEPALIVE_H__
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index b4d8fb2187..2aced79384 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 9cf32091f5..80ca3bf8db 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_CLIENT_H__
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 0c7bcef39c..5e68122881 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h
index 5f0a37d814..3e82113ee9 100644
--- a/src/rpc/virnetclientprogram.h
+++ b/src/rpc/virnetclientprogram.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_CLIENT_PROGRAM_H__
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 05d76c9b87..1140b8dfa3 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h
index c4e01bf1ca..86db199b25 100644
--- a/src/rpc/virnetclientstream.h
+++ b/src/rpc/virnetclientstream.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_CLIENT_STREAM_H__
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 08ce9c2cd2..833b78d7c0 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h
index 09ed5adf36..e6dbb2f6c7 100644
--- a/src/rpc/virnetdaemon.h
+++ b/src/rpc/virnetdaemon.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
 #ifndef __VIR_NET_DAEMON_H__
diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
index 7c5f158f4d..e851e40d48 100644
--- a/src/rpc/virnetlibsshsession.c
+++ b/src/rpc/virnetlibsshsession.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
- * Author: Pino Toscano <ptoscano@redhat.com>
  */
 #include <config.h>
 #include <libssh/libssh.h>
diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h
index aaf2f1caae..4dcf398f53 100644
--- a/src/rpc/virnetlibsshsession.h
+++ b/src/rpc/virnetlibsshsession.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
- * Author: Pino Toscano <ptoscano@redhat.com>
  */
 #ifndef __VIR_NET_LIBSSH_SESSION_H__
 # define __VIR_NET_LIBSSH_SESSION_H__
diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x
index 901c671593..99f4f2e539 100644
--- a/src/rpc/virnetprotocol.x
+++ b/src/rpc/virnetprotocol.x
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard Jones <rjones@redhat.com>
  */
 
 %#include "internal.h"
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index b4461b3803..380ca6b302 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 26cec43c22..17dcad9595 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SERVER_H__
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 778cd1afc0..2464319a49 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index b7ff660eef..fa240f0d0f 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SERVER_CLIENT_H__
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index e0a9aefc06..4c10749364 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h
index e91b264c1e..cced0ee0f3 100644
--- a/src/rpc/virnetservermdns.h
+++ b/src/rpc/virnetservermdns.h
@@ -19,8 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SERVER_MDNS_H__
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 8d2c34058b..53f566ba53 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h
index 03784478de..fdb6a60a2b 100644
--- a/src/rpc/virnetserverprogram.h
+++ b/src/rpc/virnetserverprogram.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SERVER_PROGRAM_H__
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index e6762366ab..36c92c6714 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index a50cb19b6d..4a76704fb6 100644
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SERVER_SERVICE_H__
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 55de3b2aad..4f7b6d59f7 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index de795af917..2d64701e40 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NET_SOCKET_H__
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 5e3ef992a9..324b35b675 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
  */
 #include <config.h>
 #include <libssh2.h>
diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h
index 65bd76a94b..fa70ede414 100644
--- a/src/rpc/virnetsshsession.h
+++ b/src/rpc/virnetsshsession.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
  */
 #ifndef __VIR_NET_SSH_SESSION_H__
 # define __VIR_NET_SSH_SESSION_H__
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 110117c359..ac85f5d195 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h
index d89d79cb6d..7c722bda37 100644
--- a/src/secret/secret_driver.h
+++ b/src/secret/secret_driver.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #ifndef __VIR_SECRET_DRIVER_H__
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 4ddf2a160b..0d28cae0b7 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -17,12 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Jamie Strandboge <jamie@canonical.com>
- *   Based on security_selinux.c by James Morris <jmorris@namei.org>
- *
- * AppArmor security driver.
  */
 
 #include <config.h>
diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h
index 7872588f64..f15238ab86 100644
--- a/src/security/security_apparmor.h
+++ b/src/security/security_apparmor.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Jamie Strandboge <jamie@canonical.com>
- *
  */
 #ifndef __VIR_SECURITY_APPARMOR_H__
 # define __VIR_SECURITY_APPARMOR_H__
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index ac2e2544b6..bd32a9c207 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -14,11 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     James Morris <jmorris@namei.org>
- *     Dan Walsh <dwalsh@redhat.com>
- *
  */
 #include <config.h>
 
diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index cd221f1c78..0de8826f31 100644
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     James Morris <jmorris@namei.org>
- *
  */
 #ifndef __VIR_SECURITY_H__
 # define __VIR_SECURITY_H__
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index a049382c7b..f6b4c2d5d5 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 #include <config.h>
 
diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 7e82304689..23815ccded 100644
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef VIR_SECURITY_MANAGER_H__
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 95e9a1b0c7..7bff77d206 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -15,10 +15,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Authors:
- *     James Morris <jmorris@namei.org>
- *     Dan Walsh <dwalsh@redhat.com>
- *
  * SELinux security driver.
  */
 #include <config.h>
diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h
index 1700d8c661..5d02d79b47 100644
--- a/src/security/security_selinux.h
+++ b/src/security/security_selinux.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     James Morris <jmorris@namei.org>
- *
  */
 #ifndef __VIR_SECURITY_SELINUX_H__
 # define __VIR_SECURITY_SELINUX_H__
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index a0f2c8ff22..64a425671d 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -17,10 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Jamie Strandboge <jamie@canonical.com>
- *
  */
 
 #include <config.h>
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index cf05e63111..4a404ddfa6 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -26,8 +26,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index a8877548e6..a54c338cf0 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 9a0d550bc2..061c494b7d 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h
index e614ca278f..6b450e6352 100644
--- a/src/storage/storage_backend_disk.h
+++ b/src/storage/storage_backend_disk.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_DISK_H__
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 0837443391..0d6335b932 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h
index 8f381352c2..e942f057e2 100644
--- a/src/storage/storage_backend_fs.h
+++ b/src/storage/storage_backend_fs.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_FS_H__
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index fc21fbc5a2..4792bd70b8 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h
index 98d2b3ef27..e0935e6558 100644
--- a/src/storage/storage_backend_iscsi.h
+++ b/src/storage/storage_backend_iscsi.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_ISCSI_H__
diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c
index 5c1b251a17..0babe26550 100644
--- a/src/storage/storage_backend_iscsi_direct.c
+++ b/src/storage/storage_backend_iscsi_direct.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Clementine Hayat <clem@lse.epita.fr>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index cad88756cb..9bdc7b64e1 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_logical.h b/src/storage/storage_backend_logical.h
index c0f62cd185..6d0edd03b4 100644
--- a/src/storage/storage_backend_logical.h
+++ b/src/storage/storage_backend_logical.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_LOGICAL_H__
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 9e81fff0b4..b3a49ee1b2 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Dave Allan <dallan@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h
index c14dcc3cf7..dfd3225217 100644
--- a/src/storage/storage_backend_mpath.h
+++ b/src/storage/storage_backend_mpath.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Dave Allan <dallan@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_MPATH_H__
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2cba678b72..24dd1349ae 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Wido den Hollander <wido@widodh.nl>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_rbd.h b/src/storage/storage_backend_rbd.h
index 21a43fd51d..fb92ca3e10 100644
--- a/src/storage/storage_backend_rbd.h
+++ b/src/storage/storage_backend_rbd.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Wido den Hollander <wido@widodh.nl>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_RBD_H__
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index fe3a1e36ac..14f01f9ec0 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange redhat com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h
index efd01658b6..af98fa502f 100644
--- a/src/storage/storage_backend_scsi.h
+++ b/src/storage/storage_backend_scsi.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange redhat com>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_SCSI_H__
diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 419334d9ac..484a587474 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -19,10 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Wido den Hollander <wido@widodh.nl>
- *         Frank Spijkerman <frank.spijkerman@avira.com>
- *         Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h
index e968323098..a023c07460 100644
--- a/src/storage/storage_backend_sheepdog.h
+++ b/src/storage/storage_backend_sheepdog.h
@@ -18,10 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Wido den Hollander <wido@widodh.nl>
- *         Frank Spijkerman <frank.spijkerman@avira.com>
- *         Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
  */
 
 #ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_H__
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 7c22c43584..4a13e90481 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h
index c284bf520f..b5f82dde2e 100644
--- a/src/storage/storage_driver.h
+++ b/src/storage/storage_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_DRIVER_H__
diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c
index 7e6a682c0f..3b6ed6e34d 100644
--- a/src/storage/storage_file_fs.c
+++ b/src/storage/storage_file_fs.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/storage/storage_file_fs.h b/src/storage/storage_file_fs.h
index f289d8856d..6b86f68b24 100644
--- a/src/storage/storage_file_fs.h
+++ b/src/storage/storage_file_fs.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_FILE_FS_H__
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 5c979dd843..067600afba 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index 5da55e5f1a..e301715630 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __UML_CONF_H
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index d1c71d8521..e790273717 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h
index cb989422d3..d31b3bda8f 100644
--- a/src/uml/uml_driver.h
+++ b/src/uml/uml_driver.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 056f7bb3fc..1ff4a7b314 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -17,8 +17,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *
  * Current support
  *   - Read existing file
  *   - Write existing file
diff --git a/src/util/virarptable.c b/src/util/virarptable.c
index 3861409811..47ac1bb9ab 100644
--- a/src/util/virarptable.c
+++ b/src/util/virarptable.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Chen Hanxiao <chenhanxiao@gmail.com>
  */
 
 #include <config.h>
diff --git a/src/util/virarptable.h b/src/util/virarptable.h
index 6829198128..783c6e7abc 100644
--- a/src/util/virarptable.h
+++ b/src/util/virarptable.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Chen Hanxiao <chenhanxiao@gmail.com>
  */
 
 #ifndef __VIR_ARPTABLE_H__
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 4acdf1db06..1de7e7ecb9 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
index d8a3849e73..d02051d1d9 100644
--- a/src/util/virauthconfig.h
+++ b/src/util/virauthconfig.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_AUTHCONFIG_H__
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index 3bbced01b0..d074f29e54 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@novell.com>
  */
 
 #include <config.h>
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 312e7e2933..de16b43f63 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@novell.com>
  */
 
 #ifndef __BITMAP_H__
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index e20df3ea05..3b41dfd99d 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Dan Smith <danms@us.ibm.com>
  */
 #include <config.h>
 
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index 1f676f21c3..8309bf08d8 100644
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Dan Smith <danms@us.ibm.com>
  */
 
 #ifndef __VIR_CGROUP_H__
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
index 8f24b0891e..3bede28bd2 100644
--- a/src/util/vircgrouppriv.h
+++ b/src/util/vircgrouppriv.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Dan Smith <danms@us.ibm.com>
  */
 
 #ifndef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__
diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c
index 60070dc8d9..c88a94112e 100644
--- a/src/util/virclosecallbacks.c
+++ b/src/util/virclosecallbacks.c
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Daniel P. Berrange <berrange@redhat.com>
- *      Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h
index 79ca635bd7..74ba7e19dd 100644
--- a/src/util/virclosecallbacks.h
+++ b/src/util/virclosecallbacks.h
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Daniel P. Berrange <berrange@redhat.com>
- *      Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __VIR_CLOSE_CALLBACKS__
diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index 7da0dba911..9abd9ed3bf 100644
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
index 34d6655e77..f15242b2b0 100644
--- a/src/util/virdevmapper.h
+++ b/src/util/virdevmapper.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __VIR_DEVMAPPER_H__
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 2ffff08b84..3fda362a13 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -17,10 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * based on iptables.c
- * Authors:
- *     Gerhard Stenzel <gerhard.stenzel@de.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/util/virebtables.h b/src/util/virebtables.h
index 749d8f721d..baca746f89 100644
--- a/src/util/virebtables.h
+++ b/src/util/virebtables.h
@@ -17,10 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * based on iptables.h
- * Authors:
- *     Gerhard Stenzel <gerhard.stenzel@de.ibm.com>
  */
 
 #ifndef __QEMUD_EBTABLES_H__
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 683e51aa19..736c92fd02 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virevent.c b/src/util/virevent.c
index 2be3c343ef..3cac9f9472 100644
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virevent.h b/src/util/virevent.h
index d8b440bded..e26871a2ac 100644
--- a/src/util/virevent.h
+++ b/src/util/virevent.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_EVENT_H__
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 284b62307f..db01088769 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h
index e78e2730a1..720e72db8d 100644
--- a/src/util/vireventpoll.h
+++ b/src/util/vireventpoll.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_EVENT_POLL_H__
diff --git a/src/util/virfcp.c b/src/util/virfcp.c
index b70374444f..3cb6811f78 100644
--- a/src/util/virfcp.c
+++ b/src/util/virfcp.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Bjoern Walk <bwalk@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/util/virfcp.h b/src/util/virfcp.h
index 2bc05387af..3ca1eb1778 100644
--- a/src/util/virfcp.h
+++ b/src/util/virfcp.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Bjoern Walk <bwalk@linux.vnet.ibm.com>
  */
 
 #ifndef __VIR_FCP_H__
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index c786d7671b..8218a400d6 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *    Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index e024e88cc2..c955a2d07a 100644
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *    Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_FIREWALL_H__
diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h
index 130aaa1b73..ab90bf3713 100644
--- a/src/util/virfirewallpriv.h
+++ b/src/util/virfirewallpriv.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *    Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_FIREWALL_PRIV_H_ALLOW__
diff --git a/src/util/virfirmware.c b/src/util/virfirmware.c
index 86f8b684d6..f41e000447 100644
--- a/src/util/virfirmware.c
+++ b/src/util/virfirmware.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/src/util/virfirmware.h b/src/util/virfirmware.h
index 682a865ee9..0bff013337 100644
--- a/src/util/virfirmware.h
+++ b/src/util/virfirmware.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #ifndef __VIR_FIRMWARE_H__
diff --git a/src/util/virgic.c b/src/util/virgic.c
index 6f26659ffd..e980509630 100644
--- a/src/util/virgic.c
+++ b/src/util/virgic.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Andrea Bolognani <abologna@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virgic.h b/src/util/virgic.h
index 2d77fdd459..0e6fc4f566 100644
--- a/src/util/virgic.h
+++ b/src/util/virgic.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Andrea Bolognani <abologna@redhat.com>
  */
 
 #ifndef __VIR_GIC_H__
diff --git a/src/util/virhash.c b/src/util/virhash.c
index c20724169c..52722fc049 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -14,9 +14,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
  * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- * Author: Bjorn Reese <bjorn.reese@systematic.dk>
- *         Daniel Veillard <veillard@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virhash.h b/src/util/virhash.h
index 8137b4d27b..a201b8910d 100644
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -5,9 +5,6 @@
  *
  * Copyright (C) 2005-2014 Red Hat, Inc.
  * Copyright (C) 2000 Bjorn Reese and Daniel Veillard.
- *
- * Author: Bjorn Reese <bjorn.reese@systematic.dk>
- *         Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_HASH_H__
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 6f4a9be399..2b91603dcf 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virhook.h b/src/util/virhook.h
index 00544c96f6..64ae8c0ada 100644
--- a/src/util/virhook.h
+++ b/src/util/virhook.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_HOOKS_H__
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 0fce47d970..7200bab16f 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index f9f3359288..1d84dd72e5 100644
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_HOSTCPU_H__
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 1898f9eeb9..41d4e8d936 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * Author: Chunyan Liu <cyliu@suse.com>
  */
 
 #include <config.h>
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 8f77c00221..93d7ccd886 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * Author: Chunyan Liu <cyliu@suse.com>
  */
 
 #ifndef __VIR_HOSTDEV_H__
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 3edc037bb0..19cd282724 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h
index 4008521432..0b713235b2 100644
--- a/src/util/virhostmem.h
+++ b/src/util/virhostmem.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_HOSTMEM_H__
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index c4b48d499d..0b06743151 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h
index 75a9a50db0..b19742bf1e 100644
--- a/src/util/virinitctl.h
+++ b/src/util/virinitctl.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_INITCTL_H__
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index f379844d28..7f0955b82d 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/viriptables.h b/src/util/viriptables.h
index 9ea25fc096..477ec23d62 100644
--- a/src/util/viriptables.h
+++ b/src/util/viriptables.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #ifndef __VIR_IPTABLES_H__
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 1006a88837..201fabe8bf 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h
index e6f5ba872d..457d50472a 100644
--- a/src/util/virkeyfile.h
+++ b/src/util/virkeyfile.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_KEYFILE_H__
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index db4fa86612..3235f26182 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 39dd51bd81..8369293e96 100644
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_MACADDR_H__
diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index c7b700fa05..9b25683963 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h
index e6f754e247..dab7a9f4cb 100644
--- a/src/util/virmacmap.h
+++ b/src/util/virmacmap.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __VIR_MACMAP_H__
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 5867977df4..2111b3ada9 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 8860ea12f1..76f53a6470 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_H__
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 6f88399a76..b90bd55d32 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index 63ac608970..8e786eff9e 100644
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_BANDWIDTH_H__
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index fc6389d0c7..8d2d8bfc86 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h
index 141f231c90..b2967f1d42 100644
--- a/src/util/virnetdevbridge.h
+++ b/src/util/virnetdevbridge.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_BRIDGE_H__
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index 295ba86265..9d308e440a 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h
index 5608c37143..8ef85f58c4 100644
--- a/src/util/virnetdevip.h
+++ b/src/util/virnetdevip.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEVIP_H__
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index fa2fa6dadf..e9fea2d78a 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -16,9 +16,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *
  * Notes:
  * netlink: http://lovezutto.googlepages.com/netlink.pdf
  *          iproute2 package
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index a7c4b6d9cf..a31401563c 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -15,9 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
  */
 
 #ifndef __UTIL_MACVTAP_H__
diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c
index ea31d0371f..e50cceaef5 100644
--- a/src/util/virnetdevmidonet.c
+++ b/src/util/virnetdevmidonet.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antoni Segura Puimedon <toni@midokura.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevmidonet.h b/src/util/virnetdevmidonet.h
index 3bfc1f6e67..7c44c045bd 100644
--- a/src/util/virnetdevmidonet.h
+++ b/src/util/virnetdevmidonet.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antoni Segura Puimedon <toni@midokura.com>
  */
 
 #ifndef __VIR_NETDEV_MIDONET_H__
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index ee0db4e9b2..4fa3a5742a 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -16,12 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Dan Wendlandt <dan@nicira.com>
- *     Kyle Mestery <kmestery@cisco.com>
- *     Ansis Atteka <aatteka@nicira.com>
- *     Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 331e483018..edb61baa76 100644
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -16,12 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Dan Wendlandt <dan@nicira.com>
- *     Kyle Mestery <kmestery@cisco.com>
- *     Ansis Atteka <aatteka@nicira.com>
- *     Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
  */
 
 #ifndef __VIR_NETDEV_OPENVSWITCH_H__
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index c4d843e8ff..972f3405aa 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index 37f9367ff4..b4e73f28e7 100644
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_TAP_H__
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index a651bb5445..431dc0bff5 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -15,10 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h
index 4c220c1b02..9e5d6adb15 100644
--- a/src/util/virnetdevveth.h
+++ b/src/util/virnetdevveth.h
@@ -15,10 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     David L. Leskovec <dlesko at linux.vnet.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_VETH_H__
diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 0afc47b6e6..e5d65f4dba 100644
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Laine Stump <laine@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h
index be85f59897..ca2793ae34 100644
--- a/src/util/virnetdevvlan.h
+++ b/src/util/virnetdevvlan.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Laine Stump <laine@redhat.com>
  */
 #ifndef __VIR_NETDEV_VLAN_H__
 # define __VIR_NETDEV_VLAN_H__
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index c385505976..09c212bc4d 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index fdb6573fd4..2c6f858415 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_NETDEV_VPORT_PROFILE_H__
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 148f13d578..62066a33d2 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -16,16 +16,9 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Authors:
- *     Stefan Berger <stefanb@us.ibm.com>
- *     Dirk Herrendoerfer <herrend[at]de[dot]ibm[dot]com>
- *
  * Notes:
  * netlink: http://lovezutto.googlepages.com/netlink.pdf
  *          iproute2 package
- *
- * 2012/02: Renamed from netlink.[ch] to virnetlink.[ch]
- *
  */
 
 #include <config.h>
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 66aae60baa..537876bcba 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virpci.h b/src/util/virpci.h
index a2e795eff9..293eaa9b0a 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #ifndef __VIR_PCI_H__
diff --git a/src/util/virperf.c b/src/util/virperf.c
index fe51681553..7e5bfc6c78 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Ren Qiaowei <qiaowei.ren@intel.com>
  */
 #include <config.h>
 
diff --git a/src/util/virperf.h b/src/util/virperf.h
index 9d0d5acec7..e926f91e0b 100644
--- a/src/util/virperf.h
+++ b/src/util/virperf.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *  Ren Qiaowei <qiaowei.ren@intel.com>
  */
 
 #ifndef __VIR_PERF_H__
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 6ac8ae6153..e0c15a3262 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index 7a984ee7b0..8d1257906d 100644
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_RANDOM_H__
diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index e731e59cfe..32d249ad5c 100644
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -17,10 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Han Cheng <hanc.fnst@cn.fujitsu.com>
- *     Osier Yang <jyang@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index b96d8629b8..3cb50cb168 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Han Cheng <hanc.fnst@cn.fujitsu.com>
  */
 
 #ifndef __VIR_SCSI_H__
diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c
index ab17b1e831..ce44079357 100644
--- a/src/util/virscsivhost.c
+++ b/src/util/virscsivhost.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Eric Farman <farman@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index 31ad429982..7123de8bc8 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Eric Farman <farman@linux.vnet.ibm.com>
  */
 
 #ifndef __VIR_SCSIHOST_H__
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 6f7da53949..4bc14bbd15 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -14,11 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel Veillard <veillard@redhat.com>
- *     Laine Stump <laine@laine.org>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index 66f599869c..cfc79cf2ce 100644
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -14,11 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel Veillard <veillard@redhat.com>
- *     Laine Stump <laine@laine.org>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_SOCKETADDR_H__
diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c
index 80962edee0..29bbdedccd 100644
--- a/src/util/virstorageencryption.c
+++ b/src/util/virstorageencryption.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h
index 1c0a39c32e..1134b0fe9d 100644
--- a/src/util/virstorageencryption.h
+++ b/src/util/virstorageencryption.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Red Hat Author: Miloslav Trmač <mitr@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_ENCRYPTION_H__
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 94c32d818e..bd4b0274df 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index a158383210..f283e3cb08 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STORAGE_FILE_H__
diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c
index 7086747029..72cf3d1d16 100644
--- a/src/util/virstoragefilebackend.c
+++ b/src/util/virstoragefilebackend.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 2207c9f9df..e890dde546 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virstring.h b/src/util/virstring.h
index a2133ab7ce..ee53ff2f5e 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_STRING_H__
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index a18098fca6..b6785066f1 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 00a15dbf0d..33541701f9 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_SYSINFOS_H__
diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c
index 2f483f9d26..8f87ae6039 100644
--- a/src/util/virthreadjob.c
+++ b/src/util/virthreadjob.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virthreadjob.h b/src/util/virthreadjob.h
index 659f91db43..0c62ee6723 100644
--- a/src/util/virthreadjob.h
+++ b/src/util/virthreadjob.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #ifndef __VIR_THREAD_JOB_H__
diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 4635170141..ff5f34a946 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -18,10 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Hu Tao <hutao@cn.fujitsu.com>
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h
index e1f362f5bb..26fb4b739c 100644
--- a/src/util/virthreadpool.h
+++ b/src/util/virthreadpool.h
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author:
  *     Hu Tao <hutao@cn.fujitsu.com>
  *     Daniel P. Berrange <berrange@redhat.com>
  */
diff --git a/src/util/virtime.c b/src/util/virtime.c
index 44ec127401..d1187726ee 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -17,8 +17,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *
  * The intent is that this file provides a set of time APIs which
  * are async signal safe, to allow use in between fork/exec eg by
  * the logging code.
diff --git a/src/util/virtime.h b/src/util/virtime.h
index fbcd3ba667..dec7238912 100644
--- a/src/util/virtime.h
+++ b/src/util/virtime.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_TIME_H__
diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index d5c10da382..583b9a64a4 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index b21fc0532f..2ceb4a6af6 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Stefan Berger <stefanb@linux.vnet.ibm.com>
  */
 #ifndef __VIR_TPM_H__
 # define __VIR_TPM_H__
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 45f635baaf..263712c323 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/virusb.h b/src/util/virusb.h
index afaaf953db..5953127748 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel P. Berrange <berrange@redhat.com>
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __VIR_USB_H__
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 279e6aedc0..5251b66454 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -19,9 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * File created Jul 18, 2007 - Shuveb Hussain <shuveb@binarykarma.com>
  */
 
 #include <config.h>
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 588d779d10..a02a03f034 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -18,8 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * File created Jul 18, 2007 - Shuveb Hussain <shuveb@binarykarma.com>
  */
 
 #ifndef __VIR_UTIL_H__
diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index ff44e8efb7..0c12ddcc3e 100644
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #include <config.h>
diff --git a/src/util/viruuid.h b/src/util/viruuid.h
index 40fabf41d6..d5a334b0ce 100644
--- a/src/util/viruuid.h
+++ b/src/util/viruuid.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Mark McLoughlin <markmc@redhat.com>
  */
 
 #ifndef __VIR_UUID_H__
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 556382577c..672117822f 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
  */
 
 #include <config.h>
diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h
index 10519974bb..7a59c87587 100644
--- a/src/xenapi/xenapi_driver.h
+++ b/src/xenapi/xenapi_driver.h
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
  */
 
 
diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
index b1d00e673b..fb6d1a40be 100644
--- a/src/xenapi/xenapi_driver_private.h
+++ b/src/xenapi/xenapi_driver_private.h
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
  */
 
 
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 723f348b64..4791f06945 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
  */
 
 #include <config.h>
diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h
index 72c42d11ea..ae33e8fedb 100644
--- a/src/xenapi/xenapi_utils.h
+++ b/src/xenapi/xenapi_utils.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
  */
 
 #ifndef __VIR_XENAPI_UTILS__
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 60c8d7edc8..94e0703cf3 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -20,10 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * Author: Markus Groß <gross@univention.de>
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h
index a26c9e60c4..369bba26d8 100644
--- a/src/xenconfig/xen_common.h
+++ b/src/xenconfig/xen_common.h
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #ifndef __VIR_XEN_COMMON_H__
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index fbdd5ea982..11af3e747a 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -18,10 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Anthony Liguori <aliguori@us.ibm.com>
- * Author: Daniel Veillard <veillard@redhat.com>
- * Author: Markus Groß <gross@univention.de>
  */
 
 #include <config.h>
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
index cb8c89ef9a..342ccab6f5 100644
--- a/src/xenconfig/xen_sxpr.h
+++ b/src/xenconfig/xen_sxpr.h
@@ -18,10 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Anthony Liguori <aliguori@us.ibm.com>
- * Author: Daniel Veillard <veillard@redhat.com>
- * Author: Markus Groß <gross@univention.de>
  */
 
 #ifndef __VIR_XEN_SXPR_H__
diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c
index 70059df667..accfc3a2d2 100644
--- a/src/xenconfig/xen_xl.c
+++ b/src/xenconfig/xen_xl.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index 909e8fad40..b8dee0917e 100644
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -18,9 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * Author: Markus Groß <gross@univention.de>
  */
 
 #include <config.h>
diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h
index db3e3456ec..c0699c673d 100644
--- a/src/xenconfig/xen_xm.h
+++ b/src/xenconfig/xen_xm.h
@@ -18,9 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- * Author: Markus Groß <gross@univention.de>
  */
 
 #ifndef __VIR_XEN_XM_H__
diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h
index 71e8a1a5c2..e2250dbd6a 100644
--- a/src/xenconfig/xenxs_private.h
+++ b/src/xenconfig/xenxs_private.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Richard W.M. Jones <rjones@redhat.com>
- * Author: Markus Groß <gross@univention.de>
  */
 
 #ifndef __VIR_XENXS_PRIVATE_H__
diff --git a/tests/cputest.c b/tests/cputest.c
index 339119c63f..64d85f34db 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 7df1739d81..ea4e57d118 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/domainconftest.c b/tests/domainconftest.c
index 42f6e28beb..e7bdc99438 100644
--- a/tests/domainconftest.c
+++ b/tests/domainconftest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/eventtest.c b/tests/eventtest.c
index e3ad1e8784..df7570bac6 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 3c4fcdefaf..054c405cec 100644
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 969d84e11e..de6e86ec66 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jim Fehlig <jfehlig@suse.com>
  */
 
 #include <config.h>
diff --git a/tests/metadatatest.c b/tests/metadatatest.c
index b17a85c883..786c62e623 100644
--- a/tests/metadatatest.c
+++ b/tests/metadatatest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Peter Krempa <pkrempa@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/nsslinktest.c b/tests/nsslinktest.c
index a81a6d331a..5d7d36da9e 100644
--- a/tests/nsslinktest.c
+++ b/tests/nsslinktest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/nssmock.c b/tests/nssmock.c
index fc8e6b22f0..230044275a 100644
--- a/tests/nssmock.c
+++ b/tests/nssmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/nsstest.c b/tests/nsstest.c
index fe0a16c3c4..d43c59c4a2 100644
--- a/tests/nsstest.c
+++ b/tests/nsstest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index e6de11ec39..9ba082d353 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Cedric Bosdonnat <cbosdonnat@suse.com>
  */
 
 #include <config.h>
diff --git a/tests/objectlocking.ml b/tests/objectlocking.ml
index fd83d6d60c..778e67cffd 100644
--- a/tests/objectlocking.ml
+++ b/tests/objectlocking.ml
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  *)
 
 open Pretty
diff --git a/tests/qemucaps2xmlmock.c b/tests/qemucaps2xmlmock.c
index bd6c356abd..413adfb5ab 100644
--- a/tests/qemucaps2xmlmock.c
+++ b/tests/qemucaps2xmlmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Pavel Hrdina <phrdina@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index ead4543699..dd9fc6917a 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Francesco Romani <fromani@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c
index 54084218b7..708c245561 100644
--- a/tests/qemucapsprobe.c
+++ b/tests/qemucapsprobe.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 0e8008e08d..f3f17f2116 100644
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jiri Denemark <jdenemar@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index a64cd955c4..b300793732 100644
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/ssh.c b/tests/ssh.c
index 4a75a5d568..58148fef77 100644
--- a/tests/ssh.c
+++ b/tests/ssh.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c
index 1d64096130..a0bbad3990 100644
--- a/tests/storagebackendsheepdogtest.c
+++ b/tests/storagebackendsheepdogtest.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
  */
 
 #include <config.h>
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 2c1c450a78..62cf5878ff 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
  */
 
 #include <config.h>
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 8cfd68dff3..42e62cd874 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 96e5a07555..fc112db0bc 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -14,9 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index b0911d4df2..06bd0a5f29 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index ea352c1530..5eda6fe725 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virdbusmock.c b/tests/virdbusmock.c
index a62689e91d..0673f7292a 100644
--- a/tests/virdbusmock.c
+++ b/tests/virdbusmock.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virdbustest.c b/tests/virdbustest.c
index c900d17b79..3afea6c248 100644
--- a/tests/virdbustest.c
+++ b/tests/virdbustest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virdeterministichashmock.c b/tests/virdeterministichashmock.c
index cd80cfcb52..3237f56a6c 100644
--- a/tests/virdeterministichashmock.c
+++ b/tests/virdeterministichashmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 125183327b..7e9dced87e 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virfilemock.c b/tests/virfilemock.c
index ae5c8d025a..fb6bd5e699 100644
--- a/tests/virfilemock.c
+++ b/tests/virfilemock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index f7b263f2e9..b1cb831bfd 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c
index dda736cae5..39aaa3bda7 100644
--- a/tests/virfirewalltest.c
+++ b/tests/virfirewalltest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c
index bc73362a6b..4e067b10d1 100644
--- a/tests/virhostdevtest.c
+++ b/tests/virhostdevtest.c
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Chunyan Liu <cyliu@suse.com>
  */
 
 #include <config.h>
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index e390512147..b60d944d8e 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
index 4fd7ff6e19..32b8a17b90 100644
--- a/tests/viriscsitest.c
+++ b/tests/viriscsitest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jan Tomko <jtomko@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index 8d541dcba3..e134ccfe1c 100644
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 196c022b1c..4276149163 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 93353be285..991e587db6 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c
index 6e3e9984d1..884dabab82 100644
--- a/tests/virmacmaptest.c
+++ b/tests/virmacmaptest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c
index 546c6d6a43..7664f007ac 100644
--- a/tests/virmocklibxl.c
+++ b/tests/virmocklibxl.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdaemonmock.c b/tests/virnetdaemonmock.c
index 6d807a5a91..3b92fff8c9 100644
--- a/tests/virnetdaemonmock.c
+++ b/tests/virnetdaemonmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Erik Skultety <eskultet@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index 6f4957fc4c..3e9b007d9b 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdevbandwidthmock.c b/tests/virnetdevbandwidthmock.c
index 45eaa6e498..cb48933447 100644
--- a/tests/virnetdevbandwidthmock.c
+++ b/tests/virnetdevbandwidthmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Erik Skultety <eskultet@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index 72bfeff979..68e7595689 100644
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c
index b005f1644c..9724a1bc1f 100644
--- a/tests/virnetdevmock.c
+++ b/tests/virnetdevmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetdevtest.c b/tests/virnetdevtest.c
index 93152e89d3..24fb4d35e0 100644
--- a/tests/virnetdevtest.c
+++ b/tests/virnetdevtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index eb6fc4c407..2d81441626 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetserverclientmock.c b/tests/virnetserverclientmock.c
index caef1e3ce0..23418de911 100644
--- a/tests/virnetserverclientmock.c
+++ b/tests/virnetserverclientmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index 3f801902ca..cb5071b2d9 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e3266d9767..9c14989287 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 49b33e354a..07910c2749 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c
index 36c29cf9c0..a6aacf4cc3 100644
--- a/tests/virnettlshelpers.c
+++ b/tests/virnettlshelpers.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virnettlshelpers.h b/tests/virnettlshelpers.h
index 48e743134e..ad72cd6ab8 100644
--- a/tests/virnettlshelpers.h
+++ b/tests/virnettlshelpers.h
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <gnutls/gnutls.h>
diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
index fb2efd7594..41abbe7eaf 100644
--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virpcimock.c b/tests/virpcimock.c
index 9eb5eb3a1e..acde380c5d 100644
--- a/tests/virpcimock.c
+++ b/tests/virpcimock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virpcitest.c b/tests/virpcitest.c
index 384ff055e0..961a7eff1a 100644
--- a/tests/virpcitest.c
+++ b/tests/virpcitest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c
index f7589dba00..25e759d703 100644
--- a/tests/virpolkittest.c
+++ b/tests/virpolkittest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c
index 9de0335601..c0f8e8e857 100644
--- a/tests/virportallocatormock.c
+++ b/tests/virportallocatormock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 29da9a7c01..211de705a4 100644
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virrandommock.c b/tests/virrandommock.c
index 9d7f695749..3781b0f4ef 100644
--- a/tests/virrandommock.c
+++ b/tests/virrandommock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: John Ferlan <jferlan@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c
index 159d84ec9d..0d81bbfd6a 100644
--- a/tests/virrotatingfiletest.c
+++ b/tests/virrotatingfiletest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library;  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 7dda14e336..4c348d9909 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Ján Tomko <jtomko@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virscsitest.c b/tests/virscsitest.c
index eff488641b..665f70e28b 100644
--- a/tests/virscsitest.c
+++ b/tests/virscsitest.c
@@ -15,8 +15,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Osier Yang <jyang@redhat.com>
- *
  */
 
 #include <config.h>
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index be4f558035..c7c40b16f8 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Eric Blake <eblake@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index d1a593cb9a..cbbfaa259d 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index 7d15c0f37d..66f24143d0 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virtestmock.c b/tests/virtestmock.c
index e0a3388266..1cafbec0d5 100644
--- a/tests/virtestmock.c
+++ b/tests/virtestmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 79a1e153da..1eb321858b 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 8ccfba71b3..ba5db15011 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virusbmock.c b/tests/virusbmock.c
index fbab6e48be..f35ad407ad 100644
--- a/tests/virusbmock.c
+++ b/tests/virusbmock.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jan Tomko <jtomko@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/virusbtest.c b/tests/virusbtest.c
index d1f3e9c239..564c4b44a4 100644
--- a/tests/virusbtest.c
+++ b/tests/virusbtest.c
@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Jan Tomko <jtomko@redhat.com>
  */
 
 #include <config.h>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 928fbaf42f..b1eb8a0614 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -18,8 +18,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *
  */
 
 #include <config.h>
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 35cef16629..cae1ed15d4 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -17,8 +17,6 @@
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- *
  */
 
 #include <config.h>
diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
index ec73ea575a..46d051c08c 100644
--- a/tools/nss/libvirt_nss.c
+++ b/tools/nss/libvirt_nss.c
@@ -21,9 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 #include <config.h>
 
diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h
index a25fe01106..325058d4b8 100644
--- a/tools/nss/libvirt_nss.h
+++ b/tools/nss/libvirt_nss.h
@@ -21,9 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik <mprivozn@redhat.com>
  */
 
 #ifndef __LIBVIRT_NSS_H__
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 44ddada538..cfbfeae328 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
  */
 
 #include <config.h>
diff --git a/tools/virsh-console.c b/tools/virsh-console.c
index 05e3ebd04a..045a636867 100644
--- a/tools/virsh-console.c
+++ b/tools/virsh-console.c
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel Berrange <berrange@redhat.com>
  */
 
 #include <config.h>
diff --git a/tools/virsh-console.h b/tools/virsh-console.h
index 598d353dd0..c3fa38340e 100644
--- a/tools/virsh-console.h
+++ b/tools/virsh-console.h
@@ -16,9 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Daniel Berrange <berrange@redhat.com>
  */
 
 #ifndef __VIR_CONSOLE_H__
diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index aa4564858e..0dfb86ee62 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- * Authors:
- *     Erik Skultety <eskultet@redhat.com>
  */
 
 #include <config.h>
diff --git a/tools/vsh-table.c b/tools/vsh-table.c
index 9855609e54..fda8f15879 100644
--- a/tools/vsh-table.c
+++ b/tools/vsh-table.c
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Simon Kobyda <skobyda@redhat.com>
- *
  */
 
 #include <config.h>
diff --git a/tools/vsh-table.h b/tools/vsh-table.h
index ef03d4f3ca..15a9f8957b 100644
--- a/tools/vsh-table.h
+++ b/tools/vsh-table.h
@@ -16,10 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Simon Kobyda <skobyda@redhat.com>
- *
  */
 
 #ifndef VSH_TABLE_H
diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
index c037ad7e26..a71ad9f812 100644
--- a/tools/wireshark/src/packet-libvirt.c
+++ b/tools/wireshark/src/packet-libvirt.c
@@ -15,10 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Michal Privoznik         <mprivozn redhat com>
- *     Yuto KAWAMURA(kawamuray) <kawamuray.dadada gmail.com>
  */
 #include <config.h>
 
diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h
index 9874a8cbfc..53197eb2eb 100644
--- a/tools/wireshark/src/packet-libvirt.h
+++ b/tools/wireshark/src/packet-libvirt.h
@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see
  * <http://www.gnu.org/licenses/>.
- *
- * Author: Yuto KAWAMURA(kawamuray)
  */
 #ifndef _PACKET_LIBVIRT_H_
 # define _PACKET_LIBVIRT_H_
diff --git a/tools/wireshark/util/genxdrstub.pl b/tools/wireshark/util/genxdrstub.pl
old mode 100755
new mode 100644
index 07f0ff7250..cae64b2f49
--- a/tools/wireshark/util/genxdrstub.pl
+++ b/tools/wireshark/util/genxdrstub.pl
@@ -17,7 +17,6 @@
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 #
-# Author: Yuto KAWAMURA(kawamuray)
 #
 # For XDR syntax, see http://tools.ietf.org/html/rfc4506#section-6.3
 # This script does not strictly check syntax of xdr protocol specification.
-- 
2.19.2

    

Daniel P. Berrangé

Erik Skultety

Daniel P. Berrangé

Daniel P. Berrangé

tags

participants (2)