diff --git a/src/lib-managesieve/managesieve-arg.h b/src/lib-managesieve/managesieve-arg.h
index 9518b2761cb18f0037c7ef3424d969a0775905fb..5bec2e1cdc8e562c85f925ebc5b5f1b79b502209 100644
--- a/src/lib-managesieve/managesieve-arg.h
+++ b/src/lib-managesieve/managesieve-arg.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_ARG_H
-#define __MANAGESIEVE_ARG_H
+#ifndef MANAGESIEVE_ARG_H
+#define MANAGESIEVE_ARG_H
 
 #include "array.h"
 
diff --git a/src/lib-managesieve/managesieve-parser.h b/src/lib-managesieve/managesieve-parser.h
index 07410a38874735f68085e7ff47dc94c9a7d24347..386d6ca4fb411d5686c586ef4e80044221450c5d 100644
--- a/src/lib-managesieve/managesieve-parser.h
+++ b/src/lib-managesieve/managesieve-parser.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_PARSER_H
-#define __MANAGESIEVE_PARSER_H
+#ifndef MANAGESIEVE_PARSER_H
+#define MANAGESIEVE_PARSER_H
 
 #include "managesieve-arg.h"
 
diff --git a/src/lib-managesieve/managesieve-quote.h b/src/lib-managesieve/managesieve-quote.h
index 88197eb1b0591db3842e69be23fe6733bfdf2ce5..cae5491a4fe92764fd533491c62d483fba1e45e4 100644
--- a/src/lib-managesieve/managesieve-quote.h
+++ b/src/lib-managesieve/managesieve-quote.h
@@ -1,5 +1,5 @@
-#ifndef __IMAP_QUOTE_H
-#define __IMAP_QUOTE_H
+#ifndef IMAP_QUOTE_H
+#define IMAP_QUOTE_H
 
 /* Return value suitable for sending to client, either as quoted-string or
    literal. Note that this also converts TABs into spaces, multiple spaces
diff --git a/src/lib-sieve-tool/mail-raw.h b/src/lib-sieve-tool/mail-raw.h
index 146f9f30bd3049ea4e6294092bd33432bb057247..71e3fe0e2ab7d26183f46b82e2aedffdb6e81d5d 100644
--- a/src/lib-sieve-tool/mail-raw.h
+++ b/src/lib-sieve-tool/mail-raw.h
@@ -1,5 +1,5 @@
-#ifndef __MAIL_RAW_H
-#define __MAIL_RAW_H
+#ifndef MAIL_RAW_H
+#define MAIL_RAW_H
 
 #include "lib.h"
 #include "master-service.h"
@@ -22,4 +22,4 @@ struct mail_raw *mail_raw_open_data
 void mail_raw_close(struct mail_raw **mailr);
 
 
-#endif /* __MAIL_RAW_H */
+#endif
diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h
index 0dcfffaeee4f8de2555ba70cf1f7a3ebb9b76db1..1464e7473c31939bbf75082e70e450faa76b2d05 100644
--- a/src/lib-sieve-tool/sieve-tool.h
+++ b/src/lib-sieve-tool/sieve-tool.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_TOOL_H
-#define __SIEVE_TOOL_H
+#ifndef SIEVE_TOOL_H
+#define SIEVE_TOOL_H
 
 #include "sieve-common.h"
 
@@ -97,4 +97,4 @@ void sieve_tool_dump_binary_to
 void sieve_tool_parse_trace_option
 	(struct sieve_trace_config *tr_config, const char *tr_option);
 
-#endif /* __SIEVE_TOOL_H */
+#endif
diff --git a/src/lib-sieve/plugins/body/ext-body-common.h b/src/lib-sieve/plugins/body/ext-body-common.h
index 0387eee30b29cda441f4187a85d6e466b89c3021..290ca136d1c4a7b1dd4965c168675145c7eea874 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.h
+++ b/src/lib-sieve/plugins/body/ext-body-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_BODY_COMMON_H
-#define __EXT_BODY_COMMON_H
+#ifndef EXT_BODY_COMMON_H
+#define EXT_BODY_COMMON_H
 
 /*
  * Types
@@ -37,4 +37,4 @@ int ext_body_get_part_list
 	(const struct sieve_runtime_env *renv, enum tst_body_transform transform,
 		const char * const *content_types, struct sieve_stringlist **strlist_r);
 
-#endif /* __EXT_BODY_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/copy/sieve-ext-copy.h b/src/lib-sieve/plugins/copy/sieve-ext-copy.h
index 7b239572d98577391cb8b4a184f9d90e7b3d8dbc..faf19dcb56a70e7393a0173e426f6620410b73ae 100644
--- a/src/lib-sieve/plugins/copy/sieve-ext-copy.h
+++ b/src/lib-sieve/plugins/copy/sieve-ext-copy.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_COPY_H
-#define __SIEVE_EXT_COPY_H
+#ifndef SIEVE_EXT_COPY_H
+#define SIEVE_EXT_COPY_H
 
 /* sieve_ext_copy_get_extension():
  *   Get the extension struct for the copy extension.
@@ -18,4 +18,4 @@ void sieve_ext_copy_register_tag
 	(struct sieve_validator *valdtr, const struct sieve_extension *copy_ext,
 		const char *command);
 
-#endif /* __SIEVE_EXT_COPY_H */
+#endif
diff --git a/src/lib-sieve/plugins/date/ext-date-common.h b/src/lib-sieve/plugins/date/ext-date-common.h
index e53f8a1dde7b581f732974eb00188ca8a5a57ffd..116af3e05e2c17d0f9fe65ef45680107147caaf2 100644
--- a/src/lib-sieve/plugins/date/ext-date-common.h
+++ b/src/lib-sieve/plugins/date/ext-date-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_DATE_COMMON_H
-#define __EXT_DATE_COMMON_H
+#ifndef EXT_DATE_COMMON_H
+#define EXT_DATE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -77,4 +77,4 @@ struct sieve_stringlist *ext_date_stringlist_create
 
 
 
-#endif /* __EXT_DATE_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.h b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.h
index 36cb641db4e95620d90a34a73584857c82f769e4..57a77a00d3a63386d8daee31a223ad9c13eb840b 100644
--- a/src/lib-sieve/plugins/duplicate/ext-duplicate-common.h
+++ b/src/lib-sieve/plugins/duplicate/ext-duplicate-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_DUPLICATE_COMMON_H
-#define __EXT_DUPLICATE_COMMON_H
+#ifndef EXT_DUPLICATE_COMMON_H
+#define EXT_DUPLICATE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -40,4 +40,4 @@ int ext_duplicate_check
 	(const struct sieve_runtime_env *renv, string_t *handle,
 		const char *value, size_t value_len, sieve_number_t period, bool last);
 
-#endif /* EXT_DUPLICATE_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/editheader/ext-editheader-common.h b/src/lib-sieve/plugins/editheader/ext-editheader-common.h
index e9cb282ab05f50116bec4ec4e5c46242d5bc91ae..af7eb45ab06d310abc361b69ce1404628c030168 100644
--- a/src/lib-sieve/plugins/editheader/ext-editheader-common.h
+++ b/src/lib-sieve/plugins/editheader/ext-editheader-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_EDITHEADER_COMMON_H
-#define __EXT_EDITHEADER_COMMON_H
+#ifndef EXT_EDITHEADER_COMMON_H
+#define EXT_EDITHEADER_COMMON_H
 
 /*
  * Commands
@@ -46,4 +46,4 @@ bool ext_editheader_header_allow_delete
 bool ext_editheader_header_too_large
 	(const struct sieve_extension *ext, size_t size);
 
-#endif /* __EXT_EDITHEADER_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/editheader/ext-editheader-limits.h b/src/lib-sieve/plugins/editheader/ext-editheader-limits.h
index 0193268ca6affb3ff3750cb1d1090567a4976569..a8e834bb73f9430fb494212efa5c8760d115e6ce 100644
--- a/src/lib-sieve/plugins/editheader/ext-editheader-limits.h
+++ b/src/lib-sieve/plugins/editheader/ext-editheader-limits.h
@@ -1,7 +1,7 @@
-#ifndef __EXT_EDITHEADER_LIMITS_H
-#define __EXT_EDITHEADER_LIMITS_H
+#ifndef EXT_EDITHEADER_LIMITS_H
+#define EXT_EDITHEADER_LIMITS_H
 
 #define EXT_EDITHEADER_MINIMUM_MAX_HEADER_SIZE  1024
 #define EXT_EDITHEADER_DEFAULT_MAX_HEADER_SIZE  2048
 
-#endif /* __EXT_EDITHEADER_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-common.h b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
index 8588fb5b77b7dab1c3f88c5d265aa52757079d1a..cfd21b909feb17fec6dad2840bf422bc5323a450 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_ENOTIFY_COMMON_H
-#define __EXT_ENOTIFY_COMMON_H
+#ifndef EXT_ENOTIFY_COMMON_H
+#define EXT_ENOTIFY_COMMON_H
 
 #include "lib.h"
 #include "array.h"
@@ -120,4 +120,4 @@ struct sieve_enotify_print_env {
 	const struct sieve_result_print_env *result_penv;
 };
 
-#endif /* __EXT_ENOTIFY_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
index 5ee0a8459507d2bf5edd9a2177867ecd108eb9e5..aac48df6cb9e38375ea99c48f1fb6bf766a84dbf 100644
--- a/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-limits.h
@@ -1,6 +1,6 @@
-#ifndef __EXT_ENOTIFY_LIMITS_H
-#define __EXT_ENOTIFY_LIMITS_H
+#ifndef EXT_ENOTIFY_LIMITS_H
+#define EXT_ENOTIFY_LIMITS_H
 
 #define EXT_ENOTIFY_MAX_SCHEME_LEN  32
 
-#endif /* __EXT_ENOTIFY_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
index 46a575dbbf5c847ed90f5c3b5d31d35223110c4e..4120c6eed256ae520580feee7abd155efa20d6fd 100644
--- a/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
+++ b/src/lib-sieve/plugins/enotify/mailto/uri-mailto.h
@@ -1,5 +1,5 @@
-#ifndef __URI_MAILTO_H
-#define __URI_MAILTO_H
+#ifndef URI_MAILTO_H
+#define URI_MAILTO_H
 
 /*
  * Types
@@ -36,6 +36,6 @@ struct uri_mailto *uri_mailto_parse
 	const char **unique_headers, int max_recipients, int max_headers,
 	struct sieve_error_handler *ehandler);
 
-#endif /* __URI_MAILTO_H */
+#endif
 
 
diff --git a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
index 9ed7ed27518ae53a79e6aa48ce1665cea70b6186..24e4bddab45aee4c7fa0dbf46625cd58909befcc 100644
--- a/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
+++ b/src/lib-sieve/plugins/enotify/sieve-ext-enotify.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_ENOTIFY_H
-#define __SIEVE_EXT_ENOTIFY_H
+#ifndef SIEVE_EXT_ENOTIFY_H
+#define SIEVE_EXT_ENOTIFY_H
 
 #include "lib.h"
 #include "compat.h"
@@ -173,5 +173,5 @@ struct sieve_enotify_action {
 #define sieve_enotify_global_log_error(ENV, ...) \
 	sieve_global_info_error((ENV)->svinst, (ENV)->ehandler, NULL, __VA_ARGS__ )
 
-#endif /* __SIEVE_EXT_ENOTIFY_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/environment/ext-environment-common.h b/src/lib-sieve/plugins/environment/ext-environment-common.h
index 10d003c9be86bd134d7de26ee73dc4d1dd5c2e2b..a1f7d576af3626b1393517f1a1d6138e63f849cb 100644
--- a/src/lib-sieve/plugins/environment/ext-environment-common.h
+++ b/src/lib-sieve/plugins/environment/ext-environment-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_ENVIRONMENT_COMMON_H
-#define __EXT_ENVIRONMENT_COMMON_H
+#ifndef EXT_ENVIRONMENT_COMMON_H
+#define EXT_ENVIRONMENT_COMMON_H
 
 #include "lib.h"
 
@@ -50,4 +50,4 @@ void ext_environment_deinit(const struct sieve_extension *ext);
 void ext_environment_interpreter_init
 (const struct sieve_extension *this_ext, struct sieve_interpreter *interp);
 
-#endif /* __EXT_VARIABLES_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/environment/sieve-ext-environment.h b/src/lib-sieve/plugins/environment/sieve-ext-environment.h
index 5c5f9534562c774a8c103950449f705af0ec5fd2..8ae0d18e2bb17fe5ec21b013d16de2b91c4f779a 100644
--- a/src/lib-sieve/plugins/environment/sieve-ext-environment.h
+++ b/src/lib-sieve/plugins/environment/sieve-ext-environment.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_ENVIRONMENT_H
-#define __SIEVE_EXT_ENVIRONMENT_H
+#ifndef SIEVE_EXT_ENVIRONMENT_H
+#define SIEVE_EXT_ENVIRONMENT_H
 
 #include "sieve-common.h"
 
diff --git a/src/lib-sieve/plugins/ihave/ext-ihave-binary.h b/src/lib-sieve/plugins/ihave/ext-ihave-binary.h
index e95e058fd2790537e55e0fe45d78bbadef3c9b69..418f07877fc68e6fea4ef86183357d1935bac1a4 100644
--- a/src/lib-sieve/plugins/ihave/ext-ihave-binary.h
+++ b/src/lib-sieve/plugins/ihave/ext-ihave-binary.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_IHAVE_BINARY_H
-#define __EXT_IHAVE_BINARY_H
+#ifndef EXT_IHAVE_BINARY_H
+#define EXT_IHAVE_BINARY_H
 
 /*
  * Binary context management
@@ -29,5 +29,5 @@ bool ext_ihave_binary_load
 bool ext_ihave_binary_dump
 	(const struct sieve_extension *ext, struct sieve_dumptime_env *denv);
 
-#endif /* __EXT_IHAVE_BINARY_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/ihave/ext-ihave-common.h b/src/lib-sieve/plugins/ihave/ext-ihave-common.h
index 44832bdb39a900b69017162d39c979aa9f3c6d1e..371d03d590a999228a014574795de0f688ecd0a3 100644
--- a/src/lib-sieve/plugins/ihave/ext-ihave-common.h
+++ b/src/lib-sieve/plugins/ihave/ext-ihave-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_IHAVE_COMMON_H
-#define __EXT_IHAVE_COMMON_H
+#ifndef EXT_IHAVE_COMMON_H
+#define EXT_IHAVE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -49,4 +49,4 @@ void ext_ihave_ast_add_missing_extension
 		const char *ext_name);
 
 
-#endif /* __EXT_IHAVE_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
index a8046cc0eb76f3037f4efc9a59a748ca2132cfd8..4bedb85031c09c78b189b3bf495c696340823464 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_IMAP4FLAGS_COMMON_H
-#define __EXT_IMAP4FLAGS_COMMON_H
+#ifndef EXT_IMAP4FLAGS_COMMON_H
+#define EXT_IMAP4FLAGS_COMMON_H
 
 #include "lib.h"
 
@@ -93,5 +93,5 @@ void ext_imap4flags_get_implicit_flags_init
 		struct sieve_result *result);
 
 
-#endif /* __EXT_IMAP4FLAGS_COMMON_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h b/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h
index 17b97aa866a467ed24e26a95ae3c0409203060b3..b38a3c8d714a29ac1ccf350c842ac73107ed181b 100644
--- a/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h
+++ b/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_IMAP4FLAGS_H
-#define __SIEVE_EXT_IMAP4FLAGS_H
+#ifndef SIEVE_EXT_IMAP4FLAGS_H
+#define SIEVE_EXT_IMAP4FLAGS_H
 
 struct sieve_variable_storage;
 
diff --git a/src/lib-sieve/plugins/include/ext-include-binary.h b/src/lib-sieve/plugins/include/ext-include-binary.h
index b2d35523944788024f81a6ea2c36c5b6bc673834..066df2f591b2e2f3db6e5e9abd85121ca11be21f 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.h
+++ b/src/lib-sieve/plugins/include/ext-include-binary.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_BINARY_H
-#define __EXT_INCLUDE_BINARY_H
+#ifndef EXT_INCLUDE_BINARY_H
+#define EXT_INCLUDE_BINARY_H
 
 #include "sieve-common.h"
 
@@ -60,5 +60,5 @@ bool ext_include_code_dump
 	(const struct sieve_extension *ext, const struct sieve_dumptime_env *denv,
 		sieve_size_t *address ATTR_UNUSED);
 
-#endif /* __EXT_INCLUDE_BINARY_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/include/ext-include-common.h b/src/lib-sieve/plugins/include/ext-include-common.h
index 93729ef61bf0f1d7299e186b652bdd59ff2aa7fe..38fc92a40b7a6c8470876d60179df9f43fad320f 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.h
+++ b/src/lib-sieve/plugins/include/ext-include-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_COMMON_H
-#define __EXT_INCLUDE_COMMON_H
+#ifndef EXT_INCLUDE_COMMON_H
+#define EXT_INCLUDE_COMMON_H
 
 #include "lib.h"
 #include "hash.h"
@@ -166,4 +166,4 @@ void ext_include_execute_return(const struct sieve_runtime_env *renv);
 struct sieve_variable_storage *ext_include_interpreter_get_global_variables
 	(const struct sieve_extension *this_ext, struct sieve_interpreter *interp);
 
-#endif /* __EXT_INCLUDE_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/include/ext-include-limits.h b/src/lib-sieve/plugins/include/ext-include-limits.h
index 38385d2af8fde2ad48d6daf5c02446a399a0ad7d..37246c0aa18b15475b611aebf0a71e3826f14243 100644
--- a/src/lib-sieve/plugins/include/ext-include-limits.h
+++ b/src/lib-sieve/plugins/include/ext-include-limits.h
@@ -1,9 +1,9 @@
-#ifndef __EXT_INCLUDE_LIMITS_H
-#define __EXT_INCLUDE_LIMITS_H
+#ifndef EXT_INCLUDE_LIMITS_H
+#define EXT_INCLUDE_LIMITS_H
 
 #include "sieve-common.h"
 
 #define EXT_INCLUDE_DEFAULT_MAX_NESTING_DEPTH 10
 #define EXT_INCLUDE_DEFAULT_MAX_INCLUDES      255
 
-#endif /* __EXT_INCLUDE_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/plugins/include/ext-include-variables.h b/src/lib-sieve/plugins/include/ext-include-variables.h
index df7e96dfe2d15faa40e2cdebc273ee97be30c611..d5927b29748d905254b9e830d404e21d6fd3c6bc 100644
--- a/src/lib-sieve/plugins/include/ext-include-variables.h
+++ b/src/lib-sieve/plugins/include/ext-include-variables.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_INCLUDE_VARIABLES_H
-#define __EXT_INCLUDE_VARIABLES_H
+#ifndef EXT_INCLUDE_VARIABLES_H
+#define EXT_INCLUDE_VARIABLES_H
 
 #include "sieve-common.h"
 
@@ -37,5 +37,5 @@ bool ext_include_variables_dump
 void ext_include_variables_global_namespace_init
 	(const struct sieve_extension *this_ext, struct sieve_validator *valdtr);
 
-#endif /* __EXT_INCLUDE_VARIABLES_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/index/ext-index-common.h b/src/lib-sieve/plugins/index/ext-index-common.h
index 73d066ca282dc3ce05a004ebd75981110c7dc915..7ce324451f86cb2811fc9715dad50a00973084f4 100644
--- a/src/lib-sieve/plugins/index/ext-index-common.h
+++ b/src/lib-sieve/plugins/index/ext-index-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_INDEX_COMMON_H
-#define __EXT_INDEX_COMMON_H
+#ifndef EXT_INDEX_COMMON_H
+#define EXT_INDEX_COMMON_H
 
 #include "sieve-common.h"
 
@@ -26,4 +26,4 @@ extern const struct sieve_operand_def index_operand;
 
 extern const struct sieve_extension_def index_extension;
 
-#endif /* __EXT_INDEX_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h b/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
index d68be19c8149c2caf1b11d463749e407c18d673c..96cff3973ec2a114ad4d1bdbd809a0a06b9958bd 100644
--- a/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
+++ b/src/lib-sieve/plugins/mailbox/ext-mailbox-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_MAILBOX_COMMON_H
-#define __EXT_MAILBOX_COMMON_H
+#ifndef EXT_MAILBOX_COMMON_H
+#define EXT_MAILBOX_COMMON_H
 
 #include "sieve-common.h"
 
@@ -35,5 +35,5 @@ extern const struct sieve_operation_def mailboxexists_operation;
 
 extern const struct sieve_extension_def mailbox_extension;
 
-#endif /* __EXT_MAILBOX_COMMON_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/mailbox/sieve-ext-mailbox.h b/src/lib-sieve/plugins/mailbox/sieve-ext-mailbox.h
index 98112e6d72491a39be5e3d67c8d6bb16677c64f0..f7fa4cf267bcbc3b7167353bb518fb955e9a198b 100644
--- a/src/lib-sieve/plugins/mailbox/sieve-ext-mailbox.h
+++ b/src/lib-sieve/plugins/mailbox/sieve-ext-mailbox.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXT_MAILBOX_H
-#define __SIEVE_EXT_MAILBOX_H
+#ifndef SIEVE_EXT_MAILBOX_H
+#define SIEVE_EXT_MAILBOX_H
 
 /* sieve_ext_mailbox_get_extension():
  *   Get the extension struct for the mailbox extension.
@@ -18,4 +18,4 @@ void sieve_ext_mailbox_register_create_tag
 	(struct sieve_validator *valdtr, const struct sieve_extension *mailbox_ext,
 		const char *command);
 
-#endif /* __SIEVE_EXT_MAILBOX_H */
+#endif
diff --git a/src/lib-sieve/plugins/metadata/ext-metadata-common.h b/src/lib-sieve/plugins/metadata/ext-metadata-common.h
index 6ed8e0aad0896ba78059b1ad65964e1883e7be61..a4b25a081af0a6bcf5a13c87a9bfbc2cfe4475f8 100644
--- a/src/lib-sieve/plugins/metadata/ext-metadata-common.h
+++ b/src/lib-sieve/plugins/metadata/ext-metadata-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_METADATA_COMMON_H
-#define __EXT_METADATA_COMMON_H
+#ifndef EXT_METADATA_COMMON_H
+#define EXT_METADATA_COMMON_H
 
 #include "lib.h"
 #include "mail-storage.h"
@@ -37,4 +37,4 @@ extern const struct sieve_operation_def servermetadata_operation;
 extern const struct sieve_operation_def metadataexists_operation;
 extern const struct sieve_operation_def servermetadataexists_operation;
 
-#endif /* __EXT_METADATA_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/mime/ext-mime-common.h b/src/lib-sieve/plugins/mime/ext-mime-common.h
index a646f4ca7dea21a062b39dee5f7785722ca691d7..8b0054d565be8a0110a1c16dbc82a48f4fedd68d 100644
--- a/src/lib-sieve/plugins/mime/ext-mime-common.h
+++ b/src/lib-sieve/plugins/mime/ext-mime-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_FOREVERYPART_COMMON_H
-#define __EXT_FOREVERYPART_COMMON_H
+#ifndef EXT_FOREVERYPART_COMMON_H
+#define EXT_FOREVERYPART_COMMON_H
 
 #include "sieve-message.h"
 
@@ -82,4 +82,4 @@ struct ext_foreverypart_runtime_loop *
 ext_foreverypart_runtime_loop_get_current
 (const struct sieve_runtime_env *renv);
 
-#endif /* __EXT_FOREVERYPART_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.h b/src/lib-sieve/plugins/notify/ext-notify-common.h
index 1b457437f9f6e782bcac8b56b78414d493a07abe..38b0e210aa22fa136332cd72905a4b671bc65d28 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-common.h
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_NOTIFY_COMMON_H
-#define __EXT_NOTIFY_COMMON_H
+#ifndef EXT_NOTIFY_COMMON_H
+#define EXT_NOTIFY_COMMON_H
 
 /*
  * Extension
@@ -63,4 +63,4 @@ int ext_notify_construct_message
 	(const struct sieve_runtime_env *renv, const char *msg_format,
 		string_t *out_msg);
 
-#endif /* __EXT_NOTIFY_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/notify/ext-notify-limits.h b/src/lib-sieve/plugins/notify/ext-notify-limits.h
index 4738a7b520ac192ea3738dd6e4f4af08f3a63a5e..5fab7cb47da4e97e7cc83b89e448e41d0df0dcf9 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-limits.h
+++ b/src/lib-sieve/plugins/notify/ext-notify-limits.h
@@ -1,7 +1,7 @@
-#ifndef __EXT_NOTIFY_LIMITS_H
-#define __EXT_NOTIFY_LIMITS_H
+#ifndef EXT_NOTIFY_LIMITS_H
+#define EXT_NOTIFY_LIMITS_H
 
 #define EXT_NOTIFY_MAX_RECIPIENTS  8
 #define EXT_NOTIFY_MAX_MESSAGE     256
 
-#endif /* __EXT_NOTIFY_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/plugins/regex/ext-regex-common.h b/src/lib-sieve/plugins/regex/ext-regex-common.h
index f22b4700951c5e730297d5377b5f4d413ee39cc3..e9d809f515c9afaab3b2d502acdc5d9fbbdd3559 100644
--- a/src/lib-sieve/plugins/regex/ext-regex-common.h
+++ b/src/lib-sieve/plugins/regex/ext-regex-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_REGEX_COMMON_H
-#define __EXT_REGEX_COMMON_H
+#ifndef EXT_REGEX_COMMON_H
+#define EXT_REGEX_COMMON_H
 
 /*
  * Extension
@@ -19,6 +19,6 @@ extern const struct sieve_operand_def regex_match_type_operand;
 
 extern const struct sieve_match_type_def regex_match_type;
 
-#endif /* __EXT_REGEX_COMMON_H */
+#endif
 
 
diff --git a/src/lib-sieve/plugins/relational/ext-relational-common.h b/src/lib-sieve/plugins/relational/ext-relational-common.h
index bc09f81ec3e005bd5cb477b725fd2d8fc42d99bb..cd176cbaee87a207e3904561d63eee878b225dad 100644
--- a/src/lib-sieve/plugins/relational/ext-relational-common.h
+++ b/src/lib-sieve/plugins/relational/ext-relational-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_RELATIONAL_COMMON_H
-#define __EXT_RELATIONAL_COMMON_H
+#ifndef EXT_RELATIONAL_COMMON_H
+#define EXT_RELATIONAL_COMMON_H
 
 #include "lib.h"
 #include "str.h"
@@ -87,4 +87,4 @@ int mcht_value_match_key
 		const char *key, size_t key_size);
 
 
-#endif /* __EXT_RELATIONAL_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
index 57e7a41dc7e66904ad6bbc8c95bf1bbf964ce81a..331a6373f084fe87bf0a816596ecdd126428a71a 100644
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_SPAMVIRUSTEST_COMMON_H
-#define __EXT_SPAMVIRUSTEST_COMMON_H
+#ifndef EXT_SPAMVIRUSTEST_COMMON_H
+#define EXT_SPAMVIRUSTEST_COMMON_H
 
 #include "sieve-common.h"
 
@@ -32,4 +32,4 @@ int ext_spamvirustest_get_value
 extern const struct sieve_operation_def spamtest_operation;
 extern const struct sieve_operation_def virustest_operation;
 
-#endif /* __EXT_SPAMVIRUSTEST_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation-common.h b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
index 7b4f09e1ab1e183d4a5361f6b7dd0d5f19f0cfac..f93b6e2a24f9cfa31c662e1a6376562060a093cb 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation-common.h
+++ b/src/lib-sieve/plugins/vacation/ext-vacation-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VACATION_COMMON_H
-#define __EXT_VACATION_COMMON_H
+#ifndef EXT_VACATION_COMMON_H
+#define EXT_VACATION_COMMON_H
 
 #include "sieve-common.h"
 
@@ -53,4 +53,4 @@ extern const struct sieve_extension_def vacation_seconds_extension;
 bool ext_vacation_register_seconds_tag
 	(struct sieve_validator *valdtr, const struct sieve_extension *vacation_ext);
 
-#endif /* __EXT_VACATION_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-arguments.h b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
index cf5b45e288c9aea8e0ff165783fc3b233391f551..87413c8fb68bcf5819c316967c0e52c358b9c711 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_ARGUMENTS_H
-#define __EXT_VARIABLES_ARGUMENTS_H
+#ifndef EXT_VARIABLES_ARGUMENTS_H
+#define EXT_VARIABLES_ARGUMENTS_H
 
 #include "sieve-common.h"
 
@@ -21,4 +21,4 @@ extern const struct sieve_argument_def match_value_argument;
 
 extern const struct sieve_argument_def variable_string_argument;
 
-#endif /* __EXT_VARIABLES_ARGUMENTS_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.h b/src/lib-sieve/plugins/variables/ext-variables-common.h
index aca703c772c6bfab03fc0322d6dfde3c1686d0d8..95c7aebe5676bc8360f75070db7047cb1ec68dad 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_COMMON_H
-#define __EXT_VARIABLES_COMMON_H
+#ifndef EXT_VARIABLES_COMMON_H
+#define EXT_VARIABLES_COMMON_H
 
 #include "sieve-common.h"
 #include "sieve-validator.h"
@@ -98,4 +98,4 @@ bool ext_variables_interpreter_load
 	(const struct sieve_extension *ext, const struct sieve_runtime_env *renv,
 		sieve_size_t *address);
 
-#endif /* __EXT_VARIABLES_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-dump.h b/src/lib-sieve/plugins/variables/ext-variables-dump.h
index d82e84efbeb2b0ab9306f54b5280fcd1a3d35d56..da72a5d7d7ae1cf6bff2bc8d9bf2d669d5a2cbf6 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-dump.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-dump.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_DUMP_H
-#define __EXT_VARIABLES_DUMP_H
+#ifndef EXT_VARIABLES_DUMP_H
+#define EXT_VARIABLES_DUMP_H
 
 #include "sieve-common.h"
 
@@ -19,4 +19,4 @@ const char *ext_variables_dump_get_identifier
 (const struct sieve_extension *var_ext, const struct sieve_dumptime_env *denv,
 	const struct sieve_extension *ext, unsigned int index);
 
-#endif /* __EXT_VARIABLES_DUMP_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-limits.h b/src/lib-sieve/plugins/variables/ext-variables-limits.h
index 969ffaa650485318504f150196296557eb6062a0..61260c8223f78f55122707e17cabdedcb6ee6bcf 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-limits.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-limits.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_LIMITS_H
-#define __EXT_VARIABLES_LIMITS_H
+#ifndef EXT_VARIABLES_LIMITS_H
+#define EXT_VARIABLES_LIMITS_H
 
 #include "sieve-limits.h"
 
@@ -32,4 +32,4 @@
 
 #define EXT_VARIABLES_MAX_MATCH_INDEX            SIEVE_MAX_MATCH_VALUES
 
-#endif /* __EXT_VARIABLES_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
index 383b426cfbf1c45294fc6ae6c9a33f86d68e7145..d8fa3b60f6622aedc22b6093b98e8005c1eea30e 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-modifiers.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_MODIFIERS_H
-#define __EXT_VARIABLES_MODIFIERS_H
+#ifndef EXT_VARIABLES_MODIFIERS_H
+#define EXT_VARIABLES_MODIFIERS_H
 
 #include "sieve-common.h"
 #include "sieve-runtime-trace.h"
@@ -60,4 +60,4 @@ static inline bool ext_variables_opr_modifier_dump
 		(denv, &sieve_variables_modifier_operand_class, address, NULL);
 }
 
-#endif /* __EXT_VARIABLES_MODIFIERS_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-name.h b/src/lib-sieve/plugins/variables/ext-variables-name.h
index 729761274bc445910972975fb4802b2fa93b8361..289a978e7abe52bdf9039a3a21768ac719b3a0f8 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-name.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-name.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_NAME
-#define __EXT_VARIABLES_NAME
+#ifndef EXT_VARIABLES_NAME_H
+#define EXT_VARIABLES_NAME_H
 
 /* Variable Substitution
  * ---------------------
@@ -40,4 +40,4 @@
 int ext_variable_name_parse
 	(ARRAY_TYPE(sieve_variable_name) *vname, const char **str, const char *strend);
 
-#endif /* __EXT_VARIABLES_NAME */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-namespaces.h b/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
index 427f1598bb6de39a682a9dbd28947c5874cca84a..a687582b78470875dc9ae291267c7a464487175a 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-namespaces.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_NAMESPACES_H
-#define __EXT_VARIABLES_NAMESPACES_H
+#ifndef EXT_VARIABLES_NAMESPACES_H
+#define EXT_VARIABLES_NAMESPACES_H
 
 #include "sieve-common.h"
 
@@ -40,4 +40,4 @@ bool ext_variables_namespace_argument_activate
 
 extern const struct sieve_operand_def namespace_variable_operand;
 
-#endif /* __EXT_VARIABLES_NAMESPACES_H */
+#endif
diff --git a/src/lib-sieve/plugins/variables/ext-variables-operands.h b/src/lib-sieve/plugins/variables/ext-variables-operands.h
index e034bada8389af4cfcf457b47fae6783c1413a95..64a7781c60ad2cbbbce09b113b8d9f042b632929 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.h
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VARIABLES_OPERANDS_H
-#define __EXT_VARIABLES_OPERANDS_H
+#ifndef EXT_VARIABLES_OPERANDS_H
+#define EXT_VARIABLES_OPERANDS_H
 
 #include "lib.h"
 #include "hash.h"
@@ -33,5 +33,5 @@ void ext_variables_opr_variable_string_emit
 	(struct sieve_binary *sbin, unsigned int elements);
 
 
-#endif /* __EXT_VARIABLES_OPERANDS_H */
+#endif
 
diff --git a/src/lib-sieve/plugins/variables/sieve-ext-variables.h b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
index 561bdea932321676e7680e2330f29667779ee48c..f6ff5664ccf0df3d4ac99d6a7d8c0f4b1a3c675b 100644
--- a/src/lib-sieve/plugins/variables/sieve-ext-variables.h
+++ b/src/lib-sieve/plugins/variables/sieve-ext-variables.h
@@ -2,8 +2,8 @@
  * Public interface for other extensions to use
  */
 
-#ifndef __SIEVE_EXT_VARIABLES_H
-#define __SIEVE_EXT_VARIABLES_H
+#ifndef SIEVE_EXT_VARIABLES_H
+#define SIEVE_EXT_VARIABLES_H
 
 #include "lib.h"
 
@@ -355,4 +355,4 @@ void sieve_ext_variables_dump_set_scope
 (const struct sieve_extension *var_ext, const struct sieve_dumptime_env *denv,
 	const struct sieve_extension *ext, struct sieve_variable_scope *scope);
 
-#endif /* __SIEVE_EXT_VARIABLES_H */
+#endif
diff --git a/src/lib-sieve/plugins/vnd.dovecot/debug/ext-debug-common.h b/src/lib-sieve/plugins/vnd.dovecot/debug/ext-debug-common.h
index 24d1507500d99f2eacb6b88307e406e35bed5431..88ae3dbbde40ffb598578f2714db248425a278b1 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/debug/ext-debug-common.h
+++ b/src/lib-sieve/plugins/vnd.dovecot/debug/ext-debug-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_DEBUG_COMMON_H
-#define __EXT_DEBUG_COMMON_H
+#ifndef EXT_DEBUG_COMMON_H
+#define EXT_DEBUG_COMMON_H
 
 /*
  * Extensions
@@ -19,4 +19,4 @@ extern const struct sieve_command_def debug_log_command;
 
 extern const struct sieve_operation_def debug_log_operation;
 
-#endif /* __EXT_DEBUG_COMMON_H */
+#endif
diff --git a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-common.h b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-common.h
index 76fc85f94c90ffbd5e3e4e26e156b7c70fa6c925..980c8305d3c8d4761cb2a50f50190cd82ce35ef6 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-common.h
+++ b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_VND_ENVIRONMENT_COMMON_H
-#define __EXT_VND_ENVIRONMENT_COMMON_H
+#ifndef EXT_VND_ENVIRONMENT_COMMON_H
+#define EXT_VND_ENVIRONMENT_COMMON_H
 
 #include "sieve-ext-environment.h"
 
diff --git a/src/lib-sieve/plugins/vnd.dovecot/report/ext-vnd-report-common.h b/src/lib-sieve/plugins/vnd.dovecot/report/ext-vnd-report-common.h
index 7b006efe7367ed16f760639ec182ead94f120da2..11a375757f7e49609b8ff3ed4833f71317bc1699 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/report/ext-vnd-report-common.h
+++ b/src/lib-sieve/plugins/vnd.dovecot/report/ext-vnd-report-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_REPORT_COMMON_H
-#define __EXT_REPORT_COMMON_H
+#ifndef EXT_REPORT_COMMON_H
+#define EXT_REPORT_COMMON_H
 
 /*
  * Extension configuration
@@ -37,4 +37,4 @@ extern const struct sieve_operation_def report_operation;
 const char *
 ext_vnd_report_parse_feedback_type(const char *feedback_type);
 
-#endif /* __EXT_NOTIFY_COMMON_H */
+#endif
diff --git a/src/lib-sieve/sieve-actions.h b/src/lib-sieve/sieve-actions.h
index 711560bd30e4287595bf77eed26b624ced0988ed..62f964fd6188bd2663f4b90da97ec92aa2d220e2 100644
--- a/src/lib-sieve/sieve-actions.h
+++ b/src/lib-sieve/sieve-actions.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ACTIONS_H
-#define __SIEVE_ACTIONS_H
+#ifndef SIEVE_ACTIONS_H
+#define SIEVE_ACTIONS_H
 
 #include "lib.h"
 #include "mail-types.h"
@@ -290,4 +290,4 @@ int sieve_action_reject_mail
 // FIXME: move this to a more appropriate location
 bool sieve_mailbox_check_name(const char *mailbox, const char **error_r);
 
-#endif /* __SIEVE_ACTIONS_H */
+#endif
diff --git a/src/lib-sieve/sieve-address-parts.h b/src/lib-sieve/sieve-address-parts.h
index 86b333e701a5d497f6a4964362141c45ae4dd673..c774dc35593bf10c2e3693da34eb9f10b1c9724d 100644
--- a/src/lib-sieve/sieve-address-parts.h
+++ b/src/lib-sieve/sieve-address-parts.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ADDRESS_PARTS_H
-#define __SIEVE_ADDRESS_PARTS_H
+#ifndef SIEVE_ADDRESS_PARTS_H
+#define SIEVE_ADDRESS_PARTS_H
 
 #include "message-address.h"
 
@@ -132,4 +132,4 @@ int sieve_addrmatch_opr_optional_read
 		signed int *opt_code, int *exec_status, struct sieve_address_part *addrp,
 		struct sieve_match_type *mtch, struct sieve_comparator *cmp);
 
-#endif /* __SIEVE_ADDRESS_PARTS_H */
+#endif
diff --git a/src/lib-sieve/sieve-address-source.h b/src/lib-sieve/sieve-address-source.h
index 4088d1a24c6b73bfcd9a2ad3aeac38396998d5c5..fac4b496e0c1b44f9eb7dae251f9485d3c180f66 100644
--- a/src/lib-sieve/sieve-address-source.h
+++ b/src/lib-sieve/sieve-address-source.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ADDRESS_SOURCE_H
-#define __SIEVE_ADDRESS_SOURCE_H
+#ifndef SIEVE_ADDRESS_SOURCE_H
+#define SIEVE_ADDRESS_SOURCE_H
 
 #include "sieve-common.h"
 
diff --git a/src/lib-sieve/sieve-address.h b/src/lib-sieve/sieve-address.h
index 6c4b7dc25daca2e8613a3b221385e8f0d7951168..704551d0691b1eb152f19d9a4354836df14963d6 100644
--- a/src/lib-sieve/sieve-address.h
+++ b/src/lib-sieve/sieve-address.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ADDRESS_H
-#define __SIEVE_ADDRESS_H
+#ifndef SIEVE_ADDRESS_H
+#define SIEVE_ADDRESS_H
 
 #include "lib.h"
 #include "strfuncs.h"
diff --git a/src/lib-sieve/sieve-ast.h b/src/lib-sieve/sieve-ast.h
index 04ba259626ebb875a1dd9fed1356ca6d31d4d639..f1d01e3fedea692c8c923b52fbd004b3905248cd 100644
--- a/src/lib-sieve/sieve-ast.h
+++ b/src/lib-sieve/sieve-ast.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_AST_H
-#define __SIEVE_AST_H
+#ifndef SIEVE_AST_H
+#define SIEVE_AST_H
 
 #include "lib.h"
 #include "str.h"
@@ -368,4 +368,4 @@ struct sieve_ast_argument *sieve_ast_stringlist_join
 
 void sieve_ast_unparse(struct sieve_ast *ast);
 
-#endif /* __SIEVE_AST_H */
+#endif
diff --git a/src/lib-sieve/sieve-binary-dumper.h b/src/lib-sieve/sieve-binary-dumper.h
index 8d7c5405baeb7ebabb63203020653dad144d75d5..934f939dae73c19c07b8f928da32d845176b3845 100644
--- a/src/lib-sieve/sieve-binary-dumper.h
+++ b/src/lib-sieve/sieve-binary-dumper.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_BINARY_DUMPER_H
-#define __SIEVE_BINARY_DUMPER_H
+#ifndef SIEVE_BINARY_DUMPER_H
+#define SIEVE_BINARY_DUMPER_H
 
 #include "sieve-common.h"
 
@@ -42,4 +42,4 @@ bool sieve_binary_dumper_run
 void sieve_binary_dumper_hexdump
 (struct sieve_binary_dumper *dumper, struct ostream *stream);
 
-#endif /* __SIEVE_BINARY_DUMPER_H */
+#endif
diff --git a/src/lib-sieve/sieve-binary-private.h b/src/lib-sieve/sieve-binary-private.h
index 8095bf7a57cbd43274a2364e1b2616de729fe95a..950fac9b82cd5c33b8f2b08f4a5a6c07e16fb1f3 100644
--- a/src/lib-sieve/sieve-binary-private.h
+++ b/src/lib-sieve/sieve-binary-private.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_BINARY_PRIVATE_H
-#define __SIEVE_BINARY_PRIVATE_H
+#ifndef SIEVE_BINARY_PRIVATE_H
+#define SIEVE_BINARY_PRIVATE_H
 
 #include "sieve-common.h"
 #include "sieve-binary.h"
@@ -203,4 +203,4 @@ static inline int sieve_binary_extension_register
 
 bool sieve_binary_load_block(struct sieve_binary_block *);
 
-#endif /* __SIEVE_BINARY_PRIVATE_H */
+#endif
diff --git a/src/lib-sieve/sieve-binary.h b/src/lib-sieve/sieve-binary.h
index 04eee3081cf42c5177b2854ce7b10431f25f1c1f..9240dfd13abf982ed9550d85576065d82461d7d0 100644
--- a/src/lib-sieve/sieve-binary.h
+++ b/src/lib-sieve/sieve-binary.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_BINARY_H
-#define __SIEVE_BINARY_H
+#ifndef SIEVE_BINARY_H
+#define SIEVE_BINARY_H
 
 #include "lib.h"
 
diff --git a/src/lib-sieve/sieve-code-dumper.h b/src/lib-sieve/sieve-code-dumper.h
index 1c8d6b2e74952f66cfbc53f3ed16d56bdd2b49ef..651bd11c20cb727a7399cc574212225c6f022fb0 100644
--- a/src/lib-sieve/sieve-code-dumper.h
+++ b/src/lib-sieve/sieve-code-dumper.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_CODE_DUMPER_H
-#define __SIEVE_CODE_DUMPER_H
+#ifndef SIEVE_CODE_DUMPER_H
+#define SIEVE_CODE_DUMPER_H
 
 #include "sieve-common.h"
 
@@ -52,4 +52,4 @@ bool sieve_code_dumper_print_optional_operands
 
 void sieve_code_dumper_run(struct sieve_code_dumper *dumper);
 
-#endif /* __SIEVE_CODE_DUMPER_H */
+#endif
diff --git a/src/lib-sieve/sieve-code.h b/src/lib-sieve/sieve-code.h
index 12a288d7a218ba1e9cd2b51481e2105e4fbb6f3b..00bf68bdd28fe4b9e701aadf6053c281bc160d81 100644
--- a/src/lib-sieve/sieve-code.h
+++ b/src/lib-sieve/sieve-code.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_CODE_H
-#define __SIEVE_CODE_H
+#ifndef SIEVE_CODE_H
+#define SIEVE_CODE_H
 
 #include "lib.h"
 #include "buffer.h"
diff --git a/src/lib-sieve/sieve-commands.h b/src/lib-sieve/sieve-commands.h
index a16c10f17c79967e6c40f2a591f21abd0e2fd585..f9b83e388242f41f1e581477408679ecb63c3e09 100644
--- a/src/lib-sieve/sieve-commands.h
+++ b/src/lib-sieve/sieve-commands.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_COMMANDS_H
-#define __SIEVE_COMMANDS_H
+#ifndef SIEVE_COMMANDS_H
+#define SIEVE_COMMANDS_H
 
 #include "lib.h"
 
@@ -283,4 +283,4 @@ extern const unsigned int sieve_core_tests_count;
 bool sieve_command_verify_headers_argument
 (struct sieve_validator *valdtr, struct sieve_ast_argument *headers);
 
-#endif /* __SIEVE_COMMANDS_H */
+#endif
diff --git a/src/lib-sieve/sieve-common.h b/src/lib-sieve/sieve-common.h
index f3a89b338bca377eef827c4062b179c2328b9cce..f6c604e3f2dd76901c77b52b57aafe8fc9533731 100644
--- a/src/lib-sieve/sieve-common.h
+++ b/src/lib-sieve/sieve-common.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_COMMON_H
-#define __SIEVE_COMMON_H
+#ifndef SIEVE_COMMON_H
+#define SIEVE_COMMON_H
 
 #include "lib.h"
 
@@ -226,4 +226,4 @@ sieve_get_postmaster(const struct sieve_script_env *senv);
 const char *
 sieve_get_postmaster_address(const struct sieve_script_env *senv);
 
-#endif /* __SIEVE_COMMON_H */
+#endif
diff --git a/src/lib-sieve/sieve-comparators.h b/src/lib-sieve/sieve-comparators.h
index 254c88b4a74375cb6d21745cf9512884c0d2422c..fdfb9ee61fb6d272874a83db97e2c8edba63dfb6 100644
--- a/src/lib-sieve/sieve-comparators.h
+++ b/src/lib-sieve/sieve-comparators.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_COMPARATORS_H
-#define __SIEVE_COMPARATORS_H
+#ifndef SIEVE_COMPARATORS_H
+#define SIEVE_COMPARATORS_H
 
 #include "sieve-common.h"
 #include "sieve-extensions.h"
@@ -150,4 +150,4 @@ bool sieve_comparator_octet_skip
 	(const struct sieve_comparator *cmp ATTR_UNUSED,
 		const char **val, const char *val_end);
 
-#endif /* __SIEVE_COMPARATORS_H */
+#endif
diff --git a/src/lib-sieve/sieve-config.h b/src/lib-sieve/sieve-config.h
index 0a65e6303484ede0af77a2a900150009369c3ad4..3f1045c1bb681f59c1c98b25ce71876461d782f9 100644
--- a/src/lib-sieve/sieve-config.h
+++ b/src/lib-sieve/sieve-config.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_CONFIG_H
-#define __SIEVE_CONFIG_H
+#ifndef SIEVE_CONFIG_H
+#define SIEVE_CONFIG_H
 
 #include "pigeonhole-config.h"
 #include "pigeonhole-version.h"
diff --git a/src/lib-sieve/sieve-dump.h b/src/lib-sieve/sieve-dump.h
index 4477aaa04fbfca28d080d8f69ea32a6cb425e642..d7048777531efd5bcaf810ac0fd00378f44042bd 100644
--- a/src/lib-sieve/sieve-dump.h
+++ b/src/lib-sieve/sieve-dump.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_DUMP_H
-#define __SIEVE_DUMP_H
+#ifndef SIEVE_DUMP_H
+#define SIEVE_DUMP_H
 
 #include "sieve-common.h"
 #include "sieve-code-dumper.h"
@@ -27,4 +27,4 @@ struct sieve_dumptime_env {
 	struct ostream *stream;
 };
 
-#endif /* __SIEVE_DUMP_H */
+#endif
diff --git a/src/lib-sieve/sieve-error-private.h b/src/lib-sieve/sieve-error-private.h
index a1bfe1a1cc4bb9c68f10bdeff5da182986db20a7..df9369ac5b1a1d18c48d1d527412ecfb47badc36 100644
--- a/src/lib-sieve/sieve-error-private.h
+++ b/src/lib-sieve/sieve-error-private.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ERROR_PRIVATE_H
-#define __SIEVE_ERROR_PRIVATE_H
+#ifndef SIEVE_ERROR_PRIVATE_H
+#define SIEVE_ERROR_PRIVATE_H
 
 #include "sieve-error.h"
 
@@ -133,4 +133,4 @@ static inline void ATTR_FORMAT(5, 6) sieve_direct_debug
 }
 
 
-#endif /* __SIEVE_ERROR_PRIVATE_H */
+#endif
diff --git a/src/lib-sieve/sieve-error.h b/src/lib-sieve/sieve-error.h
index 0c664ffb4ed4e2a8021aa73d0c18dc7fb7bb170a..8cea2b99f4dc41671f4fa7eca183a3f77f951c50 100644
--- a/src/lib-sieve/sieve-error.h
+++ b/src/lib-sieve/sieve-error.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_ERROR_H
-#define __SIEVE_ERROR_H
+#ifndef SIEVE_ERROR_H
+#define SIEVE_ERROR_H
 
 #include "lib.h"
 #include "compat.h"
@@ -202,4 +202,4 @@ struct sieve_error_handler *sieve_varexpand_ehandler_create
 (struct sieve_error_handler *parent, const char *format,
 	const struct var_expand_table *table);
 
-#endif /* __SIEVE_ERROR_H */
+#endif
diff --git a/src/lib-sieve/sieve-extensions.h b/src/lib-sieve/sieve-extensions.h
index 2dbbe4d261786c85d5e509b7c600e90c5ec5a3b0..961cf41a6de294eec1ca5f13b8f268f19f240454 100644
--- a/src/lib-sieve/sieve-extensions.h
+++ b/src/lib-sieve/sieve-extensions.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXTENSIONS_H
-#define __SIEVE_EXTENSIONS_H
+#ifndef SIEVE_EXTENSIONS_H
+#define SIEVE_EXTENSIONS_H
 
 #include "lib.h"
 #include "sieve-common.h"
@@ -188,4 +188,4 @@ void sieve_extension_capabilities_unregister
 const char *sieve_extension_capabilities_get_string
 	(struct sieve_instance *svinst, const char *cap_name);
 
-#endif /* __SIEVE_EXTENSIONS_H */
+#endif
diff --git a/src/lib-sieve/sieve-generator.h b/src/lib-sieve/sieve-generator.h
index 1828c747ed5d77a5c718b315bc866f4a63eaba5b..0fbe9072684ae60e9daf7c9c9ee9359d98c09767 100644
--- a/src/lib-sieve/sieve-generator.h
+++ b/src/lib-sieve/sieve-generator.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_GENERATOR_H
-#define __SIEVE_GENERATOR_H
+#ifndef SIEVE_GENERATOR_H
+#define SIEVE_GENERATOR_H
 
 #include "sieve-common.h"
 
@@ -107,5 +107,5 @@ bool sieve_generate_test
 struct sieve_binary *sieve_generator_run
 	(struct sieve_generator *gentr, struct sieve_binary_block **sblock_r);
 
-#endif /* __SIEVE_GENERATOR_H */
+#endif
 
diff --git a/src/lib-sieve/sieve-interpreter.h b/src/lib-sieve/sieve-interpreter.h
index e7608098c3d6d7f9660b906d3dea7c50b282444b..e257e1a6727abaddc1ff8c354292b37e6d57349f 100644
--- a/src/lib-sieve/sieve-interpreter.h
+++ b/src/lib-sieve/sieve-interpreter.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_INTERPRETER_H
-#define __SIEVE_INTERPRETER_H
+#ifndef SIEVE_INTERPRETER_H
+#define SIEVE_INTERPRETER_H
 
 #include "lib.h"
 #include "array.h"
@@ -193,4 +193,4 @@ int sieve_interpreter_start
 int sieve_interpreter_run
 	(struct sieve_interpreter *interp, struct sieve_result *result);
 
-#endif /* __SIEVE_INTERPRETER_H */
+#endif
diff --git a/src/lib-sieve/sieve-lexer.h b/src/lib-sieve/sieve-lexer.h
index 78bad9d17eab68807a79e6c807e278434c726b68..d11bfe3b574aac2032d9dbdbe34ec95590998257 100644
--- a/src/lib-sieve/sieve-lexer.h
+++ b/src/lib-sieve/sieve-lexer.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_LEXER_H
-#define __SIEVE_LEXER_H
+#ifndef SIEVE_LEXER_H
+#define SIEVE_LEXER_H
 
 #include "lib.h"
 #include "str.h"
@@ -120,4 +120,4 @@ const char *sieve_lexer_token_description
 void sieve_lexer_token_print
 	(const struct sieve_lexer *lexer);
 
-#endif /* __SIEVE_LEXER_H */
+#endif
diff --git a/src/lib-sieve/sieve-limits.h b/src/lib-sieve/sieve-limits.h
index 55e7f51e5b94b010e2c7a6e17004bd9fd4909738..355115881d993ebc28b0421cae1bd66d8397ff4f 100644
--- a/src/lib-sieve/sieve-limits.h
+++ b/src/lib-sieve/sieve-limits.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_LIMITS_H
-#define __SIEVE_LIMITS_H
+#ifndef SIEVE_LIMITS_H
+#define SIEVE_LIMITS_H
 
 /*
  * Scripts
@@ -39,4 +39,4 @@
 #define SIEVE_DEFAULT_MAX_ACTIONS      32
 #define SIEVE_DEFAULT_MAX_REDIRECTS    4
 
-#endif /* __SIEVE_LIMITS_H */
+#endif
diff --git a/src/lib-sieve/sieve-match-types.h b/src/lib-sieve/sieve-match-types.h
index 33f6d71be6e164ce2d6ebc40dd4dcf1d1df5be51..0417e2cbbe58ab11c1903ed459ab0726577c653b 100644
--- a/src/lib-sieve/sieve-match-types.h
+++ b/src/lib-sieve/sieve-match-types.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_MATCH_TYPES_H
-#define __SIEVE_MATCH_TYPES_H
+#ifndef SIEVE_MATCH_TYPES_H
+#define SIEVE_MATCH_TYPES_H
 
 #include "sieve-common.h"
 #include "sieve-extensions.h"
@@ -230,4 +230,4 @@ bool sieve_match_substring_validate_context
 		struct sieve_match_type_context *ctx,
 		struct sieve_ast_argument *key_arg);
 
-#endif /* __SIEVE_MATCH_TYPES_H */
+#endif
diff --git a/src/lib-sieve/sieve-match.h b/src/lib-sieve/sieve-match.h
index ee3954f934b15c90dd588b81d8fc739f6fcabe8f..d4d726fc1f86abc200ef01c589df6aded8b2396c 100644
--- a/src/lib-sieve/sieve-match.h
+++ b/src/lib-sieve/sieve-match.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_MATCH_H
-#define __SIEVE_MATCH_H
+#ifndef SIEVE_MATCH_H
+#define SIEVE_MATCH_H
 
 #include "sieve-common.h"
 
@@ -65,4 +65,4 @@ int sieve_match_opr_optional_read
 		int *exec_status, struct sieve_comparator *cmp,
 		struct sieve_match_type *mcht);
 
-#endif /* __SIEVE_MATCH_H */
+#endif
diff --git a/src/lib-sieve/sieve-message.h b/src/lib-sieve/sieve-message.h
index 2b5efc96dbdcf90e6d0088266c9c5a863efc3163..4cb77ccb41ab11effc462d7d378f958382dc648f 100644
--- a/src/lib-sieve/sieve-message.h
+++ b/src/lib-sieve/sieve-message.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_MESSAGE_H
-#define __SIEVE_MESSAGE_H
+#ifndef SIEVE_MESSAGE_H
+#define SIEVE_MESSAGE_H
 
 #include "sieve-common.h"
 #include "sieve-stringlist.h"
@@ -277,4 +277,4 @@ struct sieve_header_list *sieve_mime_header_list_create
 	struct sieve_message_part_iter *part_iter,
 	bool mime_decode, bool children);
 
-#endif /* __SIEVE_MESSAGE_H */
+#endif
diff --git a/src/lib-sieve/sieve-objects.h b/src/lib-sieve/sieve-objects.h
index 1ae0ea7b6b55ba5782636d5fed193cee3777c031..e3f300f695bcd1fb3cfc9396afd181cd739d198d 100644
--- a/src/lib-sieve/sieve-objects.h
+++ b/src/lib-sieve/sieve-objects.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_OBJECTS_H
-#define __SIEVE_OBJECTS_H
+#ifndef SIEVE_OBJECTS_H
+#define SIEVE_OBJECTS_H
 
 /*
  * Object definition
@@ -64,4 +64,4 @@ bool sieve_opr_object_dump
 		struct sieve_object *obj);
 
 
-#endif /* __SIEVE_OBJECTS_H */
+#endif
diff --git a/src/lib-sieve/sieve-parser.h b/src/lib-sieve/sieve-parser.h
index 0c2e0d330439baf625275f37ac2e3c4d9571f398..896b7564858a94fe462715502b06964ad93db2cd 100644
--- a/src/lib-sieve/sieve-parser.h
+++ b/src/lib-sieve/sieve-parser.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_PARSER_H
-#define __SIEVE_PARSER_H
+#ifndef SIEVE_PARSER_H
+#define SIEVE_PARSER_H
 
 #include "lib.h"
 
@@ -13,4 +13,4 @@ struct sieve_parser *sieve_parser_create
 void sieve_parser_free(struct sieve_parser **parser);
 bool sieve_parser_run(struct sieve_parser *parser, struct sieve_ast **ast);
 
-#endif /* __SIEVE_PARSER_H */
+#endif
diff --git a/src/lib-sieve/sieve-plugins.h b/src/lib-sieve/sieve-plugins.h
index a9b6dee15e66c551cd279358b297baa7fe287df9..996af41ce5dfb0014ec5a3d3a620154006b6ff48 100644
--- a/src/lib-sieve/sieve-plugins.h
+++ b/src/lib-sieve/sieve-plugins.h
@@ -1,9 +1,9 @@
-#ifndef __SIEVE_PLUGINS_H
-#define __SIEVE_PLUGINS_H
+#ifndef SIEVE_PLUGINS_H
+#define SIEVE_PLUGINS_H
 
 #include "sieve-common.h"
 
 void sieve_plugins_load(struct sieve_instance *svinst, const char *path, const char *plugins);
 void sieve_plugins_unload(struct sieve_instance *svinst);
 
-#endif /* __SIEVE_PLUGINS_H */
+#endif
diff --git a/src/lib-sieve/sieve-result.h b/src/lib-sieve/sieve-result.h
index 6ed54ed0890bce59b3686b1cc636236ad47b2861..86230a76e18888292196b7cc4276eee6d2984115 100644
--- a/src/lib-sieve/sieve-result.h
+++ b/src/lib-sieve/sieve-result.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_RESULT_H
-#define __SIEVE_RESULT_H
+#ifndef SIEVE_RESULT_H
+#define SIEVE_RESULT_H
 
 #include "sieve-common.h"
 #include "sieve-error.h"
diff --git a/src/lib-sieve/sieve-runtime-trace.h b/src/lib-sieve/sieve-runtime-trace.h
index 2d918fe3195059822d89596ff2cab6239635e1e7..b165586ac7d723afe0f179b633eda0c6b8cbe553 100644
--- a/src/lib-sieve/sieve-runtime-trace.h
+++ b/src/lib-sieve/sieve-runtime-trace.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_RUNTIME_TRACE_H
-#define __SIEVE_RUNTIME_TRACE_H
+#ifndef SIEVE_RUNTIME_TRACE_H
+#define SIEVE_RUNTIME_TRACE_H
 
 #include "sieve-common.h"
 #include "sieve-runtime.h"
@@ -179,4 +179,4 @@ static inline void sieve_runtime_trace_sep
 		_sieve_runtime_trace_sep(renv);
 }
 
-#endif /* __SIEVE_RUNTUME_TRACE_H */
+#endif
diff --git a/src/lib-sieve/sieve-runtime.h b/src/lib-sieve/sieve-runtime.h
index 0b3ad4065b35cc8822b166f15bb050fd1a0c4c9a..1657641f2c8bb151a8be47d01c82a0c6a4a68635 100644
--- a/src/lib-sieve/sieve-runtime.h
+++ b/src/lib-sieve/sieve-runtime.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_RUNTIME_H
-#define __SIEVE_RUNTIME_H
+#ifndef SIEVE_RUNTIME_H
+#define SIEVE_RUNTIME_H
 
 #include "sieve-common.h"
 
@@ -38,4 +38,4 @@ struct sieve_runtime_env {
 	struct sieve_runtime_trace *trace;
 };
 
-#endif /* __SIEVE_RUNTIME_H */
+#endif
diff --git a/src/lib-sieve/sieve-script-private.h b/src/lib-sieve/sieve-script-private.h
index d665af83d04aa88cae0fd6c2240808f46fc9ed9c..7f1edff72cc0c89b729cbf6082cfd9e7c2ad4c5f 100644
--- a/src/lib-sieve/sieve-script-private.h
+++ b/src/lib-sieve/sieve-script-private.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_SCRIPT_PRIVATE_H
-#define __SIEVE_SCRIPT_PRIVATE_H
+#ifndef SIEVE_SCRIPT_PRIVATE_H
+#define SIEVE_SCRIPT_PRIVATE_H
 
 #include "sieve-common.h"
 #include "sieve-script.h"
@@ -115,4 +115,4 @@ void sieve_script_sys_debug
 void sieve_script_sequence_init
 (struct sieve_script_sequence *seq, struct sieve_storage *storage);
 
-#endif /* __SIEVE_SCRIPT_PRIVATE_H */
+#endif
diff --git a/src/lib-sieve/sieve-script.h b/src/lib-sieve/sieve-script.h
index 5ee57140c62149a86558cbddd71c07fe5e9f6c56..0281114cc0cbda46118e0fd5ca4ab7dbd1e74db2 100644
--- a/src/lib-sieve/sieve-script.h
+++ b/src/lib-sieve/sieve-script.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_SCRIPT_H
-#define __SIEVE_SCRIPT_H
+#ifndef SIEVE_SCRIPT_H
+#define SIEVE_SCRIPT_H
 
 #include "sieve-common.h"
 
@@ -163,4 +163,4 @@ struct sieve_script *sieve_script_sequence_next
 	(struct sieve_script_sequence *seq, enum sieve_error *error_r);
 void sieve_script_sequence_free(struct sieve_script_sequence **_seq);
 
-#endif /* __SIEVE_SCRIPT_H */
+#endif
diff --git a/src/lib-sieve/sieve-settings.h b/src/lib-sieve/sieve-settings.h
index 26d3eb64a3d75a82f2c494836130a0884a6cb0e9..c6541e49e735a9ab935e2192b349e30f30d8f8aa 100644
--- a/src/lib-sieve/sieve-settings.h
+++ b/src/lib-sieve/sieve-settings.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_SETTINGS_H
-#define __SIEVE_SETTINGS_H
+#ifndef SIEVE_SETTINGS_H
+#define SIEVE_SETTINGS_H
 
 #include "sieve-common.h"
 
@@ -59,4 +59,4 @@ static inline const char *sieve_environment_get_homedir
 	return callbacks->get_homedir(svinst->context);
 }
 
-#endif /* __SIEVE_SETTINGS_H */
+#endif
diff --git a/src/lib-sieve/sieve-smtp.h b/src/lib-sieve/sieve-smtp.h
index 5b2ec64321163caae434be473da67668305c5b38..f7b9c8427d8d357854e2a1493f4aab51fa1ea93b 100644
--- a/src/lib-sieve/sieve-smtp.h
+++ b/src/lib-sieve/sieve-smtp.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_SMTP_H
-#define __SIEVE_SMTP_H
+#ifndef SIEVE_SMTP_H
+#define SIEVE_SMTP_H
 
 #include "sieve-common.h"
 
@@ -28,4 +28,4 @@ void sieve_smtp_abort
 int sieve_smtp_finish
 	(struct sieve_smtp_context *sctx, const char **error_r);
 
-#endif /* __SIEVE_SMTP_H */
+#endif
diff --git a/src/lib-sieve/sieve-storage-private.h b/src/lib-sieve/sieve-storage-private.h
index 23bc7d9b4e3de2970acb2e5c072bcae8fc5239e9..9cdb877f73d5f5ccb6cfe57426f223fb3bf4d968 100644
--- a/src/lib-sieve/sieve-storage-private.h
+++ b/src/lib-sieve/sieve-storage-private.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_STORAGE_PRIVATE_H
-#define __SIEVE_STORAGE_PRIVATE_H
+#ifndef SIEVE_STORAGE_PRIVATE_H
+#define SIEVE_STORAGE_PRIVATE_H
 
 #include "sieve.h"
 #include "sieve-error-private.h"
diff --git a/src/lib-sieve/sieve-storage.h b/src/lib-sieve/sieve-storage.h
index 245b1e7de116cc7ec639a86bfe295bf0c46ee3b4..16da8d68e8b4bb3cb67737d42292f959b07fe86f 100644
--- a/src/lib-sieve/sieve-storage.h
+++ b/src/lib-sieve/sieve-storage.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_STORAGE_H
-#define __SIEVE_STORAGE_H
+#ifndef SIEVE_STORAGE_H
+#define SIEVE_STORAGE_H
 
 #define MAILBOX_ATTRIBUTE_PREFIX_SIEVE \
 	MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER"sieve/"
diff --git a/src/lib-sieve/sieve-stringlist.h b/src/lib-sieve/sieve-stringlist.h
index 50cb56518150c06787b7daf0f47c8998b503262c..1909b7a8b2578de19f57e29d156f22985618da94 100644
--- a/src/lib-sieve/sieve-stringlist.h
+++ b/src/lib-sieve/sieve-stringlist.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_STRINGLIST_H
-#define __SIEVE_STRINGLIST_H
+#ifndef SIEVE_STRINGLIST_H
+#define SIEVE_STRINGLIST_H
 
 /*
  * Stringlist API
@@ -71,4 +71,4 @@ struct sieve_stringlist *sieve_index_stringlist_create
 	(const struct sieve_runtime_env *renv, struct sieve_stringlist *source,
 		int index);
 
-#endif /* __SIEVE_STRINGLIST_H */
+#endif
diff --git a/src/lib-sieve/sieve-types.h b/src/lib-sieve/sieve-types.h
index 2ea9c3310c8f19b767aabf16975c576712b3eb32..b5cbbf4d1041fee991706e277b4d117b549d7c2f 100644
--- a/src/lib-sieve/sieve-types.h
+++ b/src/lib-sieve/sieve-types.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_TYPES_H
-#define __SIEVE_TYPES_H
+#ifndef SIEVE_TYPES_H
+#define SIEVE_TYPES_H
 
 #include "lib.h"
 #include "smtp-address.h"
@@ -270,4 +270,4 @@ enum sieve_execution_exitcode {
 	SIEVE_EXEC_KEEP_FAILED  = -3
 };
 
-#endif /* __SIEVE_TYPES_H */
+#endif
diff --git a/src/lib-sieve/sieve-validator.h b/src/lib-sieve/sieve-validator.h
index abb6ca7065db28de7fe52ef160cef79f4e84f55c..cd82c984415b582abef371233cc5bdf294c4dd60 100644
--- a/src/lib-sieve/sieve-validator.h
+++ b/src/lib-sieve/sieve-validator.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_VALIDATOR_H
-#define __SIEVE_VALIDATOR_H
+#ifndef SIEVE_VALIDATOR_H
+#define SIEVE_VALIDATOR_H
 
 #include "lib.h"
 
@@ -183,4 +183,4 @@ struct sieve_validator_object_registry *sieve_validator_object_registry_create
 struct sieve_validator_object_registry *sieve_validator_object_registry_init
 	(struct sieve_validator *valdtr, const struct sieve_extension *ext);
 
-#endif /* __SIEVE_VALIDATOR_H */
+#endif
diff --git a/src/lib-sieve/sieve.h b/src/lib-sieve/sieve.h
index d80fcaa7f6873b5193b4fea1e8b5747767166c78..d369043973ed81cbb5164ae4785421b8138fb30d 100644
--- a/src/lib-sieve/sieve.h
+++ b/src/lib-sieve/sieve.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_H
-#define __SIEVE_H
+#ifndef SIEVE_H
+#define SIEVE_H
 
 struct sieve_script;
 struct sieve_binary;
diff --git a/src/lib-sieve/storage/dict/sieve-dict-storage.h b/src/lib-sieve/storage/dict/sieve-dict-storage.h
index efd7f3387d755a405a9e7bc25a33a4a833a70efa..1f9222177c089990df6309d787e99dc635614b1b 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-storage.h
+++ b/src/lib-sieve/storage/dict/sieve-dict-storage.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_DICT_STORAGE_H
-#define __SIEVE_DICT_STORAGE_H
+#ifndef SIEVE_DICT_STORAGE_H
+#define SIEVE_DICT_STORAGE_H
 
 #include "sieve.h"
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.h b/src/lib-sieve/storage/file/sieve-file-storage.h
index 708bcc961f64cce4f47efbca5b91b8f9c6d2c6d3..7e5e064ef2e6a5d64a101dd5ebab58d2cdb068dd 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.h
+++ b/src/lib-sieve/storage/file/sieve-file-storage.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_FILE_STORAGE_H
-#define __SIEVE_FILE_STORAGE_H
+#ifndef SIEVE_FILE_STORAGE_H
+#define SIEVE_FILE_STORAGE_H
 
 #include "lib.h"
 #include "mail-user.h"
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage.h b/src/lib-sieve/storage/ldap/sieve-ldap-storage.h
index 95726d1a409f503848d0f63b6b19dd99e12968ba..f97cebabb24244610f43185bfe0b8dc77eaf8081 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.h
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_LDAP_STORAGE_H
-#define __SIEVE_LDAP_STORAGE_H
+#ifndef SIEVE_LDAP_STORAGE_H
+#define SIEVE_LDAP_STORAGE_H
 
 #include "sieve.h"
 #include "sieve-script-private.h"
diff --git a/src/lib-sieve/util/edit-mail.h b/src/lib-sieve/util/edit-mail.h
index b812238062777bce67a86cbdb295f4cfe1fc791d..7e21280a4520caee8d72e1cc28e01c12c2864615 100644
--- a/src/lib-sieve/util/edit-mail.h
+++ b/src/lib-sieve/util/edit-mail.h
@@ -1,5 +1,5 @@
-#ifndef __EDIT_MAIL_H
-#define __EDIT_MAIL_H
+#ifndef EDIT_MAIL_H
+#define EDIT_MAIL_H
 
 struct edit_mail;
 
@@ -50,4 +50,4 @@ bool edit_mail_headers_iterate_replace
 
 
 
-#endif /* __edit_mail_H */
+#endif
diff --git a/src/lib-sieve/util/rfc2822.h b/src/lib-sieve/util/rfc2822.h
index 1292c176552866763dc8aea36a7cf46a3cb20652..02266a932e069ec0866f0c556d079b081a4175f8 100644
--- a/src/lib-sieve/util/rfc2822.h
+++ b/src/lib-sieve/util/rfc2822.h
@@ -1,5 +1,5 @@
-#ifndef __RFC2822_H
-#define __RFC2822_H
+#ifndef RFC2822_H
+#define RFC2822_H
 
 #include "lib.h"
 
@@ -43,4 +43,4 @@ void rfc2822_header_write_address(string_t *header,
 	const char *name, const char *address);
 
 
-#endif /* __RFC2822_H */
+#endif
diff --git a/src/managesieve-login/client-authenticate.h b/src/managesieve-login/client-authenticate.h
index 63aa944d1bac6cca1f18b94710da45c4fd445a01..1280ad50c029380ea530bd8645e691da758c70e3 100644
--- a/src/managesieve-login/client-authenticate.h
+++ b/src/managesieve-login/client-authenticate.h
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_AUTHENTICATE_H
-#define __CLIENT_AUTHENTICATE_H
+#ifndef CLIENT_AUTHENTICATE_H
+#define CLIENT_AUTHENTICATE_H
 
 struct managesieve_arg;
 
@@ -18,4 +18,4 @@ void managesieve_client_auth_parse_response
 int cmd_authenticate
 	(struct managesieve_client *client, const struct managesieve_arg *args);
 
-#endif /* __CLIENT_AUTHENTICATE_H */
+#endif
diff --git a/src/managesieve-login/client.h b/src/managesieve-login/client.h
index 76180b2802a184083983f92e32fc23bdb5d0b55d..d2a4dff4ad36a71dfd60a12902fb618b0ed23461 100644
--- a/src/managesieve-login/client.h
+++ b/src/managesieve-login/client.h
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_H
-#define __CLIENT_H
+#ifndef CLIENT_H
+#define CLIENT_H
 
 #include "net.h"
 #include "client-common.h"
@@ -71,4 +71,4 @@ void client_send_reply_code(struct client *client,
 	client_send_reply_code(client, MANAGESIEVE_CMD_REPLY_BYE, resp_code, text)
 
 
-#endif /* __CLIENT_H */
+#endif
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.h b/src/managesieve-login/managesieve-login-settings-plugin.h
index 02f606833a9aea886ab52dda05f2095503b3cbd7..ebefe1a9768df9b8ab3074f2d10f03e969f7116a 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.h
+++ b/src/managesieve-login/managesieve-login-settings-plugin.h
@@ -1,9 +1,9 @@
-#ifndef __MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H
-#define __MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H
+#ifndef MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H
+#define MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H
 
 #include "lib.h"
 
 void managesieve_login_settings_init(struct module *module);
 void managesieve_login_settings_deinit(void);
 
-#endif /* __MANAGESIEVE_LOGIN_SETTINGS_PLUGIN_H */
+#endif
diff --git a/src/managesieve-login/managesieve-login-settings.h b/src/managesieve-login/managesieve-login-settings.h
index 36afabcbae7e2e880388c3d9b11b984c32a81549..c6f4826e0657bf0ae36c329c5e321a3cb8eddc51 100644
--- a/src/managesieve-login/managesieve-login-settings.h
+++ b/src/managesieve-login/managesieve-login-settings.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_LOGIN_SETTINGS_H
-#define __MANAGESIEVE_LOGIN_SETTINGS_H
+#ifndef MANAGESIEVE_LOGIN_SETTINGS_H
+#define MANAGESIEVE_LOGIN_SETTINGS_H
 
 struct managesieve_login_settings {
 	const char *managesieve_implementation_string;
@@ -14,4 +14,4 @@ void managesieve_login_settings_init(void);
 void managesieve_login_settings_deinit(void);
 #endif
 
-#endif /* __MANAGESIEVE_LOGIN_SETTINGS_H */
+#endif
diff --git a/src/managesieve-login/managesieve-proxy.h b/src/managesieve-login/managesieve-proxy.h
index 6d8230f56209b968dcedb46418f599d280d8f246..3ead2d5b032204373f9aa1e3ea0fac1a39dc9810 100644
--- a/src/managesieve-login/managesieve-proxy.h
+++ b/src/managesieve-login/managesieve-proxy.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_PROXY_H
-#define __MANAGESIEVE_PROXY_H
+#ifndef MANAGESIEVE_PROXY_H
+#define MANAGESIEVE_PROXY_H
 
 void managesieve_proxy_reset(struct client *client);
 int managesieve_proxy_parse_line(struct client *client, const char *line);
diff --git a/src/managesieve/managesieve-capabilities.h b/src/managesieve/managesieve-capabilities.h
index 7d6866b4a0fa9a90fc3420e45b0cee402279b8b0..b7503a99301a01488b29990d4098dcb0802eec17 100644
--- a/src/managesieve/managesieve-capabilities.h
+++ b/src/managesieve/managesieve-capabilities.h
@@ -1,6 +1,6 @@
-#ifndef __MANAGESIEVE_CAPABILITIES_H
-#define __MANAGESIEVE_CAPABILITIES_H
+#ifndef MANAGESIEVE_CAPABILITIES_H
+#define MANAGESIEVE_CAPABILITIES_H
 
 void managesieve_capabilities_dump(void);
 
-#endif /* __MANAGESIEVE_CAPABILITIES_H */
+#endif
diff --git a/src/managesieve/managesieve-client.h b/src/managesieve/managesieve-client.h
index 50982bdc4558225da13a703faaa98956668d5726..003667cd109045aff91f9b34e51c5fe0dc0e0a46 100644
--- a/src/managesieve/managesieve-client.h
+++ b/src/managesieve/managesieve-client.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_CLIENT_H
-#define __MANAGESIEVE_CLIENT_H
+#ifndef MANAGESIEVE_CLIENT_H
+#define MANAGESIEVE_CLIENT_H
 
 #include "managesieve-commands.h"
 
@@ -142,4 +142,4 @@ int client_output(struct client *client);
 
 void clients_destroy_all(void);
 
-#endif /* __MANAGESIEVE_CLIENT_H */
+#endif
diff --git a/src/managesieve/managesieve-commands.h b/src/managesieve/managesieve-commands.h
index 941be02babd00e5e333c7ac8218e865a26a02f95..d922b74b35b40465ef9109ff2184408d41165c8c 100644
--- a/src/managesieve/managesieve-commands.h
+++ b/src/managesieve/managesieve-commands.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_COMMANDS_H
-#define __MANAGESIEVE_COMMANDS_H
+#ifndef MANAGESIEVE_COMMANDS_H
+#define MANAGESIEVE_COMMANDS_H
 
 struct client_command_context;
 
@@ -43,4 +43,4 @@ extern bool cmd_listscripts(struct client_command_context *cmd);
 extern bool cmd_havespace(struct client_command_context *cmd);
 extern bool cmd_renamescript(struct client_command_context *cmd);
 
-#endif /* __MANAGESIEVE_COMMANDS_H */
+#endif
diff --git a/src/managesieve/managesieve-common.h b/src/managesieve/managesieve-common.h
index df07b01028aa48ce758e5583c08ba88df9547d75..7c3b5457acb57a749ab9ab758f036c60e437020c 100644
--- a/src/managesieve/managesieve-common.h
+++ b/src/managesieve/managesieve-common.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_COMMON_H
-#define __MANAGESIEVE_COMMON_H
+#ifndef MANAGESIEVE_COMMON_H
+#define MANAGESIEVE_COMMON_H
 
 #include "pigeonhole-config.h"
 
@@ -27,4 +27,4 @@ extern void (*hook_client_created)(struct client **client);
 
 void managesieve_refresh_proctitle(void);
 
-#endif /* __MANAGESIEVE_COMMON_H */
+#endif
diff --git a/src/managesieve/managesieve-quota.h b/src/managesieve/managesieve-quota.h
index e65a1a916ec585102fbd33baad6d696f35ac508f..4e8de11f76ffdf17353b1d852d11b86f92188749 100644
--- a/src/managesieve/managesieve-quota.h
+++ b/src/managesieve/managesieve-quota.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_QUOTA_H
-#define __MANAGESIEVE_QUOTA_H
+#ifndef MANAGESIEVE_QUOTA_H
+#define MANAGESIEVE_QUOTA_H
 
 uint64_t managesieve_quota_max_script_size(struct client *client);
 
@@ -8,4 +8,4 @@ bool managesieve_quota_check_validsize
 bool managesieve_quota_check_all
 	(struct client *client, const char *scriptname, size_t size);
 
-#endif /* __MANAGESIEVE_QUOTA_H */
+#endif
diff --git a/src/managesieve/managesieve-settings.h b/src/managesieve/managesieve-settings.h
index 5d337514634c9c1899821b01665fa2caf0041d99..194984557b1880ce371051f091d899bb024ce6b8 100644
--- a/src/managesieve/managesieve-settings.h
+++ b/src/managesieve/managesieve-settings.h
@@ -1,5 +1,5 @@
-#ifndef __MANAGESIEVE_SETTINGS_H
-#define __MANAGESIEVE_SETTINGS_H
+#ifndef MANAGESIEVE_SETTINGS_H
+#define MANAGESIEVE_SETTINGS_H
 
 struct mail_user_settings;
 
@@ -26,4 +26,4 @@ struct managesieve_settings {
 
 extern const struct setting_parser_info managesieve_setting_parser_info;
 
-#endif /* __MANAGESIEVE_SETTINGS_H */
+#endif
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.h b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.h
index ce238ccd3b7c6799ef239a5855c70f1bacb1c1a3..12967017e8acda8dcb0aa2a4c1758f119b346061 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-cmd.h
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-cmd.h
@@ -1,5 +1,5 @@
-#ifndef __DOVEADM_SIEVE_CMD_H
-#define __DOVEADM_SIEVE_CMD_H
+#ifndef DOVEADM_SIEVE_CMD_H
+#define DOVEADM_SIEVE_CMD_H
 
 struct doveadm_sieve_cmd_context;
 
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-plugin.h b/src/plugins/doveadm-sieve/doveadm-sieve-plugin.h
index 734c5c0e5134c97fddd5b14667c810d78c9f626d..6e9446d14fb62ec07b2cb1d7ae1b2bf8b9b674ce 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-plugin.h
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-plugin.h
@@ -1,5 +1,5 @@
-#ifndef __DOVEADM_SIEVE_PLUGIN_H
-#define __DOVEADM_SIEVE_PLUGIN_H
+#ifndef DOVEADM_SIEVE_PLUGIN_H
+#define DOVEADM_SIEVE_PLUGIN_H
 
 /*
  * Plugin interface
@@ -14,4 +14,4 @@ void doveadm_sieve_plugin_deinit(void);
 
 void doveadm_sieve_sync_init(struct module *module);
 
-#endif /* __DOVEADM_SIEVE_PLUGIN_H */
+#endif
diff --git a/src/plugins/imapsieve/ext-imapsieve-common.h b/src/plugins/imapsieve/ext-imapsieve-common.h
index 9f0d408dc26f6724171c2d3d4acbcb18aaee04ab..d3e69cd1f31130b9e32335a9f12a2a0474384248 100644
--- a/src/plugins/imapsieve/ext-imapsieve-common.h
+++ b/src/plugins/imapsieve/ext-imapsieve-common.h
@@ -1,5 +1,5 @@
-#ifndef __EXT_IMAPSIEVE_COMMON_H
-#define __EXT_IMAPSIEVE_COMMON_H
+#ifndef EXT_IMAPSIEVE_COMMON_H
+#define EXT_IMAPSIEVE_COMMON_H
 
 #include "sieve-extensions.h"
 
@@ -26,4 +26,4 @@ void ext_imapsieve_environment_vendor_items_register
 	(const struct sieve_extension *ext,
 		const struct sieve_runtime_env *renv);
 
-#endif /* __EXT_IMAPSIEVE_COMMON_H */
+#endif
diff --git a/src/plugins/imapsieve/imap-sieve-storage.h b/src/plugins/imapsieve/imap-sieve-storage.h
index 1011f04966469d012cba58cdaeb70356be4774a8..f96860fc3a9fac17b4a109d9f5cef2782a4a3542 100644
--- a/src/plugins/imapsieve/imap-sieve-storage.h
+++ b/src/plugins/imapsieve/imap-sieve-storage.h
@@ -1,5 +1,5 @@
-#ifndef __IMAP_SIEVE_STORAGE_H
-#define __IMAP_SIEVE_STORAGE_H
+#ifndef IMAP_SIEVE_STORAGE_H
+#define IMAP_SIEVE_STORAGE_H
 
 void imap_sieve_storage_init(struct module *module);
 void imap_sieve_storage_deinit(void);
diff --git a/src/plugins/imapsieve/imap-sieve.h b/src/plugins/imapsieve/imap-sieve.h
index f84689af6ad73dadff6dffd09a4b84e91cbb43f6..c865e7d05a463d539c1787c0d368b36320e33746 100644
--- a/src/plugins/imapsieve/imap-sieve.h
+++ b/src/plugins/imapsieve/imap-sieve.h
@@ -1,5 +1,5 @@
-#ifndef __IMAP_SIEVE_H
-#define __IMAP_SIEVE_H
+#ifndef IMAP_SIEVE_H
+#define IMAP_SIEVE_H
 
 struct client;
 
diff --git a/src/plugins/imapsieve/sieve-imapsieve-plugin.h b/src/plugins/imapsieve/sieve-imapsieve-plugin.h
index f63d8640332d89f7d1faabb65d70f4d79ba68245..fcf9777f422e1fe555bfe3b61116837f2cfaf399 100644
--- a/src/plugins/imapsieve/sieve-imapsieve-plugin.h
+++ b/src/plugins/imapsieve/sieve-imapsieve-plugin.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_IMAPSIEVE_PLUGIN_H
-#define __SIEVE_IMAPSIEVE_PLUGIN_H
+#ifndef SIEVE_IMAPSIEVE_PLUGIN_H
+#define SIEVE_IMAPSIEVE_PLUGIN_H
 
 /*
  * Plugin interface
@@ -17,4 +17,4 @@ void sieve_imapsieve_plugin_unload
 void sieve_imapsieve_plugin_init(void);
 void sieve_imapsieve_plugin_deinit(void);
 
-#endif /* __SIEVE_IMAPSIEVE_PLUGIN_H */
+#endif
diff --git a/src/plugins/lda-sieve/lda-sieve-log.h b/src/plugins/lda-sieve/lda-sieve-log.h
index 5c31985289e6480d7daa921f3133841a21695010..ff74b0b96664a71217aec685f7dbbf6113ab3eee 100644
--- a/src/plugins/lda-sieve/lda-sieve-log.h
+++ b/src/plugins/lda-sieve/lda-sieve-log.h
@@ -1,8 +1,8 @@
-#ifndef __LDA_SIEVE_LOG_H
-#define __LDA_SIEVE_LOG_H
+#ifndef LDA_SIEVE_LOG_H
+#define LDA_SIEVE_LOG_H
 
 struct sieve_error_handler *lda_sieve_log_ehandler_create
 	(struct sieve_error_handler *parent,
 		struct mail_deliver_context *mdctx);
 
-#endif /* __LDA_SIEVE_LOG_H */
+#endif
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.h b/src/plugins/lda-sieve/lda-sieve-plugin.h
index d2a54f80da007209a4cd5008a5c580aafbd24ed3..2357097536337d295acf738b7259dd8d5534c0ee 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.h
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.h
@@ -1,5 +1,5 @@
-#ifndef __LDA_SIEVE_PLUGIN_H
-#define __LDA_SIEVE_PLUGIN_H
+#ifndef LDA_SIEVE_PLUGIN_H
+#define LDA_SIEVE_PLUGIN_H
 
 /*
  * Plugin interface
@@ -8,4 +8,4 @@
 void sieve_plugin_init(void);
 void sieve_plugin_deinit(void);
 
-#endif /* __LDA_SIEVE_PLUGIN_H */
+#endif
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.h b/src/plugins/sieve-extprograms/sieve-extprograms-common.h
index f9b99ae83c468f32c0538afa790d0c6f469db04e..7e783f5cbd60c2cf0e327e3426b42370e761acae 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-common.h
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXTPROGRAMS_COMMON_H
-#define __SIEVE_EXTPROGRAMS_COMMON_H
+#ifndef SIEVE_EXTPROGRAMS_COMMON_H
+#define SIEVE_EXTPROGRAMS_COMMON_H
 
 #include "sieve-common.h"
 
@@ -104,4 +104,4 @@ int sieve_extprogram_set_input_mail
 
 int sieve_extprogram_run(struct sieve_extprogram *sprog);
 
-#endif /* __SIEVE_EXTPROGRAMS_COMMON_H */
+#endif
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.h b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.h
index 98fb88f38dbd0c8b9276af2e684f07df2ad01899..20fa55aee7c2447a89c290ad2d6fc454b6bae499 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.h
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.h
@@ -1,5 +1,5 @@
-#ifndef __SIEVE_EXTPROGRAMS_PLUGIN_H
-#define __SIEVE_EXTPROGRAMS_PLUGIN_H
+#ifndef SIEVE_EXTPROGRAMS_PLUGIN_H
+#define SIEVE_EXTPROGRAMS_PLUGIN_H
 
 /*
  * Plugin interface
@@ -17,4 +17,4 @@ void sieve_extprograms_plugin_unload
 void sieve_extprograms_plugin_init(void);
 void sieve_extprograms_plugin_deinit(void);
 
-#endif /* __SIEVE_EXTPROGRAMS_PLUGIN_H */
+#endif
diff --git a/src/testsuite/testsuite-arguments.h b/src/testsuite/testsuite-arguments.h
index ff06444137744b5a49b6fb6f5aa82d1454696251..22ab82b1b1456f66a2b2321a56e9139af13836aa 100644
--- a/src/testsuite/testsuite-arguments.h
+++ b/src/testsuite/testsuite-arguments.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_ARGUMENTS_H
-#define __TESTSUITE_ARGUMENTS_H
+#ifndef TESTSUITE_ARGUMENTS_H
+#define TESTSUITE_ARGUMENTS_H
 
 extern const struct sieve_argument_def testsuite_string_argument;
 
diff --git a/src/testsuite/testsuite-binary.h b/src/testsuite/testsuite-binary.h
index 028dffb20e6961bea067fe5ec063ae9fea58643c..0a09d2b19fb988f1593c113ae1865c9f83bdb9d1 100644
--- a/src/testsuite/testsuite-binary.h
+++ b/src/testsuite/testsuite-binary.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_BINARY_H
-#define __TESTSUITE_BINARY_H
+#ifndef TESTSUITE_BINARY_H
+#define TESTSUITE_BINARY_H
 
 #include "sieve-common.h"
 
@@ -14,4 +14,4 @@ void testsuite_binary_reset(void);
 bool testsuite_binary_save(struct sieve_binary *sbin, const char *name);
 struct sieve_binary *testsuite_binary_load(const char *name);
 
-#endif /* __TESTSUITE_BINARY_H */
+#endif
diff --git a/src/testsuite/testsuite-common.h b/src/testsuite/testsuite-common.h
index 163a5d5cb20d7326c0ba95e067347983421a150e..29c7a769aa396da0538a54d21e963f5f0d886e27 100644
--- a/src/testsuite/testsuite-common.h
+++ b/src/testsuite/testsuite-common.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_COMMON_H
-#define __TESTSUITE_COMMON_H
+#ifndef TESTSUITE_COMMON_H
+#define TESTSUITE_COMMON_H
 
 #include "sieve-common.h"
 
@@ -183,4 +183,4 @@ void testsuite_init
 	(struct sieve_instance *svinst, const char *test_path, bool log_stdout);
 void testsuite_deinit(void);
 
-#endif /* __TESTSUITE_COMMON_H */
+#endif
diff --git a/src/testsuite/testsuite-log.h b/src/testsuite/testsuite-log.h
index cc47c2455bcd4259807e0517d105c9688db7814d..93f63c4742b661c4867e70f1da68497081571509 100644
--- a/src/testsuite/testsuite-log.h
+++ b/src/testsuite/testsuite-log.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_LOG_H
-#define __TESTSUITE_LOG_H
+#ifndef TESTSUITE_LOG_H
+#define TESTSUITE_LOG_H
 
 #include "sieve-common.h"
 
@@ -22,4 +22,4 @@ void testsuite_log_clear_messages(void);
 struct sieve_stringlist *testsuite_log_stringlist_create
 	(const struct sieve_runtime_env *renv, int index);
 
-#endif /* __TESTSUITE_LOG_H */
+#endif
diff --git a/src/testsuite/testsuite-mailstore.h b/src/testsuite/testsuite-mailstore.h
index 2b7df0d87597aa5c1289051f0393ee59b92b2bf0..dcba916c08dda61fc99117d2a53b07ba7e91bc41 100644
--- a/src/testsuite/testsuite-mailstore.h
+++ b/src/testsuite/testsuite-mailstore.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_MAILSTORE_H
-#define __TESTSUITE_MAILSTORE_H
+#ifndef TESTSUITE_MAILSTORE_H
+#define TESTSUITE_MAILSTORE_H
 
 #include "lib.h"
 
@@ -37,4 +37,4 @@ bool testsuite_mailstore_mail_index
 int testsuite_mailstore_set_imap_metadata
 	(const char *mailbox, const char *annotation, const char *value);
 
-#endif /* __TESTSUITE_MAILSTORE */
+#endif
diff --git a/src/testsuite/testsuite-message.h b/src/testsuite/testsuite-message.h
index 6c20a7c3ca665283727de61d28284df3c629d742..7fb520f5995405c41815d554a44d561b3aad6f3a 100644
--- a/src/testsuite/testsuite-message.h
+++ b/src/testsuite/testsuite-message.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_MESSAGE_H
-#define __TESTSUITE_MESSAGE_H
+#ifndef TESTSUITE_MESSAGE_H
+#define TESTSUITE_MESSAGE_H
 
 #include "lib.h"
 #include "master-service.h"
@@ -40,4 +40,4 @@ void testsuite_envelope_set_orig_recipient
 void testsuite_envelope_set_auth_user
 	(const struct sieve_runtime_env *renv, const char *value);
 
-#endif /* __TESTSUITE_MESSAGE_H */
+#endif
diff --git a/src/testsuite/testsuite-objects.h b/src/testsuite/testsuite-objects.h
index d2d454dec8d5578efe6837ef092709a6746c574e..0aa6f4f82912111314d88124c3c5113e0d31ce61 100644
--- a/src/testsuite/testsuite-objects.h
+++ b/src/testsuite/testsuite-objects.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_OBJECTS_H
-#define __TESTSUITE_OBJECTS_H
+#ifndef TESTSUITE_OBJECTS_H
+#define TESTSUITE_OBJECTS_H
 
 #include "sieve-common.h"
 #include "sieve-objects.h"
@@ -80,4 +80,4 @@ const char *testsuite_object_member_name
 extern const struct testsuite_object_def message_testsuite_object;
 extern const struct testsuite_object_def envelope_testsuite_object;
 
-#endif /* __TESTSUITE_OBJECTS_H */
+#endif
diff --git a/src/testsuite/testsuite-result.h b/src/testsuite/testsuite-result.h
index aafc776a09833984a4afec83ab9e079f8b623e95..9b83b80334abd88b965129b3c167aa71f8f18818 100644
--- a/src/testsuite/testsuite-result.h
+++ b/src/testsuite/testsuite-result.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_RESULT_H
-#define __TESTSUITE_RESULT_H
+#ifndef TESTSUITE_RESULT_H
+#define TESTSUITE_RESULT_H
 
 void testsuite_result_init(void);
 void testsuite_result_deinit(void);
@@ -19,4 +19,4 @@ void testsuite_result_print
 struct sieve_stringlist *testsuite_result_stringlist_create
 	(const struct sieve_runtime_env *renv, int index);
 
-#endif /* __TESTSUITE_RESULT_H */
+#endif
diff --git a/src/testsuite/testsuite-script.h b/src/testsuite/testsuite-script.h
index 49519b26fa2db8a476755196d0bbd58a91f17808..e2adf3a3d3d2670527bd31c38fad380103f786a0 100644
--- a/src/testsuite/testsuite-script.h
+++ b/src/testsuite/testsuite-script.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_SCRIPT_H
-#define __TESTSUITE_SCRIPT_H
+#ifndef TESTSUITE_SCRIPT_H
+#define TESTSUITE_SCRIPT_H
 
 #include "sieve-common.h"
 
@@ -19,4 +19,4 @@ bool testsuite_script_multiscript
 struct sieve_binary *testsuite_script_get_binary(const struct sieve_runtime_env *renv);
 void testsuite_script_set_binary(const struct sieve_runtime_env *renv, struct sieve_binary *sbin);
 
-#endif /* __TESTSUITE_SCRIPT_H */
+#endif
diff --git a/src/testsuite/testsuite-settings.h b/src/testsuite/testsuite-settings.h
index e3ec59e6a16c9c3b38e805237d89ec52e4050fe4..b84e62095371944cb74f7a92e6ca1a3854a6bab6 100644
--- a/src/testsuite/testsuite-settings.h
+++ b/src/testsuite/testsuite-settings.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_SETTINGS_H
-#define __TESTSUITE_SETTINGS_H
+#ifndef TESTSUITE_SETTINGS_H
+#define TESTSUITE_SETTINGS_H
 
 #include "sieve-common.h"
 
@@ -9,4 +9,4 @@ void testsuite_settings_deinit(void);
 void testsuite_setting_set(const char *identifier, const char *value);
 void testsuite_setting_unset(const char *identifier);
 
-#endif /* __TESTSUITE_SETTINGS_H */
+#endif
diff --git a/src/testsuite/testsuite-smtp.h b/src/testsuite/testsuite-smtp.h
index a3f92dfbfb2778699648aed2fec5dc782a2bb2ee..0b120b25c5d55b4714dfb6a25a801e1ce131167d 100644
--- a/src/testsuite/testsuite-smtp.h
+++ b/src/testsuite/testsuite-smtp.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_SMTP_H
-#define __TESTSUITE_SMTP_H
+#ifndef TESTSUITE_SMTP_H
+#define TESTSUITE_SMTP_H
 
 void testsuite_smtp_init(void);
 void testsuite_smtp_deinit(void);
@@ -32,4 +32,4 @@ int testsuite_smtp_finish
 bool testsuite_smtp_get
 	(const struct sieve_runtime_env *renv, unsigned int index);
 
-#endif /* __TESTSUITE_SMTP_H */
+#endif
diff --git a/src/testsuite/testsuite-substitutions.h b/src/testsuite/testsuite-substitutions.h
index 087dc3452214d063e541cff0709ffab8e03b80cd..8b256d02534e1cc9bff12bc4eb89b38e0fe351ac 100644
--- a/src/testsuite/testsuite-substitutions.h
+++ b/src/testsuite/testsuite-substitutions.h
@@ -1,5 +1,5 @@
-#ifndef __TESTSUITE_SUBSTITUTIONS_H
-#define __TESTSUITE_SUBSTITUTIONS_H
+#ifndef TESTSUITE_SUBSTITUTIONS_H
+#define TESTSUITE_SUBSTITUTIONS_H
 
 #include "sieve-common.h"
 #include "sieve-objects.h"
@@ -20,4 +20,4 @@ struct sieve_ast_argument *testsuite_substitution_argument_create
 	(struct sieve_validator *valdtr, struct sieve_ast *ast,
 		unsigned int source_line, const char *substitution, const char *param);
 
-#endif /* __TESTSUITE_SUBSTITUTIONS_H */
+#endif
diff --git a/src/testsuite/testsuite-variables.h b/src/testsuite/testsuite-variables.h
index acbc06da82d9c36bbaf4650e914b52fad1b1b27c..60f6b18adb88a1a292730b3f1596c7ffa74b46fe 100644
--- a/src/testsuite/testsuite-variables.h
+++ b/src/testsuite/testsuite-variables.h
@@ -1,11 +1,11 @@
-#ifndef __TESTSUITE_VARIABLES_H
-#define __TESTSUITE_VARIABLES_H
+#ifndef TESTSUITE_VARIABLES_H
+#define TESTSUITE_VARIABLES_H
 
 extern const struct sieve_operand_def testsuite_namespace_operand;
 
 void testsuite_variables_init
 	(const struct sieve_extension *this_ext, struct sieve_validator *valdtr);
 
-#endif /* __TESTSUITE_VARIABLES_H */
+#endif