From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 3 Aug 2016 11:41:40 +0000 (+0200)
Subject: Merge pull request #1830 from rubenk/move-collectd-header
X-Git-Tag: collectd-5.6.0~126
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4103105fb43cd72294f165b2541540b3a8a99532;hp=cd5c60931ef73c6c34be6dcf58538b069be17c58

Merge pull request #1830 from rubenk/move-collectd-header

treewide: add blank line below collectd.h
---

diff --git a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
index 9539062c..e1b89f6c 100644
--- a/contrib/examples/myplugin.c
+++ b/contrib/examples/myplugin.c
@@ -39,6 +39,7 @@
 #endif /* ! HAVE_CONFIG */
 
 #include <collectd/collectd.h>
+
 #include <collectd/common.h>
 #include <collectd/plugin.h>
 
diff --git a/src/amqp.c b/src/amqp.c
index 9bc3175c..809d5549 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_cmd_putval.h"
diff --git a/src/apache.c b/src/apache.c
index afdeda4e..59ddd8fa 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/apcups.c b/src/apcups.c
index aa0be835..a1f23826 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"      /* rrd_update_file */
 #include "plugin.h"      /* plugin_register, plugin_submit */
 #include "configfile.h"  /* cf_register */
diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 7ed2016f..1c72dda5 100644
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/aquaero.c b/src/aquaero.c
index 5db988e6..ad711eee 100644
--- a/src/aquaero.c
+++ b/src/aquaero.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/ascent.c b/src/ascent.c
index a947bce9..504decc4 100644
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/barometer.c b/src/barometer.c
index f14ac049..e1a45cd8 100644
--- a/src/barometer.c
+++ b/src/barometer.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_cache.h"
 #include "plugin.h"
diff --git a/src/battery.c b/src/battery.c
index 4e0c06fd..93a7a760 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/bind.c b/src/bind.c
index d46d4967..c768b665 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -36,6 +36,7 @@
 #endif /* STRPTIME_NEEDS_STANDARDS */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/ceph.c b/src/ceph.c
index 34aa7b16..62f75816 100644
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -27,6 +27,7 @@
 #define _BSD_SOURCE
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/cgroups.c b/src/cgroups.c
index 6d419722..508ba90f 100644
--- a/src/cgroups.c
+++ b/src/cgroups.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/chrony.c b/src/chrony.c
index 9c40dd33..1735b495 100644
--- a/src/chrony.c
+++ b/src/chrony.c
@@ -26,6 +26,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"             /* auxiliary functions */
 #include "plugin.h"             /* plugin_register_*, plugin_dispatch_values */
 
diff --git a/src/conntrack.c b/src/conntrack.c
index 123ff543..ce90ede3 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/contextswitch.c b/src/contextswitch.c
index 344f76e7..76e2a6c0 100644
--- a/src/contextswitch.c
+++ b/src/contextswitch.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/cpu.c b/src/cpu.c
index 9c432d17..f4bdbf99 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/cpufreq.c b/src/cpufreq.c
index b92b1d09..1550e777 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/csv.c b/src/csv.c
index 0cb9bc1a..f9db5957 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_cache.h"
diff --git a/src/curl.c b/src/curl.c
index d9ced60d..0cfedf32 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/curl_json.c b/src/curl_json.c
index 2dac7479..da989240 100644
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/curl_xml.c b/src/curl_xml.c
index 05d75c67..253356c0 100644
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 3a6fe1e9..b7377626 100644
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -26,8 +26,8 @@
  **/
 
 #include "collectd.h"
-#include "common.h"
 
+#include "common.h"
 #include "plugin.h"
 #include "configfile.h"
 
diff --git a/src/daemon/common.c b/src/daemon/common.c
index 7bbace76..ff2e5199 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_cache.h"
diff --git a/src/daemon/common.h b/src/daemon/common.h
index 6981d21d..8079661a 100644
--- a/src/daemon/common.h
+++ b/src/daemon/common.h
@@ -29,6 +29,7 @@
 #define COMMON_H
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #if HAVE_PWD_H
diff --git a/src/daemon/configfile.h b/src/daemon/configfile.h
index 924d97c5..ae2c6c0f 100644
--- a/src/daemon/configfile.h
+++ b/src/daemon/configfile.h
@@ -28,6 +28,7 @@
 #define CONFIGFILE_H
 
 #include "collectd.h"
+
 #include "utils_time.h"
 #include "liboconfig/oconfig.h"
 
diff --git a/src/daemon/filter_chain.c b/src/daemon/filter_chain.c
index c10525de..5fb965f9 100644
--- a/src/daemon/filter_chain.c
+++ b/src/daemon/filter_chain.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "configfile.h"
 #include "plugin.h"
 #include "utils_complain.h"
diff --git a/src/daemon/filter_chain.h b/src/daemon/filter_chain.h
index dbf4b833..2d280f89 100644
--- a/src/daemon/filter_chain.h
+++ b/src/daemon/filter_chain.h
@@ -28,6 +28,7 @@
 #define FILTER_CHAIN_H 1
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #define FC_MATCH_NO_MATCH  0
diff --git a/src/daemon/meta_data.c b/src/daemon/meta_data.c
index f4a340cb..73c6046d 100644
--- a/src/daemon/meta_data.c
+++ b/src/daemon/meta_data.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "meta_data.h"
 
diff --git a/src/daemon/meta_data.h b/src/daemon/meta_data.h
index 9e448e55..0398c546 100644
--- a/src/daemon/meta_data.h
+++ b/src/daemon/meta_data.h
@@ -29,6 +29,7 @@
 
 #include "collectd.h"
 
+
 /*
  * Defines
  */
diff --git a/src/daemon/meta_data_test.c b/src/daemon/meta_data_test.c
index 48760d64..35cfe715 100644
--- a/src/daemon/meta_data_test.c
+++ b/src/daemon/meta_data_test.c
@@ -26,6 +26,7 @@
 
 #include "common.h" /* for STATIC_ARRAY_SIZE */
 #include "collectd.h"
+
 #include "testing.h"
 #include "meta_data.h"
 
diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 9258b885..e0ad54c3 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 75498c8a..0551951c 100644
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -29,6 +29,7 @@
 #define PLUGIN_H
 
 #include "collectd.h"
+
 #include "configfile.h"
 #include "meta_data.h"
 #include "utils_time.h"
diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index de6fce3e..436df674 100644
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "plugin.h"
diff --git a/src/daemon/utils_avltree_test.c b/src/daemon/utils_avltree_test.c
index 489d60fa..2019ffa9 100644
--- a/src/daemon/utils_avltree_test.c
+++ b/src/daemon/utils_avltree_test.c
@@ -26,6 +26,7 @@
 
 #include "common.h" /* STATIC_ARRAY_SIZE */
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_avltree.h"
 
diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index fa592f09..8dfe3599 100644
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_avltree.h"
diff --git a/src/daemon/utils_complain.c b/src/daemon/utils_complain.c
index 1cf6c3aa..d028c067 100644
--- a/src/daemon/utils_complain.c
+++ b/src/daemon/utils_complain.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "utils_complain.h"
 #include "plugin.h"
 
diff --git a/src/daemon/utils_heap_test.c b/src/daemon/utils_heap_test.c
index 6ef80475..82392ef8 100644
--- a/src/daemon/utils_heap_test.c
+++ b/src/daemon/utils_heap_test.c
@@ -25,6 +25,7 @@
  */
 
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_heap.h"
 
diff --git a/src/daemon/utils_match.c b/src/daemon/utils_match.c
index b4cd5171..803656d4 100644
--- a/src/daemon/utils_match.c
+++ b/src/daemon/utils_match.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c
index fee08717..0488f913 100644
--- a/src/daemon/utils_random.c
+++ b/src/daemon/utils_random.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "utils_time.h"
 #include "utils_random.h"
 
diff --git a/src/daemon/utils_subst.c b/src/daemon/utils_subst.c
index 9284f733..1bc28f72 100644
--- a/src/daemon/utils_subst.c
+++ b/src/daemon/utils_subst.c
@@ -29,6 +29,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_subst.h"
 
diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c
index 953ccc4c..c180b7dc 100644
--- a/src/daemon/utils_subst_test.c
+++ b/src/daemon/utils_subst_test.c
@@ -26,6 +26,7 @@
 
 #include "common.h" /* for STATIC_ARRAY_SIZE */
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_subst.h"
 
diff --git a/src/daemon/utils_tail.c b/src/daemon/utils_tail.c
index a6fb6005..0d8ed7c1 100644
--- a/src/daemon/utils_tail.c
+++ b/src/daemon/utils_tail.c
@@ -31,6 +31,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_tail.h"
 
diff --git a/src/daemon/utils_tail_match.c b/src/daemon/utils_tail_match.c
index 1aeb814a..604c6d4c 100644
--- a/src/daemon/utils_tail_match.c
+++ b/src/daemon/utils_tail_match.c
@@ -30,6 +30,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_match.h"
diff --git a/src/daemon/utils_threshold.c b/src/daemon/utils_threshold.c
index cb1ea34a..784e1094 100644
--- a/src/daemon/utils_threshold.c
+++ b/src/daemon/utils_threshold.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_avltree.h"
 #include "utils_threshold.h"
diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 56c250cd..86476ea6 100644
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "utils_time.h"
 #include "plugin.h"
 #include "common.h"
diff --git a/src/daemon/utils_time_test.c b/src/daemon/utils_time_test.c
index 4d64991b..493e591d 100644
--- a/src/daemon/utils_time_test.c
+++ b/src/daemon/utils_time_test.c
@@ -27,6 +27,7 @@
 #define DBL_PRECISION 1e-3
 
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_time.h"
 
diff --git a/src/dbi.c b/src/dbi.c
index d5a6c603..78ac777f 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/df.c b/src/df.c
index ff701725..1e360099 100644
--- a/src/df.c
+++ b/src/df.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/disk.c b/src/disk.c
index 9965bca7..a798a894 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/dns.c b/src/dns.c
index 5930dc50..17f87967 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,6 +25,7 @@
 #define _BSD_SOURCE
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/drbd.c b/src/drbd.c
index f0298943..3485c0bb 100644
--- a/src/drbd.c
+++ b/src/drbd.c
@@ -35,6 +35,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/email.c b/src/email.c
index db6dd414..59f6beb0 100644
--- a/src/email.c
+++ b/src/email.c
@@ -39,6 +39,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/entropy.c b/src/entropy.c
index 03de9efb..f4f4ac4a 100644
--- a/src/entropy.c
+++ b/src/entropy.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/ethstat.c b/src/ethstat.c
index b30f614e..39af1407 100644
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/exec.c b/src/exec.c
index 71a49181..699041a3 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -27,6 +27,7 @@
 #define _BSD_SOURCE /* For setgroups */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/fhcount.c b/src/fhcount.c
index 666dacc0..c7603c7d 100644
--- a/src/fhcount.c
+++ b/src/fhcount.c
@@ -18,6 +18,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/filecount.c b/src/filecount.c
index c81fdc25..169e9d0e 100644
--- a/src/filecount.c
+++ b/src/filecount.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/fscache.c b/src/fscache.c
index 68f5c79c..332a32c4 100644
--- a/src/fscache.c
+++ b/src/fscache.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include <stdio.h>  /* a header needed for FILE */
diff --git a/src/gmond.c b/src/gmond.c
index cfe7eaf4..5af0f329 100644
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/hddtemp.c b/src/hddtemp.c
index e7b4d8a1..2b481f51 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -30,6 +30,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/interface.c b/src/interface.c
index 54883225..3024313a 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/ipc.c b/src/ipc.c
index 00b3a5f8..49519894 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -27,6 +27,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/ipmi.c b/src/ipmi.c
index 93f2486c..d61a8bcb 100644
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/iptables.c b/src/iptables.c
index 20dce658..7ff59c14 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/ipvs.c b/src/ipvs.c
index 760aa3c5..354c7d35 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -31,6 +31,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/irq.c b/src/irq.c
index 93f3f53b..0c363795 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/java.c b/src/java.c
index 33d0504c..5e46f576 100644
--- a/src/java.c
+++ b/src/java.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "filter_chain.h"
diff --git a/src/load.c b/src/load.c
index 18b5f8e8..cc3be37e 100644
--- a/src/load.c
+++ b/src/load.c
@@ -27,6 +27,7 @@
 #define _BSD_SOURCE
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/log_logstash.c b/src/log_logstash.c
index 3cf636e5..08868409 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/logfile.c b/src/logfile.c
index 334226ba..d18a5365 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/lpar.c b/src/lpar.c
index 4d534476..5b0bd13d 100644
--- a/src/lpar.c
+++ b/src/lpar.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/lvm.c b/src/lvm.c
index 9e245423..6b9a0317 100644
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -24,6 +24,7 @@
 #include <lvm2app.h>
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/madwifi.c b/src/madwifi.c
index ffc815da..753ad167 100644
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -89,6 +89,7 @@
 
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c
index bff9448a..f4b94ee5 100644
--- a/src/match_empty_counter.c
+++ b/src/match_empty_counter.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
diff --git a/src/match_hashed.c b/src/match_hashed.c
index a42439c0..994022e6 100644
--- a/src/match_hashed.c
+++ b/src/match_hashed.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
diff --git a/src/match_regex.c b/src/match_regex.c
index 2dee9a8f..f7d5e3e7 100644
--- a/src/match_regex.c
+++ b/src/match_regex.c
@@ -32,6 +32,7 @@
  */
 
 #include "collectd.h"
+
 #include "filter_chain.h"
 
 #include <sys/types.h>
diff --git a/src/match_timediff.c b/src/match_timediff.c
index 3b154150..9e08021b 100644
--- a/src/match_timediff.c
+++ b/src/match_timediff.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
diff --git a/src/match_value.c b/src/match_value.c
index 3b269c8c..604f0d6f 100644
--- a/src/match_value.c
+++ b/src/match_value.c
@@ -30,6 +30,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_cache.h"
 #include "filter_chain.h"
diff --git a/src/mbmon.c b/src/mbmon.c
index 5f398d0c..2e26aa1f 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/md.c b/src/md.c
index 3725f9a9..6a96a905 100644
--- a/src/md.c
+++ b/src/md.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/memcachec.c b/src/memcachec.c
index d7e6c286..55e9b855 100644
--- a/src/memcachec.c
+++ b/src/memcachec.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/memcached.c b/src/memcached.c
index 46155e7e..e398dd9e 100644
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -29,6 +29,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/memory.c b/src/memory.c
index 744af1a8..6204d35c 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/mic.c b/src/mic.c
index 570da51b..8d7871b1 100644
--- a/src/mic.c
+++ b/src/mic.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_ignorelist.h"
diff --git a/src/modbus.c b/src/modbus.c
index ec429698..2f685e6e 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/mqtt.c b/src/mqtt.c
index b318f211..5667ff44 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -31,6 +31,7 @@
 
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_complain.h"
diff --git a/src/multimeter.c b/src/multimeter.c
index 00e9964b..491e6413 100644
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/mysql.c b/src/mysql.c
index 419a1543..54236dac 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/netapp.c b/src/netapp.c
index 45395ae0..dbf02850 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_ignorelist.h"
 
diff --git a/src/netlink.c b/src/netlink.c
index 5c3a9f00..b2c8b0f2 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/network.c b/src/network.c
index 4ce3f5f0..3fa66aab 100644
--- a/src/network.c
+++ b/src/network.c
@@ -26,6 +26,7 @@
 #define _BSD_SOURCE /* For struct ip_mreq */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/nfs.c b/src/nfs.c
index 0948bc79..ee2d93b2 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/nginx.c b/src/nginx.c
index 7587c1f9..2c7e1ccd 100644
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index c2d97520..d12ecb2c 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -29,6 +29,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/notify_email.c b/src/notify_email.c
index 0120a403..c7fe79ea 100644
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/notify_nagios.c b/src/notify_nagios.c
index c1692223..c53294b2 100644
--- a/src/notify_nagios.c
+++ b/src/notify_nagios.c
@@ -25,6 +25,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/ntpd.c b/src/ntpd.c
index c3dee22c..02c9f6dc 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -28,6 +28,7 @@
 #define _BSD_SOURCE /* For NI_MAXHOST */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/numa.c b/src/numa.c
index 4bcc2468..8f5bf480 100644
--- a/src/numa.c
+++ b/src/numa.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/nut.c b/src/nut.c
index a033e2f6..ee96863b 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/olsrd.c b/src/olsrd.c
index 7838ebaa..0af32dc1 100644
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/onewire.c b/src/onewire.c
index 42bd1eb8..f1030867 100644
--- a/src/onewire.c
+++ b/src/onewire.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/openldap.c b/src/openldap.c
index 3dac057e..35eae32e 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/openvpn.c b/src/openvpn.c
index 85760e99..8bbb82b2 100644
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/oracle.c b/src/oracle.c
index cb9b3dbf..8ecfe25a 100644
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -46,6 +46,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/perl.c b/src/perl.c
index fe9f97b5..d2f83455 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -34,6 +34,7 @@
 
 #define DONT_POISON_SPRINTF_YET 1
 #include "collectd.h"
+
 #undef DONT_POISON_SPRINTF_YET
 
 #include "configfile.h"
diff --git a/src/pf.c b/src/pf.c
index c9aeb5ff..e8e0b185 100644
--- a/src/pf.c
+++ b/src/pf.c
@@ -20,6 +20,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/pinba.c b/src/pinba.c
index 66170bf7..33ab545a 100644
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/ping.c b/src/ping.c
index e16ba077..0a9bc444 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/postgresql.c b/src/postgresql.c
index 65766a9f..3b125ee8 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -31,6 +31,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "configfile.h"
diff --git a/src/powerdns.c b/src/powerdns.c
index 55f13fef..958a3410 100644
--- a/src/powerdns.c
+++ b/src/powerdns.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/processes.c b/src/processes.c
index f029a6c2..b8cb192c 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -35,6 +35,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/protocols.c b/src/protocols.c
index 4d2b2ead..208da8b2 100644
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/pyconfig.c b/src/pyconfig.c
index 32b31cc5..83748b4f 100644
--- a/src/pyconfig.c
+++ b/src/pyconfig.c
@@ -28,6 +28,7 @@
 #include <structmember.h>
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "cpython.h"
diff --git a/src/python.c b/src/python.c
index 3a282918..1576057b 100644
--- a/src/python.c
+++ b/src/python.c
@@ -30,6 +30,7 @@
 #include <signal.h>
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "cpython.h"
diff --git a/src/pyvalues.c b/src/pyvalues.c
index 0ba04360..7cb3599d 100644
--- a/src/pyvalues.c
+++ b/src/pyvalues.c
@@ -28,6 +28,7 @@
 #include <structmember.h>
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "cpython.h"
diff --git a/src/redis.c b/src/redis.c
index 47d0d707..5a8c7212 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/routeros.c b/src/routeros.c
index 7ee30248..3cbbebc6 100644
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/rrdcached.c b/src/rrdcached.c
index 3a6c9851..89367d4c 100644
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_rrdcreate.h"
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 348f2876..6166ecfa 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_avltree.h"
diff --git a/src/sensors.c b/src/sensors.c
index 63a1c8ee..14dce2e3 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -34,6 +34,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/serial.c b/src/serial.c
index 0878d3c9..3f7e92d0 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/sigrok.c b/src/sigrok.c
index d8c65c08..e7aab7f3 100644
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -20,6 +20,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/smart.c b/src/smart.c
index 33b9751c..752cb74c 100644
--- a/src/smart.c
+++ b/src/smart.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_ignorelist.h"
diff --git a/src/snmp.c b/src/snmp.c
index 08492558..60bec83c 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_complain.h"
diff --git a/src/statsd.c b/src/statsd.c
index 8acd9fd2..7eb58622 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -25,6 +25,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/swap.c b/src/swap.c
index 645dc586..32906fa8 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/syslog.c b/src/syslog.c
index 849f7d1b..73e5e1f3 100644
--- a/src/syslog.c
+++ b/src/syslog.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/table.c b/src/table.c
index 38d5f03a..d2c4249f 100644
--- a/src/table.c
+++ b/src/table.c
@@ -29,6 +29,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 
 #include "configfile.h"
diff --git a/src/tail.c b/src/tail.c
index b9e92068..732607cf 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_tail_match.h"
diff --git a/src/tail_csv.c b/src/tail_csv.c
index 70710216..86c4fa88 100644
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
 #include "common.h" /* auxiliary functions */
 #include "utils_tail.h"
diff --git a/src/tape.c b/src/tape.c
index a8e7dc45..723ee7b8 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -21,6 +21,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/target_notification.c b/src/target_notification.c
index 63e4f315..59d8c94f 100644
--- a/src/target_notification.c
+++ b/src/target_notification.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 #include "utils_cache.h"
diff --git a/src/target_replace.c b/src/target_replace.c
index 8d774c57..8389ce3f 100644
--- a/src/target_replace.c
+++ b/src/target_replace.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 #include "utils_subst.h"
diff --git a/src/target_scale.c b/src/target_scale.c
index 579d01a0..8659c8d7 100644
--- a/src/target_scale.c
+++ b/src/target_scale.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
diff --git a/src/target_set.c b/src/target_set.c
index 2060dcde..ee068ec3 100644
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "filter_chain.h"
 
diff --git a/src/target_v5upgrade.c b/src/target_v5upgrade.c
index 6d661711..f7baa3ae 100644
--- a/src/target_v5upgrade.c
+++ b/src/target_v5upgrade.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "filter_chain.h"
diff --git a/src/tcpconns.c b/src/tcpconns.c
index da916950..e28a8694 100644
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -58,6 +58,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 5d534603..40ca15e6 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/ted.c b/src/ted.c
index 282212b1..28ee8e48 100644
--- a/src/ted.c
+++ b/src/ted.c
@@ -35,6 +35,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/thermal.c b/src/thermal.c
index 54311a64..c6db8c04 100644
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/threshold.c b/src/threshold.c
index f12b4057..bbd40913 100644
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_avltree.h"
diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index befbd50a..7c6d9129 100644
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_cache.h"
diff --git a/src/turbostat.c b/src/turbostat.c
index bd5d86cd..2b3ce0ef 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -36,6 +36,7 @@
 #define _GNU_SOURCE
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_time.h"
diff --git a/src/unixsock.c b/src/unixsock.c
index 5454fd8c..1faeff9c 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/uptime.c b/src/uptime.c
index 4116b810..cbe2f8c5 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/users.c b/src/users.c
index a4ee4ef7..30e0dbe6 100644
--- a/src/users.c
+++ b/src/users.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 41061664..4c55cc76 100644
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_parse_option.h"
diff --git a/src/utils_cmd_getthreshold.c b/src/utils_cmd_getthreshold.c
index 7e4a9db1..b2a0a23b 100644
--- a/src/utils_cmd_getthreshold.c
+++ b/src/utils_cmd_getthreshold.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index 4d679f00..1185a03a 100644
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c
index b698388d..c5f71a39 100644
--- a/src/utils_cmd_listval.c
+++ b/src/utils_cmd_listval.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
index 956ed745..669ef837 100644
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils_cmd_putnotif.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index 4c40e557..bf3e2b6f 100644
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/utils_curl_stats.c b/src/utils_curl_stats.c
index 258c5cfa..2865e9fe 100644
--- a/src/utils_curl_stats.c
+++ b/src/utils_curl_stats.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_curl_stats.h"
 
diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index f683fb5d..e576f947 100644
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/utils_dns.c b/src/utils_dns.c
index a1e4222f..12ba3655 100644
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -37,6 +37,7 @@
 #define _BSD_SOURCE
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c
index d980f586..893bfbd4 100644
--- a/src/utils_fbhash.c
+++ b/src/utils_fbhash.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #include "utils_fbhash.h"
diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index eb5b4b32..a2deb3c7 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -22,6 +22,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/utils_format_graphite.h b/src/utils_format_graphite.h
index 398defbe..60576dac 100644
--- a/src/utils_format_graphite.h
+++ b/src/utils_format_graphite.h
@@ -23,6 +23,7 @@
 #define UTILS_FORMAT_GRAPHITE_H 1
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #define GRAPHITE_STORE_RATES        0x01
diff --git a/src/utils_format_json.c b/src/utils_format_json.c
index 800b4219..99996b4c 100644
--- a/src/utils_format_json.c
+++ b/src/utils_format_json.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/utils_format_json.h b/src/utils_format_json.h
index f1fbb6e7..3584decf 100644
--- a/src/utils_format_json.h
+++ b/src/utils_format_json.h
@@ -28,6 +28,7 @@
 #define UTILS_FORMAT_JSON_H 1
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #ifndef JSON_GAUGE_FORMAT
diff --git a/src/utils_format_kairosdb.c b/src/utils_format_kairosdb.c
index 6258c492..febe2cb3 100644
--- a/src/utils_format_kairosdb.c
+++ b/src/utils_format_kairosdb.c
@@ -26,6 +26,7 @@
 
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/utils_format_kairosdb.h b/src/utils_format_kairosdb.h
index 23cc862e..764b0b1e 100644
--- a/src/utils_format_kairosdb.h
+++ b/src/utils_format_kairosdb.h
@@ -28,6 +28,7 @@
 #define UTILS_FORMAT_KAIROSDB_H 1
 
 #include "collectd.h"
+
 #include "plugin.h"
 
 #ifndef JSON_GAUGE_FORMAT
diff --git a/src/utils_latency.c b/src/utils_latency.c
index 41af00cb..2fb3f833 100644
--- a/src/utils_latency.c
+++ b/src/utils_latency.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "utils_latency.h"
 #include "common.h"
diff --git a/src/utils_latency.h b/src/utils_latency.h
index 2cfa71b6..cb56b082 100644
--- a/src/utils_latency.h
+++ b/src/utils_latency.h
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "utils_time.h"
 
 struct latency_counter_s;
diff --git a/src/utils_latency_test.c b/src/utils_latency_test.c
index f275813d..a0da51ea 100644
--- a/src/utils_latency_test.c
+++ b/src/utils_latency_test.c
@@ -28,6 +28,7 @@
 
 #include "common.h" /* for STATIC_ARRAY_SIZE */
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_time.h"
 #include "utils_latency.h"
diff --git a/src/utils_mount.c b/src/utils_mount.c
index a36882c4..a2e96a65 100644
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "collectd.h"
+
 #include "utils_mount.h"
 
 #include "common.h" /* sstrncpy() et alii */
diff --git a/src/utils_mount_test.c b/src/utils_mount_test.c
index dc6f79f9..c084debe 100644
--- a/src/utils_mount_test.c
+++ b/src/utils_mount_test.c
@@ -25,6 +25,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "testing.h"
 #include "utils_mount.h"
diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c
index f3ec71ae..3652a666 100644
--- a/src/utils_parse_option.c
+++ b/src/utils_parse_option.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "utils_parse_option.h"
 
 int parse_string (char **ret_buffer, char **ret_string)
diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c
index 6da5167d..edb6c957 100644
--- a/src/utils_rrdcreate.c
+++ b/src/utils_rrdcreate.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_rrdcreate.h"
 
diff --git a/src/utils_vl_lookup.c b/src/utils_vl_lookup.c
index 6081c90e..2ca9ddf8 100644
--- a/src/utils_vl_lookup.c
+++ b/src/utils_vl_lookup.c
@@ -26,6 +26,7 @@
 
 #include "collectd.h"
 
+
 #include <pthread.h>
 #include <regex.h>
 
diff --git a/src/utils_vl_lookup_test.c b/src/utils_vl_lookup_test.c
index 668a8d0c..44660638 100644
--- a/src/utils_vl_lookup_test.c
+++ b/src/utils_vl_lookup_test.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_vl_lookup.h"
 
diff --git a/src/uuid.c b/src/uuid.c
index 3836e521..069f0432 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "configfile.h"
 #include "plugin.h"
diff --git a/src/varnish.c b/src/varnish.c
index 771d4a41..863f4971 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/virt.c b/src/virt.c
index 16bb77b1..93bb69b7 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/vmem.c b/src/vmem.c
index f5017068..46ffa13b 100644
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/vserver.c b/src/vserver.c
index 1d957eb3..a7305936 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -27,6 +27,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/wireless.c b/src/wireless.c
index 8445af22..b9984625 100644
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/write_graphite.c b/src/write_graphite.c
index f890b971..0b7a94ff 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -43,6 +43,7 @@
   */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/write_http.c b/src/write_http.c
index 3c2f7248..3d50be53 100644
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -24,6 +24,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "utils_format_json.h"
diff --git a/src/write_kafka.c b/src/write_kafka.c
index 6b5bc398..2df52a20 100644
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -25,6 +25,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/write_log.c b/src/write_log.c
index 25ff55e2..3c599784 100644
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index fb80ba28..8d9ed9df 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -29,6 +29,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/write_redis.c b/src/write_redis.c
index 4ec75d59..36089532 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c
index a4249ecf..352c37f6 100644
--- a/src/write_riemann_threshold.c
+++ b/src/write_riemann_threshold.c
@@ -26,6 +26,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "utils_avltree.h"
diff --git a/src/write_sensu.c b/src/write_sensu.c
index 63c6d998..ce9efb9f 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -27,6 +27,7 @@
 #define _GNU_SOURCE
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 #include "configfile.h"
diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 401e8753..78166b18 100644
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -42,6 +42,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
diff --git a/src/xencpu.c b/src/xencpu.c
index ab053965..59fbcb98 100644
--- a/src/xencpu.c
+++ b/src/xencpu.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/xmms.c b/src/xmms.c
index 29f2acd0..35359950 100644
--- a/src/xmms.c
+++ b/src/xmms.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 37a918b5..c5493d83 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/zone.c b/src/zone.c
index 87c65172..3751bfde 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
diff --git a/src/zookeeper.c b/src/zookeeper.c
index a3b73628..04798582 100644
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"