From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 2 Dec 2016 14:50:40 +0000 (+0100)
Subject: Treewide: remove vim modelines from C code files
X-Git-Tag: collectd-5.8.0~286
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c7c89cc9618ef25cc9b0861ac2782cb1a5d6782d;p=collectd.git

Treewide: remove vim modelines from C code files

They often conflict with the formatting we do with clang-format.
And while we're at it, remove blank lines for end of files too.
---

diff --git a/src/aggregation.c b/src/aggregation.c
index 4e20d0cf..8d501f63 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -752,5 +752,3 @@ void module_register(void) {
   plugin_register_read("aggregation", agg_read);
   plugin_register_write("aggregation", agg_write, /* user_data = */ NULL);
 }
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/amqp.c b/src/amqp.c
index cd07023f..4870107c 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -1022,5 +1022,3 @@ void module_register(void) {
   plugin_register_complex_config("amqp", camqp_config);
   plugin_register_shutdown("amqp", camqp_shutdown);
 } /* void module_register */
-
-/* vim: set sw=4 sts=4 et fdm=marker : */
diff --git a/src/apache.c b/src/apache.c
index eaef61b1..547d7456 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -573,5 +573,3 @@ void module_register(void) {
   plugin_register_complex_config("apache", config);
   plugin_register_init("apache", apache_init);
 } /* void module_register */
-
-/* vim: set sw=8 noet fdm=marker : */
diff --git a/src/aquaero.c b/src/aquaero.c
index 4a78f685..22278e03 100644
--- a/src/aquaero.c
+++ b/src/aquaero.c
@@ -161,5 +161,3 @@ void module_register(void) {
   plugin_register_read("aquaero", aquaero_read);
   plugin_register_shutdown("aquaero", aquaero_shutdown);
 } /* void module_register */
-
-/* vim: set sw=8 sts=8 noet : */
diff --git a/src/ascent.c b/src/ascent.c
index 840fe8b8..5f0d85e7 100644
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -571,5 +571,3 @@ void module_register(void) {
   plugin_register_init("ascent", ascent_init);
   plugin_register_read("ascent", ascent_read);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 et fdm=marker : */
diff --git a/src/bind.c b/src/bind.c
index 9bb662fc..38761775 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -1613,5 +1613,3 @@ void module_register(void) {
   plugin_register_read("bind", bind_read);
   plugin_register_shutdown("bind", bind_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 et fdm=marker : */
diff --git a/src/ceph.c b/src/ceph.c
index 4e435b3e..2331e33d 100644
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -1446,4 +1446,3 @@ void module_register(void) {
   plugin_register_read("ceph", ceph_read);
   plugin_register_shutdown("ceph", ceph_shutdown);
 }
-/* vim: set sw=4 sts=4 et : */
diff --git a/src/ceph_test.c b/src/ceph_test.c
index 3da4098c..2f65b509 100644
--- a/src/ceph_test.c
+++ b/src/ceph_test.c
@@ -187,5 +187,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/collectd-tg.c b/src/collectd-tg.c
index 7ded64dd..3bde3259 100644
--- a/src/collectd-tg.c
+++ b/src/collectd-tg.c
@@ -423,5 +423,3 @@ int main(int argc, char **argv) /* {{{ */
   lcc_network_destroy(net);
   exit(EXIT_SUCCESS);
 } /* }}} int main */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/collectdctl.c b/src/collectdctl.c
index 30d1cdc0..248baadf 100644
--- a/src/collectdctl.c
+++ b/src/collectdctl.c
@@ -585,5 +585,3 @@ int main(int argc, char **argv) {
     return (status);
   return (0);
 } /* main */
-
-/* vim: set sw=2 ts=2 tw=78 expandtab : */
diff --git a/src/collectdmon.c b/src/collectdmon.c
index 9040f8d9..4a7d1a6b 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -386,5 +386,3 @@ int main(int argc, char **argv) {
   free(collectd_argv);
   return 0;
 } /* main */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/cpu.c b/src/cpu.c
index 9091fef9..c0bdd56f 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -862,5 +862,3 @@ void module_register(void) {
   plugin_register_config("cpu", cpu_config, config_keys, config_keys_num);
   plugin_register_read("cpu", cpu_read);
 } /* void module_register */
-
-/* vim: set sw=8 sts=8 noet fdm=marker : */
diff --git a/src/curl.c b/src/curl.c
index c6f0b607..4906d927 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -679,5 +679,3 @@ void module_register(void) {
   plugin_register_read("curl", cc_read);
   plugin_register_shutdown("curl", cc_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/curl_json.c b/src/curl_json.c
index aa1ae797..8e09bd82 100644
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -940,5 +940,3 @@ void module_register(void) {
   plugin_register_complex_config("curl_json", cj_config);
   plugin_register_init("curl_json", cj_init);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/curl_xml.c b/src/curl_xml.c
index 4e4c6f99..1c282277 100644
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -1026,5 +1026,3 @@ void module_register(void) {
   plugin_register_complex_config("curl_xml", cx_config);
   plugin_register_init("curl_xml", cx_init);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/daemon/common_test.c b/src/daemon/common_test.c
index 0c96945f..f18d9fda 100644
--- a/src/daemon/common_test.c
+++ b/src/daemon/common_test.c
@@ -392,5 +392,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/filter_chain.c b/src/daemon/filter_chain.c
index 9c4a89c1..f21ea32b 100644
--- a/src/daemon/filter_chain.c
+++ b/src/daemon/filter_chain.c
@@ -942,5 +942,3 @@ int fc_configure(const oconfig_item_t *ci) /* {{{ */
 
   return (-1);
 } /* }}} int fc_configure */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/daemon/filter_chain.h b/src/daemon/filter_chain.h
index 36ccbae9..5cc06fc5 100644
--- a/src/daemon/filter_chain.h
+++ b/src/daemon/filter_chain.h
@@ -101,4 +101,3 @@ int fc_default_action(const data_set_t *ds, value_list_t *vl);
 int fc_configure(const oconfig_item_t *ci);
 
 #endif /* FILTER_CHAIN_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/meta_data.c b/src/daemon/meta_data.c
index 19d17bf8..3ac53706 100644
--- a/src/daemon/meta_data.c
+++ b/src/daemon/meta_data.c
@@ -746,5 +746,3 @@ int meta_data_as_string(meta_data_t *md, /* {{{ */
 
   return (0);
 } /* }}} int meta_data_as_string */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/daemon/meta_data.h b/src/daemon/meta_data.h
index 3ef33604..50fdb8d6 100644
--- a/src/daemon/meta_data.h
+++ b/src/daemon/meta_data.h
@@ -69,4 +69,3 @@ int meta_data_get_boolean(meta_data_t *md, const char *key, _Bool *value);
 int meta_data_as_string(meta_data_t *md, const char *key, char **value);
 
 #endif /* META_DATA_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/meta_data_test.c b/src/daemon/meta_data_test.c
index 803c7454..bcd457d4 100644
--- a/src/daemon/meta_data_test.c
+++ b/src/daemon/meta_data_test.c
@@ -114,5 +114,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index c89f1ed1..c8fc15a1 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -2578,5 +2578,3 @@ int plugin_thread_create(pthread_t *thread, const pthread_attr_t *attr,
 
   return 0;
 } /* int plugin_thread_create */
-
-/* vim: set sw=8 ts=8 noet fdm=marker : */
diff --git a/src/daemon/plugin_mock.c b/src/daemon/plugin_mock.c
index 558921d5..9e7ba39e 100644
--- a/src/daemon/plugin_mock.c
+++ b/src/daemon/plugin_mock.c
@@ -89,5 +89,3 @@ void plugin_log(int level, char const *format, ...) {
 }
 
 cdtime_t plugin_get_interval(void) { return TIME_T_TO_CDTIME_T(10); }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index b1a7203c..b0531571 100644
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -191,7 +191,3 @@ int read_types_list(const char *file) {
 
   return (0);
 } /* int read_types_list */
-
-/*
- * vim: shiftwidth=2:softtabstop=2:tabstop=8
- */
diff --git a/src/daemon/utils_avltree_test.c b/src/daemon/utils_avltree_test.c
index 0a84f6f9..345f97bf 100644
--- a/src/daemon/utils_avltree_test.c
+++ b/src/daemon/utils_avltree_test.c
@@ -135,5 +135,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c
index fe0e083e..0caf22c5 100644
--- a/src/daemon/utils_cache.c
+++ b/src/daemon/utils_cache.c
@@ -938,5 +938,3 @@ int uc_meta_data_exists(const value_list_t *vl,
                                                 const char *key, _Bool *value)
                                                 UC_WRAP(meta_data_get_boolean)
 #undef UC_WRAP
-
-    /* vim: set sw=2 ts=8 sts=2 tw=78 : */
diff --git a/src/daemon/utils_cache.h b/src/daemon/utils_cache.h
index 2f408734..24c58ff7 100644
--- a/src/daemon/utils_cache.h
+++ b/src/daemon/utils_cache.h
@@ -133,5 +133,4 @@ int uc_meta_data_get_double(const value_list_t *vl, const char *key,
 int uc_meta_data_get_boolean(const value_list_t *vl, const char *key,
                              _Bool *value);
 
-/* vim: set shiftwidth=2 softtabstop=2 tabstop=8 : */
 #endif /* !UTILS_CACHE_H */
diff --git a/src/daemon/utils_complain.c b/src/daemon/utils_complain.c
index fb452431..d2162ba7 100644
--- a/src/daemon/utils_complain.c
+++ b/src/daemon/utils_complain.c
@@ -97,5 +97,3 @@ void c_do_release(int level, c_complain_t *c, const char *format, ...) {
 
   plugin_log(level, "%s", message);
 } /* c_release */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/daemon/utils_complain.h b/src/daemon/utils_complain.h
index fbeea90f..46d3a198 100644
--- a/src/daemon/utils_complain.h
+++ b/src/daemon/utils_complain.h
@@ -113,5 +113,3 @@ c_do_release(int level, c_complain_t *c, const char *format, ...);
   } while (0)
 
 #endif /* UTILS_COMPLAIN_H */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/daemon/utils_heap.c b/src/daemon/utils_heap.c
index 8dd501da..3bae48ee 100644
--- a/src/daemon/utils_heap.c
+++ b/src/daemon/utils_heap.c
@@ -203,5 +203,3 @@ void *c_heap_get_root(c_heap_t *h) {
 
   return (ret);
 } /* void *c_heap_get_root */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/daemon/utils_heap.h b/src/daemon/utils_heap.h
index 2f77cc45..d2d70cdc 100644
--- a/src/daemon/utils_heap.h
+++ b/src/daemon/utils_heap.h
@@ -97,4 +97,3 @@ int c_heap_insert(c_heap_t *h, void *ptr);
 void *c_heap_get_root(c_heap_t *h);
 
 #endif /* UTILS_HEAP_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/utils_heap_test.c b/src/daemon/utils_heap_test.c
index 8443b605..dec84f94 100644
--- a/src/daemon/utils_heap_test.c
+++ b/src/daemon/utils_heap_test.c
@@ -76,5 +76,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/utils_subst.c b/src/daemon/utils_subst.c
index 7056c5f0..52353432 100644
--- a/src/daemon/utils_subst.c
+++ b/src/daemon/utils_subst.c
@@ -159,5 +159,3 @@ char *subst_string(char *buf, size_t buflen, const char *string,
 
   return (buf);
 } /* char *subst_string */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/daemon/utils_subst.h b/src/daemon/utils_subst.h
index 025f8d4e..a10b2589 100644
--- a/src/daemon/utils_subst.h
+++ b/src/daemon/utils_subst.h
@@ -100,5 +100,3 @@ char *subst_string(char *buf, size_t buflen, const char *string,
                    const char *needle, const char *replacement);
 
 #endif /* UTILS_SUBST_H */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c
index e335b501..00ea0eae 100644
--- a/src/daemon/utils_subst_test.c
+++ b/src/daemon/utils_subst_test.c
@@ -132,5 +132,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/utils_threshold.h b/src/daemon/utils_threshold.h
index 585ad12a..cefc6e2c 100644
--- a/src/daemon/utils_threshold.h
+++ b/src/daemon/utils_threshold.h
@@ -61,5 +61,3 @@ threshold_t *threshold_search(const value_list_t *vl);
 int ut_search_threshold(const value_list_t *vl, threshold_t *ret_threshold);
 
 #endif /* UTILS_THRESHOLD_H */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/daemon/utils_time.c b/src/daemon/utils_time.c
index 9ba2b5a1..815d9697 100644
--- a/src/daemon/utils_time.c
+++ b/src/daemon/utils_time.c
@@ -240,5 +240,3 @@ int rfc3339nano_local(char *buffer, size_t buffer_size, cdtime_t t) /* {{{ */
 
   return format_rfc3339_local(buffer, buffer_size, t, 1);
 } /* }}} int rfc3339nano */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/daemon/utils_time.h b/src/daemon/utils_time.h
index db510afe..60a6ea95 100644
--- a/src/daemon/utils_time.h
+++ b/src/daemon/utils_time.h
@@ -130,4 +130,3 @@ int rfc3339_local(char *buffer, size_t buffer_size, cdtime_t t);
 int rfc3339nano_local(char *buffer, size_t buffer_size, cdtime_t t);
 
 #endif /* UTILS_TIME_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/daemon/utils_time_test.c b/src/daemon/utils_time_test.c
index c1c60a20..c0179cc0 100644
--- a/src/daemon/utils_time_test.c
+++ b/src/daemon/utils_time_test.c
@@ -167,5 +167,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/dbi.c b/src/dbi.c
index 7cab1d54..2b374e9f 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -780,7 +780,3 @@ void module_register(void) /* {{{ */
   plugin_register_init("dbi", cdbi_init);
   plugin_register_shutdown("dbi", cdbi_shutdown);
 } /* }}} void module_register */
-
-/*
- * vim: shiftwidth=2 softtabstop=2 et fdm=marker
- */
diff --git a/src/email.c b/src/email.c
index b406d483..08d57290 100644
--- a/src/email.c
+++ b/src/email.c
@@ -719,5 +719,3 @@ void module_register(void) {
   plugin_register_read("email", email_read);
   plugin_register_shutdown("email", email_shutdown);
 } /* void module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/ethstat.c b/src/ethstat.c
index bd55252f..4b053008 100644
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -325,5 +325,3 @@ void module_register(void) {
   plugin_register_read("ethstat", ethstat_read);
   plugin_register_shutdown("ethstat", ethstat_shutdown);
 }
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/exec.c b/src/exec.c
index d34f9d91..df057189 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -866,7 +866,3 @@ void module_register(void) {
                                /* user_data = */ NULL);
   plugin_register_shutdown("exec", exec_shutdown);
 } /* void module_register */
-
-/*
- * vim:shiftwidth=2:softtabstop=2:tabstop=8:fdm=marker
- */
diff --git a/src/filecount.c b/src/filecount.c
index a78b8800..608218df 100644
--- a/src/filecount.c
+++ b/src/filecount.c
@@ -511,7 +511,3 @@ void module_register(void) {
   plugin_register_init("filecount", fc_init);
   plugin_register_read("filecount", fc_read);
 } /* void module_register */
-
-/*
- * vim: set sw=2 sts=2 et :
- */
diff --git a/src/fscache.c b/src/fscache.c
index c410ea39..618bb22f 100644
--- a/src/fscache.c
+++ b/src/fscache.c
@@ -217,5 +217,3 @@ static int fscache_read(void) {
 void module_register(void) {
   plugin_register_read("fscache", fscache_read);
 } /* void module_register */
-
-/* vim: set sw=4 sts=4 et : */
diff --git a/src/gmond.c b/src/gmond.c
index fc9a2326..7bfb18d8 100644
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -1030,5 +1030,3 @@ void module_register(void) {
   plugin_register_init("gmond", gmond_init);
   plugin_register_shutdown("gmond", gmond_shutdown);
 }
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/grpc.cc b/src/grpc.cc
index 0ae80bb8..19917ec6 100644
--- a/src/grpc.cc
+++ b/src/grpc.cc
@@ -676,5 +676,3 @@ extern "C" {
 		plugin_register_shutdown("grpc", c_grpc_shutdown);
 	} /* module_register() */
 } /* extern "C" */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/ipc.c b/src/ipc.c
index c9fb003e..8222efba 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -319,5 +319,3 @@ void module_register(void) /* {{{ */
   plugin_register_read("ipc", ipc_read);
 }
 /* }}} */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/ipmi.c b/src/ipmi.c
index 1bbaf412..f3636fc8 100644
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -621,5 +621,3 @@ void module_register(void) {
   plugin_register_read("ipmi", c_ipmi_read);
   plugin_register_shutdown("ipmi", c_ipmi_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 fdm=marker et : */
diff --git a/src/ipvs.c b/src/ipvs.c
index 2446bd13..a8c4a1d2 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -321,5 +321,3 @@ void module_register(void) {
   plugin_register_shutdown("ipvs", cipvs_shutdown);
   return;
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/java.c b/src/java.c
index 63b5e317..2e4d88a6 100644
--- a/src/java.c
+++ b/src/java.c
@@ -2841,5 +2841,3 @@ void module_register(void) {
   plugin_register_init("java", cjni_init);
   plugin_register_shutdown("java", cjni_shutdown);
 } /* void module_register (void) */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c
index f61e9678..a8f5d0d5 100644
--- a/src/libcollectdclient/client.c
+++ b/src/libcollectdclient/client.c
@@ -1021,5 +1021,3 @@ int lcc_sort_identifiers(lcc_connection_t *c, /* {{{ */
   qsort(idents, idents_num, sizeof(*idents), lcc_identifier_compare);
   return (0);
 } /* }}} int lcc_sort_identifiers */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/libcollectdclient/collectd/client.h b/src/libcollectdclient/collectd/client.h
index ae741eb7..8604ff6b 100644
--- a/src/libcollectdclient/collectd/client.h
+++ b/src/libcollectdclient/collectd/client.h
@@ -139,5 +139,4 @@ int lcc_sort_identifiers(lcc_connection_t *c, lcc_identifier_t *idents,
 
 LCC_END_DECLS
 
-/* vim: set sw=2 sts=2 et : */
 #endif /* LIBCOLLECTD_COLLECTDCLIENT_H */
diff --git a/src/libcollectdclient/collectd/lcc_features.h.in b/src/libcollectdclient/collectd/lcc_features.h.in
index 0e6fcd43..304845e2 100644
--- a/src/libcollectdclient/collectd/lcc_features.h.in
+++ b/src/libcollectdclient/collectd/lcc_features.h.in
@@ -62,6 +62,3 @@ const char *lcc_version_extra (void);
 LCC_END_DECLS
 
 #endif /* ! LIBCOLLECTD_LCC_FEATURES_H */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-
diff --git a/src/libcollectdclient/collectd/network.h b/src/libcollectdclient/collectd/network.h
index fdb9b33f..35fd7d62 100644
--- a/src/libcollectdclient/collectd/network.h
+++ b/src/libcollectdclient/collectd/network.h
@@ -73,5 +73,4 @@ int lcc_network_notification_send (lcc_network_t *net,
     const lcc_notification_t *notif);
 #endif
 
-/* vim: set sw=2 sts=2 et : */
 #endif /* LIBCOLLECTDCLIENT_NETWORK_H */
diff --git a/src/libcollectdclient/collectd/network_buffer.h b/src/libcollectdclient/collectd/network_buffer.h
index 5612458b..9f393103 100644
--- a/src/libcollectdclient/collectd/network_buffer.h
+++ b/src/libcollectdclient/collectd/network_buffer.h
@@ -55,4 +55,3 @@ int lcc_network_buffer_get(lcc_network_buffer_t *nb, void *buffer,
                            size_t *buffer_size);
 
 #endif /* LIBCOLLECTDCLIENT_NETWORK_BUFFER_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/libcollectdclient/network.c b/src/libcollectdclient/network.c
index a21799c2..d096f186 100644
--- a/src/libcollectdclient/network.c
+++ b/src/libcollectdclient/network.c
@@ -446,5 +446,3 @@ int lcc_network_values_send(lcc_network_t *net, /* {{{ */
 
   return (0);
 } /* }}} int lcc_network_values_send */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/libcollectdclient/network_buffer.c b/src/libcollectdclient/network_buffer.c
index af8f43b8..866c4cc7 100644
--- a/src/libcollectdclient/network_buffer.c
+++ b/src/libcollectdclient/network_buffer.c
@@ -779,5 +779,3 @@ int lcc_network_buffer_get(lcc_network_buffer_t *nb, /* {{{ */
 
   return (0);
 } /* }}} int lcc_network_buffer_get */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/liboconfig/oconfig.c b/src/liboconfig/oconfig.c
index 76134dbe..079adcf8 100644
--- a/src/liboconfig/oconfig.c
+++ b/src/liboconfig/oconfig.c
@@ -196,7 +196,3 @@ void oconfig_free(oconfig_item_t *ci) {
   oconfig_free_all(ci);
   free(ci);
 }
-
-/*
- * vim:shiftwidth=2:tabstop=8:softtabstop=2:fdm=marker
- */
diff --git a/src/liboconfig/oconfig.h b/src/liboconfig/oconfig.h
index d27f6f53..3b81062e 100644
--- a/src/liboconfig/oconfig.h
+++ b/src/liboconfig/oconfig.h
@@ -67,7 +67,4 @@ oconfig_item_t *oconfig_clone(const oconfig_item_t *ci);
 
 void oconfig_free(oconfig_item_t *ci);
 
-/*
- * vim: shiftwidth=2:tabstop=8:softtabstop=2
- */
 #endif /* OCONFIG_H */
diff --git a/src/log_logstash.c b/src/log_logstash.c
index 303976b5..8df32a8e 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -343,5 +343,3 @@ void module_register(void) {
   plugin_register_notification("log_logstash", log_logstash_notification,
                                /* user_data = */ NULL);
 } /* void module_register (void) */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/logfile.c b/src/logfile.c
index db122915..0de639e9 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -208,5 +208,3 @@ void module_register(void) {
   plugin_register_notification("logfile", logfile_notification,
                                /* user_data = */ NULL);
 } /* void module_register (void) */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/lpar.c b/src/lpar.c
index df4424c8..c0192279 100644
--- a/src/lpar.c
+++ b/src/lpar.c
@@ -243,5 +243,3 @@ void module_register(void) {
   plugin_register_init("lpar", lpar_init);
   plugin_register_read("lpar", lpar_read);
 } /* void module_register */
-
-/* vim: set sw=8 noet : */
diff --git a/src/lua.c b/src/lua.c
index 2bd56a16..9eda7d5b 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -583,5 +583,3 @@ void module_register(void) {
   plugin_register_complex_config("lua", lua_config);
   plugin_register_shutdown("lua", lua_shutdown);
 }
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c
index 67c55789..0b2ab126 100644
--- a/src/match_empty_counter.c
+++ b/src/match_empty_counter.c
@@ -79,5 +79,3 @@ void module_register(void) {
           .create = mec_create, .destroy = mec_destroy, .match = mec_match,
       });
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/match_hashed.c b/src/match_hashed.c
index fad52718..9c8d34f9 100644
--- a/src/match_hashed.c
+++ b/src/match_hashed.c
@@ -166,5 +166,3 @@ void module_register(void) {
   mproc.match = mh_match;
   fc_register_match("hashed", mproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/match_regex.c b/src/match_regex.c
index 209f7736..ea7fcf01 100644
--- a/src/match_regex.c
+++ b/src/match_regex.c
@@ -364,5 +364,3 @@ void module_register(void) {
   mproc.match = mr_match;
   fc_register_match("regex", mproc);
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab fdm=marker : */
diff --git a/src/match_timediff.c b/src/match_timediff.c
index 6d00ed29..f0a456b9 100644
--- a/src/match_timediff.c
+++ b/src/match_timediff.c
@@ -141,5 +141,3 @@ void module_register(void) {
   mproc.match = mt_match;
   fc_register_match("timediff", mproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/match_value.c b/src/match_value.c
index 3c943757..45745bac 100644
--- a/src/match_value.c
+++ b/src/match_value.c
@@ -316,5 +316,3 @@ void module_register(void) {
   mproc.match = mv_match;
   fc_register_match("value", mproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/memcachec.c b/src/memcachec.c
index bebbe401..19228efe 100644
--- a/src/memcachec.c
+++ b/src/memcachec.c
@@ -479,5 +479,3 @@ void module_register(void) {
   plugin_register_read("memcachec", cmc_read);
   plugin_register_shutdown("memcachec", cmc_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/mic.c b/src/mic.c
index ab5ffd1b..bc99e679 100644
--- a/src/mic.c
+++ b/src/mic.c
@@ -366,7 +366,3 @@ void module_register(void) {
   plugin_register_read("mic", mic_read);
   plugin_register_config("mic", mic_config, config_keys, config_keys_num);
 } /* void module_register */
-
-/*
- * vim: set shiftwidth=8 softtabstop=8 noet textwidth=78 :
- */
diff --git a/src/modbus.c b/src/modbus.c
index 5d29791d..80a2aca1 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -982,5 +982,3 @@ void module_register(void) {
   plugin_register_complex_config("modbus", mb_config);
   plugin_register_shutdown("modbus", mb_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/mqtt.c b/src/mqtt.c
index b578b99b..33785c8f 100644
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -751,5 +751,3 @@ void module_register(void) {
   plugin_register_complex_config("mqtt", mqtt_config);
   plugin_register_init("mqtt", mqtt_init);
 } /* void module_register */
-
-/* vim: set sw=4 sts=4 et fdm=marker : */
diff --git a/src/netapp.c b/src/netapp.c
index 4d458793..5b0827c9 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -3111,5 +3111,3 @@ void module_register(void) {
   plugin_register_init("netapp", cna_init);
   plugin_register_shutdown("netapp", cna_shutdown);
 }
-
-/* vim: set sw=2 ts=2 noet fdm=marker : */
diff --git a/src/netlink.c b/src/netlink.c
index 8076c1fa..0649852c 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -736,7 +736,3 @@ void module_register(void) {
   plugin_register_read("netlink", ir_read);
   plugin_register_shutdown("netlink", ir_shutdown);
 } /* void module_register */
-
-/*
- * vim: set shiftwidth=2 softtabstop=2 tabstop=8 :
- */
diff --git a/src/network.c b/src/network.c
index 8caeb638..e1214cf9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -3223,5 +3223,3 @@ void module_register(void) {
   plugin_register_flush("network", network_flush,
                         /* user_data = */ NULL);
 } /* void module_register */
-
-/* vim: set fdm=marker : */
diff --git a/src/nginx.c b/src/nginx.c
index ffc545c4..72c03637 100644
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -267,7 +267,3 @@ void module_register(void) {
   plugin_register_init("nginx", init);
   plugin_register_read("nginx", nginx_read);
 } /* void module_register */
-
-/*
- * vim: set shiftwidth=2 softtabstop=2 tabstop=8 :
- */
diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index 48404411..d167fbfe 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -166,5 +166,3 @@ void module_register(void) {
   plugin_register_init("notify_desktop", c_notify_init);
   return;
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/notify_email.c b/src/notify_email.c
index f42e66c6..aaa165ab 100644
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -290,5 +290,3 @@ void module_register(void) {
   plugin_register_notification("notify_email", notify_email_notification,
                                /* user_data = */ NULL);
 } /* void module_register (void) */
-
-/* vim: set sw=2 sts=2 ts=8 et : */
diff --git a/src/notify_nagios.c b/src/notify_nagios.c
index 13516915..c95f7cb9 100644
--- a/src/notify_nagios.c
+++ b/src/notify_nagios.c
@@ -153,5 +153,3 @@ void module_register(void) {
   plugin_register_complex_config("notify_nagios", nagios_config);
   plugin_register_notification("notify_nagios", nagios_notify, NULL);
 } /* void module_register (void) */
-
-/* vim: set sw=2 sts=2 ts=8 et : */
diff --git a/src/numa.c b/src/numa.c
index 049daeee..01d74e1e 100644
--- a/src/numa.c
+++ b/src/numa.c
@@ -152,5 +152,3 @@ void module_register(void) {
   plugin_register_init("numa", numa_init);
   plugin_register_read("numa", numa_read);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/nut.c b/src/nut.c
index d40e0951..c0ee7abf 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -255,5 +255,3 @@ void module_register(void) {
   plugin_register_read("nut", nut_read);
   plugin_register_shutdown("nut", nut_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 ts=8 sts=2 tw=78 : */
diff --git a/src/olsrd.c b/src/olsrd.c
index d1caf461..816a70b2 100644
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -631,5 +631,3 @@ void module_register(void) {
   plugin_register_read("olsrd", olsrd_read);
   plugin_register_shutdown("olsrd", olsrd_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/onewire.c b/src/onewire.c
index 10fa5ca1..407e8574 100644
--- a/src/onewire.c
+++ b/src/onewire.c
@@ -534,5 +534,3 @@ void module_register(void) {
   plugin_register_config("onewire", cow_load_config, config_keys,
                          config_keys_num);
 }
-
-/* vim: set sw=2 sts=2 ts=8 et fdm=marker cindent : */
diff --git a/src/openvpn.c b/src/openvpn.c
index 90694b78..1045d500 100644
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -715,5 +715,3 @@ void module_register(void) {
                          config_keys_num);
   plugin_register_init("openvpn", openvpn_init);
 } /* void module_register */
-
-/* vim: set sw=2 ts=2 : */
diff --git a/src/oracle.c b/src/oracle.c
index 4eacc543..b52ea4ee 100644
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -706,7 +706,3 @@ void module_register(void) /* {{{ */
   plugin_register_read("oracle", o_read);
   plugin_register_shutdown("oracle", o_shutdown);
 } /* }}} void module_register */
-
-/*
- * vim: shiftwidth=2 softtabstop=2 et fdm=marker
- */
diff --git a/src/perl.c b/src/perl.c
index 59109133..71e17977 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -2711,5 +2711,3 @@ void module_register(void) {
   plugin_register_complex_config("perl", perl_config);
   return;
 } /* void module_register (void) */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/pinba.c b/src/pinba.c
index 7fd23a02..97eeb0d6 100644
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -685,5 +685,3 @@ void module_register(void) /* {{{ */
   plugin_register_read("pinba", plugin_read);
   plugin_register_shutdown("pinba", plugin_shutdown);
 } /* }}} void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/ping.c b/src/ping.c
index 82de59f0..6d9545f3 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -679,5 +679,3 @@ void module_register(void) {
   plugin_register_read("ping", ping_read);
   plugin_register_shutdown("ping", ping_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/postgresql.c b/src/postgresql.c
index 2af89886..3a388a5a 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -1265,5 +1265,3 @@ void module_register(void) {
   plugin_register_complex_config("postgresql", c_psql_config);
   plugin_register_shutdown("postgresql", c_psql_shutdown);
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/powerdns.c b/src/powerdns.c
index f2149ef2..85621087 100644
--- a/src/powerdns.c
+++ b/src/powerdns.c
@@ -960,5 +960,3 @@ void module_register(void) {
   plugin_register_read("powerdns", powerdns_read);
   plugin_register_shutdown("powerdns", powerdns_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 fdm=marker : */
diff --git a/src/protocols.c b/src/protocols.c
index 64735e60..12fbf45f 100644
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -213,5 +213,3 @@ void module_register(void) {
                          config_keys_num);
   plugin_register_read("protocols", protocols_read);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/redis.c b/src/redis.c
index 7875c7ea..ea888ca6 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -451,5 +451,3 @@ void module_register(void) /* {{{ */
    * X elements */
 }
 /* }}} */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/routeros.c b/src/routeros.c
index 07493c75..5c978dcc 100644
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -409,5 +409,3 @@ static int cr_config(oconfig_item_t *ci) {
 void module_register(void) {
   plugin_register_complex_config("routeros", cr_config);
 } /* void module_register */
-
-/* vim: set sw=2 noet fdm=marker : */
diff --git a/src/rrdcached.c b/src/rrdcached.c
index 6eb67d4f..5cf17c1e 100644
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -529,7 +529,3 @@ void module_register(void) {
   plugin_register_init("rrdcached", rc_init);
   plugin_register_shutdown("rrdcached", rc_shutdown);
 } /* void module_register */
-
-/*
- * vim: set sw=2 sts=2 et :
- */
diff --git a/src/snmp.c b/src/snmp.c
index 3bfec47d..ff75edbe 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1695,7 +1695,3 @@ void module_register(void) {
   plugin_register_init("snmp", csnmp_init);
   plugin_register_shutdown("snmp", csnmp_shutdown);
 } /* void module_register */
-
-/*
- * vim: shiftwidth=2 softtabstop=2 tabstop=8 fdm=marker
- */
diff --git a/src/statsd.c b/src/statsd.c
index 47e01d80..aa4e35c5 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -914,5 +914,3 @@ void module_register(void) {
   plugin_register_read("statsd", statsd_read);
   plugin_register_shutdown("statsd", statsd_shutdown);
 }
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/swap.c b/src/swap.c
index cbe1ab11..19eed46a 100644
--- a/src/swap.c
+++ b/src/swap.c
@@ -738,5 +738,3 @@ void module_register(void) {
   plugin_register_init("swap", swap_init);
   plugin_register_read("swap", swap_read);
 } /* void module_register */
-
-/* vim: set fdm=marker : */
diff --git a/src/table.c b/src/table.c
index 3e8feada..578e019e 100644
--- a/src/table.c
+++ b/src/table.c
@@ -520,5 +520,3 @@ void module_register(void) {
   plugin_register_complex_config("table", tbl_config);
   plugin_register_init("table", tbl_init);
 } /* module_register */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/tail.c b/src/tail.c
index bb4eb30b..466dbffe 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -337,5 +337,3 @@ void module_register(void) {
   plugin_register_init("tail", ctail_init);
   plugin_register_shutdown("tail", ctail_shutdown);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/tail_csv.c b/src/tail_csv.c
index b1a3292d..425c101e 100644
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@ -551,5 +551,3 @@ void module_register(void) {
   plugin_register_init("tail_csv", tcsv_init);
   plugin_register_shutdown("tail_csv", tcsv_shutdown);
 }
-
-/* vim: set sw=4 sts=4 et : */
diff --git a/src/target_notification.c b/src/target_notification.c
index dc93b98b..7c82c794 100644
--- a/src/target_notification.c
+++ b/src/target_notification.c
@@ -260,5 +260,3 @@ void module_register(void) {
   tproc.invoke = tn_invoke;
   fc_register_target("notification", tproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/target_replace.c b/src/target_replace.c
index b43a025b..2bdb3b80 100644
--- a/src/target_replace.c
+++ b/src/target_replace.c
@@ -561,5 +561,3 @@ void module_register(void) {
   tproc.invoke = tr_invoke;
   fc_register_target("replace", tproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/target_scale.c b/src/target_scale.c
index 347d6272..4cce8dd1 100644
--- a/src/target_scale.c
+++ b/src/target_scale.c
@@ -457,5 +457,3 @@ void module_register(void) {
   tproc.invoke = ts_invoke;
   fc_register_target("scale", tproc);
 } /* module_register */
-
-/* vim: set sw=2 ts=2 tw=78 fdm=marker : */
diff --git a/src/target_set.c b/src/target_set.c
index 5bf40fa3..8b2b5560 100644
--- a/src/target_set.c
+++ b/src/target_set.c
@@ -415,5 +415,3 @@ void module_register(void) {
   tproc.invoke = ts_invoke;
   fc_register_target("set", tproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/target_v5upgrade.c b/src/target_v5upgrade.c
index 54e37e16..27bca399 100644
--- a/src/target_v5upgrade.c
+++ b/src/target_v5upgrade.c
@@ -451,5 +451,3 @@ void module_register(void) {
   tproc.invoke = v5_invoke;
   fc_register_target("v5upgrade", tproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/tcpconns.c b/src/tcpconns.c
index f949d34e..966f58d8 100644
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -958,7 +958,3 @@ void module_register(void) {
 #endif
   plugin_register_read("tcpconns", conn_read);
 } /* void module_register */
-
-/*
- * vim: set shiftwidth=2 softtabstop=2 tabstop=8 fdm=marker :
- */
diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 960d6464..a959cddc 100644
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -728,5 +728,3 @@ void module_register(void) {
   plugin_register_read("teamspeak2", tss2_read);
   plugin_register_shutdown("teamspeak2", tss2_shutdown);
 } /* void module_register */
-
-/* vim: set sw=4 ts=4 : */
diff --git a/src/ted.c b/src/ted.c
index 1f49b20c..fbfd95db 100644
--- a/src/ted.c
+++ b/src/ted.c
@@ -299,5 +299,3 @@ void module_register(void) {
   plugin_register_read("ted", ted_read);
   plugin_register_shutdown("ted", ted_shutdown);
 } /* void module_register */
-
-/* vim: set sw=4 et : */
diff --git a/src/threshold.c b/src/threshold.c
index 743db28d..a4a999f5 100644
--- a/src/threshold.c
+++ b/src/threshold.c
@@ -834,5 +834,3 @@ static int ut_config(oconfig_item_t *ci) { /* {{{ */
 void module_register(void) {
   plugin_register_complex_config("threshold", ut_config);
 }
-
-/* vim: set sw=2 ts=8 sts=2 tw=78 et fdm=marker : */
diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index cb366d38..09ee25d7 100644
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -150,5 +150,3 @@ void module_register(void) {
   plugin_register_read("tokyotyrant", tt_read);
   plugin_register_shutdown("tokyotyrant", tt_shutdown);
 }
-
-/* vim: set sw=8 ts=8 tw=78 : */
diff --git a/src/unixsock.c b/src/unixsock.c
index f61360ef..b08c89f1 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -429,5 +429,3 @@ void module_register(void) {
   plugin_register_init("unixsock", us_init);
   plugin_register_shutdown("unixsock", us_shutdown);
 } /* void module_register (void) */
-
-/* vim: set sw=4 ts=4 sts=4 tw=78 : */
diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 48243e6d..88951281 100644
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -178,5 +178,3 @@ void cmd_destroy_flush(cmd_flush_t *flush) {
   sfree(flush->identifiers);
   flush->identifiers_num = 0;
 } /* void cmd_destroy_flush */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/utils_cmd_flush.h b/src/utils_cmd_flush.h
index 57b90853..5dc88f95 100644
--- a/src/utils_cmd_flush.h
+++ b/src/utils_cmd_flush.h
@@ -40,5 +40,3 @@ cmd_status_t cmd_handle_flush(FILE *fh, char *buffer);
 void cmd_destroy_flush(cmd_flush_t *flush);
 
 #endif /* UTILS_CMD_FLUSH_H */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/utils_cmd_getthreshold.c b/src/utils_cmd_getthreshold.c
index 60363da5..491d7765 100644
--- a/src/utils_cmd_getthreshold.c
+++ b/src/utils_cmd_getthreshold.c
@@ -198,5 +198,3 @@ int handle_getthreshold(FILE *fh, char *buffer) {
 
                                             return (0);
 } /* int handle_getthreshold */
-
-/* vim: set sw=2 sts=2 ts=8 et : */
diff --git a/src/utils_cmd_getthreshold.h b/src/utils_cmd_getthreshold.h
index dd4e5cf8..78700ee2 100644
--- a/src/utils_cmd_getthreshold.h
+++ b/src/utils_cmd_getthreshold.h
@@ -32,5 +32,3 @@
 int handle_getthreshold(FILE *fh, char *buffer);
 
 #endif /* UTILS_CMD_GETTHRESHOLD_H */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index c23650b3..e5f17b63 100644
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -164,5 +164,3 @@ void cmd_destroy_getval(cmd_getval_t *getval) {
 
   sfree(getval->raw_identifier);
 } /* void cmd_destroy_getval */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_cmd_getval.h b/src/utils_cmd_getval.h
index 8d488b31..5c03fa4c 100644
--- a/src/utils_cmd_getval.h
+++ b/src/utils_cmd_getval.h
@@ -41,5 +41,3 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer);
 void cmd_destroy_getval(cmd_getval_t *getval);
 
 #endif /* UTILS_CMD_GETVAL_H */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c
index f8638893..4e603a2f 100644
--- a/src/utils_cmd_listval.c
+++ b/src/utils_cmd_listval.c
@@ -108,5 +108,3 @@ cmd_status_t cmd_handle_listval(FILE *fh, char *buffer) {
 void cmd_destroy_listval(cmd_listval_t *listval __attribute__((unused))) {
   /* nothing to do */
 } /* void cmd_destroy_listval */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_cmd_listval.h b/src/utils_cmd_listval.h
index 8a4e8c8b..6abdeee3 100644
--- a/src/utils_cmd_listval.h
+++ b/src/utils_cmd_listval.h
@@ -41,5 +41,3 @@ cmd_status_t cmd_handle_listval(FILE *fh, char *buffer);
 void cmd_destroy_listval(cmd_listval_t *listval);
 
 #endif /* UTILS_CMD_LISTVAL_H */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
index 0edfbb86..8f687fd8 100644
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils_cmd_putnotif.c
@@ -180,5 +180,3 @@ int handle_putnotif(FILE *fh, char *buffer) {
 
   return (0);
 } /* int handle_putnotif */
-
-/* vim: set shiftwidth=2 softtabstop=2 tabstop=8 : */
diff --git a/src/utils_cmd_putnotif.h b/src/utils_cmd_putnotif.h
index af0b93e0..7ad0f1a5 100644
--- a/src/utils_cmd_putnotif.h
+++ b/src/utils_cmd_putnotif.h
@@ -31,6 +31,4 @@
 
 int handle_putnotif(FILE *fh, char *buffer);
 
-/* vim: set shiftwidth=2 softtabstop=2 tabstop=8 : */
-
 #endif /* UTILS_CMD_PUTNOTIF_H */
diff --git a/src/utils_cmds.c b/src/utils_cmds.c
index 3ea7c9d0..31a9a6fb 100644
--- a/src/utils_cmds.c
+++ b/src/utils_cmds.c
@@ -309,5 +309,3 @@ void cmd_error_fh(void *ud, cmd_status_t status, const char *format,
 
   fflush(fh);
 } /* void cmd_error_fh */
-
-/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index 9a582272..c8030296 100644
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -1059,5 +1059,3 @@ void udb_query_delete_preparation_area(
 
   free(q_area);
 } /* }}} void udb_query_delete_preparation_area */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_db_query.h b/src/utils_db_query.h
index 8f069185..4d6129a1 100644
--- a/src/utils_db_query.h
+++ b/src/utils_db_query.h
@@ -83,4 +83,3 @@ udb_query_allocate_preparation_area(udb_query_t *q);
 void udb_query_delete_preparation_area(udb_query_preparation_area_t *q_area);
 
 #endif /* UTILS_DB_QUERY_H */
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/utils_dns.c b/src/utils_dns.c
index a4a5784b..2bda965f 100644
--- a/src/utils_dns.c
+++ b/src/utils_dns.c
@@ -1169,6 +1169,3 @@ main(int argc, char *argv[])
     return 0;
 } /* static int main(int argc, char *argv[]) */
 #endif
-/*
- * vim:shiftwidth=4:tabstop=8:softtabstop=4
- */
diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c
index ecc56740..f94e2e5b 100644
--- a/src/utils_fbhash.c
+++ b/src/utils_fbhash.c
@@ -255,5 +255,3 @@ char *fbh_get(fbhash_t *h, const char *key) /* {{{ */
 
   return (value_copy);
 } /* }}} char *fbh_get */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_fbhash.h b/src/utils_fbhash.h
index 79e9c00f..fcd6e925 100644
--- a/src/utils_fbhash.h
+++ b/src/utils_fbhash.h
@@ -48,5 +48,3 @@ void fbh_destroy(fbhash_t *h);
 char *fbh_get(fbhash_t *h, const char *key);
 
 #endif /* UTILS_FBHASH_H */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c
index 4f509f4a..0436340d 100644
--- a/src/utils_format_graphite.c
+++ b/src/utils_format_graphite.c
@@ -237,5 +237,3 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds,
   sfree(rates);
   return (status);
 } /* int format_graphite */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_format_json.c b/src/utils_format_json.c
index 0a95a86d..1a0e151d 100644
--- a/src/utils_format_json.c
+++ b/src/utils_format_json.c
@@ -685,5 +685,3 @@ int format_json_notification(char *buffer, size_t buffer_size, /* {{{ */
   return ENOTSUP;
 } /* }}} int format_json_notification */
 #endif
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_format_kairosdb.c b/src/utils_format_kairosdb.c
index 4c25d188..1e54b97c 100644
--- a/src/utils_format_kairosdb.c
+++ b/src/utils_format_kairosdb.c
@@ -336,5 +336,3 @@ int format_kairosdb_value_list(char *buffer, /* {{{ */
       buffer, ret_buffer_fill, ret_buffer_free, ds, vl, store_rates,
       (*ret_buffer_free) - 2));
 } /* }}} int format_kairosdb_value_list */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_latency.c b/src/utils_latency.c
index f0311e84..f30b265b 100644
--- a/src/utils_latency.c
+++ b/src/utils_latency.c
@@ -342,5 +342,3 @@ double latency_counter_get_rate(const latency_counter_t *lc, /* {{{ */
 
   return sum / (CDTIME_T_TO_DOUBLE(now - lc->start_time));
 } /* }}} double latency_counter_get_rate */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_latency.h b/src/utils_latency.h
index 85493e1a..9d878dab 100644
--- a/src/utils_latency.h
+++ b/src/utils_latency.h
@@ -61,5 +61,3 @@ cdtime_t latency_counter_get_percentile(latency_counter_t *lc, double percent);
  */
 double latency_counter_get_rate(const latency_counter_t *lc, cdtime_t lower,
                                 cdtime_t upper, const cdtime_t now);
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/utils_latency_test.c b/src/utils_latency_test.c
index ef29d8bd..427a1592 100644
--- a/src/utils_latency_test.c
+++ b/src/utils_latency_test.c
@@ -232,5 +232,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/utils_lua.c b/src/utils_lua.c
index dcb84afa..77101216 100644
--- a/src/utils_lua.c
+++ b/src/utils_lua.c
@@ -317,5 +317,3 @@ int luaC_pushvaluelist(lua_State *L, const data_set_t *ds,
 
   return (0);
 } /* }}} int luaC_pushvaluelist */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_lua.h b/src/utils_lua.h
index 8ff507c7..61d9070e 100644
--- a/src/utils_lua.h
+++ b/src/utils_lua.h
@@ -53,4 +53,3 @@ int luaC_pushvaluelist(lua_State *L, const data_set_t *ds,
                        const value_list_t *vl);
 
 #endif /* UTILS_LUA_H */
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_match.c b/src/utils_match.c
index 2e487b59..e2f29808 100644
--- a/src/utils_match.c
+++ b/src/utils_match.c
@@ -368,5 +368,3 @@ void *match_get_user_data(cu_match_t *obj) {
     return (NULL);
   return (obj->user_data);
 } /* void *match_get_user_data */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_match.h b/src/utils_match.h
index 1383530c..1cff1eb7 100644
--- a/src/utils_match.h
+++ b/src/utils_match.h
@@ -177,5 +177,3 @@ int match_apply(cu_match_t *obj, const char *str);
 void *match_get_user_data(cu_match_t *obj);
 
 #endif /* UTILS_MATCH_H */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_mount_test.c b/src/utils_mount_test.c
index 695038dd..76fc8d4a 100644
--- a/src/utils_mount_test.c
+++ b/src/utils_mount_test.c
@@ -109,5 +109,3 @@ int main(void) {
 
   END_TEST;
 }
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c
index ba37f03e..a2a73809 100644
--- a/src/utils_parse_option.c
+++ b/src/utils_parse_option.c
@@ -146,5 +146,3 @@ int parse_option(char **ret_buffer, char **ret_key, char **ret_value) {
 
   return (0);
 } /* int parse_option */
-
-/* vim: set sw=2 ts=8 tw=78 et : */
diff --git a/src/utils_parse_option.h b/src/utils_parse_option.h
index a638e694..3dd0a792 100644
--- a/src/utils_parse_option.h
+++ b/src/utils_parse_option.h
@@ -31,5 +31,3 @@ int parse_string(char **ret_buffer, char **ret_string);
 int parse_option(char **ret_buffer, char **ret_key, char **ret_value);
 
 #endif /* UTILS_PARSE_OPTION */
-
-/* vim: set sw=2 ts=8 tw=78 et : */
diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c
index 750d2656..ae72575c 100644
--- a/src/utils_rrdcreate.c
+++ b/src/utils_rrdcreate.c
@@ -664,5 +664,3 @@ int cu_rrd_create_file(const char *filename, /* {{{ */
 
   return (status);
 } /* }}} int cu_rrd_create_file */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/utils_rrdcreate.h b/src/utils_rrdcreate.h
index 9bc67aed..d5f9a12a 100644
--- a/src/utils_rrdcreate.h
+++ b/src/utils_rrdcreate.h
@@ -51,5 +51,3 @@ int cu_rrd_create_file(const char *filename, const data_set_t *ds,
                        const value_list_t *vl, const rrdcreate_config_t *cfg);
 
 #endif /* UTILS_RRDCREATE_H */
-
-/* vim: set sw=2 sts=2 et : */
diff --git a/src/utils_tail_match.c b/src/utils_tail_match.c
index 505c6937..1a99384b 100644
--- a/src/utils_tail_match.c
+++ b/src/utils_tail_match.c
@@ -336,5 +336,3 @@ int tail_match_read(cu_tail_match_t *obj) {
 
   return (0);
 } /* int tail_match_read */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/utils_tail_match.h b/src/utils_tail_match.h
index 09e3d402..03b70e93 100644
--- a/src/utils_tail_match.h
+++ b/src/utils_tail_match.h
@@ -137,5 +137,3 @@ int tail_match_add_match_simple(cu_tail_match_t *obj, const char *regex,
  *   Zero on success, nonzero on failure.
 */
 int tail_match_read(cu_tail_match_t *obj);
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/uuid.c b/src/uuid.c
index 89c9e7dd..ad8d4d2e 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -262,17 +262,3 @@ void module_register(void) {
                          STATIC_ARRAY_SIZE(config_keys));
   plugin_register_init("uuid", uuid_init);
 }
-
-/*
- * vim: set tabstop=4:
- * vim: set shiftwidth=4:
- * vim: set expandtab:
- */
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/src/varnish.c b/src/varnish.c
index 41b60d85..3538e7e2 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -1331,5 +1331,3 @@ void module_register(void) /* {{{ */
   plugin_register_complex_config("varnish", varnish_config);
   plugin_register_init("varnish", varnish_init);
 } /* }}} */
-
-/* vim: set sw=8 noet fdm=marker : */
diff --git a/src/virt.c b/src/virt.c
index 6afd2390..86f83ae8 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -1172,7 +1172,3 @@ void module_register(void) {
   plugin_register_init(PLUGIN_NAME, lv_init);
   plugin_register_shutdown(PLUGIN_NAME, lv_shutdown);
 }
-
-/*
- * vim: shiftwidth=4 tabstop=8 softtabstop=4 expandtab fdm=marker
- */
diff --git a/src/vmem.c b/src/vmem.c
index cd9e7d28..0d7769b7 100644
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -260,5 +260,3 @@ void module_register(void) {
   plugin_register_config("vmem", vmem_config, config_keys, config_keys_num);
   plugin_register_read("vmem", vmem_read);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 ts=8 : */
diff --git a/src/vserver.c b/src/vserver.c
index c5a7fb33..96af6fc8 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -321,5 +321,3 @@ void module_register(void) {
   plugin_register_init("vserver", vserver_init);
   plugin_register_read("vserver", vserver_read);
 } /* void module_register(void) */
-
-/* vim: set ts=4 sw=4 noexpandtab : */
diff --git a/src/write_graphite.c b/src/write_graphite.c
index b85ab470..3fac9cca 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -583,5 +583,3 @@ static int wg_config(oconfig_item_t *ci) {
 void module_register(void) {
   plugin_register_complex_config("write_graphite", wg_config);
 }
-
-/* vim: set sw=4 ts=4 sts=4 tw=78 et : */
diff --git a/src/write_http.c b/src/write_http.c
index c1b3f0b0..c33ab542 100644
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -812,5 +812,3 @@ void module_register(void) /* {{{ */
   plugin_register_complex_config("write_http", wh_config);
   plugin_register_init("write_http", wh_init);
 } /* }}} void module_register */
-
-/* vim: set fdm=marker sw=8 ts=8 tw=78 et : */
diff --git a/src/write_log.c b/src/write_log.c
index 2d34b21b..5ecb1823 100644
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -136,5 +136,3 @@ void module_register(void) {
   /* If config is supplied, the global wl_format will be set. */
   plugin_register_write("write_log", wl_write, NULL);
 }
-
-/* vim: set sw=4 ts=4 sts=4 tw=78 et : */
diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 68e11773..10f78322 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -344,5 +344,3 @@ static int wm_config(oconfig_item_t *ci) /* {{{ */
 void module_register(void) {
   plugin_register_complex_config("write_mongodb", wm_config);
 }
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/write_prometheus.c b/src/write_prometheus.c
index 991415ef..6dee98ab 100644
--- a/src/write_prometheus.c
+++ b/src/write_prometheus.c
@@ -868,5 +868,3 @@ void module_register() {
                           /* user data = */ NULL);
   plugin_register_shutdown("write_prometheus", prom_shutdown);
 }
-
-/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git a/src/write_redis.c b/src/write_redis.c
index 0a5c5df1..9cff34a7 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -252,5 +252,3 @@ static int wr_config(oconfig_item_t *ci) /* {{{ */
 void module_register(void) {
   plugin_register_complex_config("write_redis", wr_config);
 }
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */
diff --git a/src/write_riemann.c b/src/write_riemann.c
index 3835a3d5..a51b4b58 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -895,5 +895,3 @@ static int wrr_config(oconfig_item_t *ci) /* {{{ */
 void module_register(void) {
   plugin_register_complex_config("write_riemann", wrr_config);
 }
-
-/* vim: set sw=8 sts=8 ts=8 noet : */
diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c
index 452c2910..992d8562 100644
--- a/src/write_riemann_threshold.c
+++ b/src/write_riemann_threshold.c
@@ -225,5 +225,3 @@ int write_riemann_threshold_check(const data_set_t *ds, const value_list_t *vl,
 
   return (0);
 } /* }}} int ut_check_threshold */
-
-/* vim: set sw=2 ts=8 sts=2 tw=78 et fdm=marker : */
diff --git a/src/write_sensu.c b/src/write_sensu.c
index 72ed6bc0..c0c06347 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -1248,5 +1248,3 @@ static int sensu_config(oconfig_item_t *ci) /* {{{ */
 void module_register(void) {
   plugin_register_complex_config("write_sensu", sensu_config);
 }
-
-/* vim: set sw=8 sts=8 ts=8 noet : */
diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 0c87c473..429c1597 100644
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -582,5 +582,3 @@ static int wt_config(oconfig_item_t *ci) {
 void module_register(void) {
   plugin_register_complex_config("write_tsdb", wt_config);
 }
-
-/* vim: set sw=4 ts=4 sts=4 tw=78 et : */
diff --git a/src/xmms.c b/src/xmms.c
index 87e3564f..b06434d4 100644
--- a/src/xmms.c
+++ b/src/xmms.c
@@ -66,7 +66,3 @@ static int cxmms_read(void) {
 void module_register(void) {
   plugin_register_read("xmms", cxmms_read);
 } /* void module_register */
-
-/*
- * vim: shiftwidth=2:softtabstop=2:textwidth=78
- */