diff --git a/src/lib-managesieve/managesieve-arg.h b/src/lib-managesieve/managesieve-arg.h
index 9518b2761..5bec2e1cd 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 07410a388..386d6ca4f 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 88197eb1b..cae5491a4 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 146f9f30b..71e3fe0e2 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 0dcfffaee..1464e7473 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 0387eee30..290ca136d 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 7b239572d..faf19dcb5 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 e53f8a1dd..116af3e05 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 36cb641db..57a77a00d 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 e9cb282ab..af7eb45ab 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 0193268ca..a8e834bb7 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 8588fb5b7..cfd21b909 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 5ee0a8459..aac48df6c 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 46a575dbb..4120c6eed 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 9ed7ed275..24e4bddab 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 10d003c9b..a1f7d576a 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 5c5f95345..8ae0d18e2 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 e95e058fd..418f07877 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 44832bdb3..371d03d59 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 a8046cc0e..4bedb8503 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 17b97aa86..b38a3c8d7 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 b2d355239..066df2f59 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 93729ef61..38fc92a40 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 38385d2af..37246c0aa 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 df7e96dfe..d5927b297 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 73d066ca2..7ce324451 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 d68be19c8..96cff3973 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 98112e6d7..f7fa4cf26 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 6ed8e0aad..a4b25a081 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 a646f4ca7..8b0054d56 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 1b457437f..38b0e210a 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 4738a7b52..5fab7cb47 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 f22b47009..e9d809f51 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 bc09f81ec..cd176cbae 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 57e7a41dc..331a6373f 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 7b4f09e1a..f93b6e2a2 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 cf5b45e28..87413c8fb 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 aca703c77..95c7aebe5 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 d82e84efb..da72a5d7d 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 969ffaa65..61260c822 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 383b426cf..d8fa3b60f 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 729761274..289a978e7 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 427f1598b..a687582b7 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 e034bada8..64a7781c6 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 561bdea93..f6ff5664c 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 24d150750..88ae3dbbd 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 76fc85f94..980c8305d 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 7b006efe7..11a375757 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 711560bd3..62f964fd6 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 86b333e70..c774dc355 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 4088d1a24..fac4b496e 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 6c4b7dc25..704551d06 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 04ba25962..f1d01e3fe 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 8d7c5405b..934f939da 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 8095bf7a5..950fac9b8 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 04eee3081..9240dfd13 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 1c8d6b2e7..651bd11c2 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 12a288d7a..00bf68bdd 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 a16c10f17..f9b83e388 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 f3a89b338..f6c604e3f 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 254c88b4a..fdfb9ee61 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 0a65e6303..3f1045c1b 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 4477aaa04..d70487775 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 a1bfe1a1c..df9369ac5 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 0c664ffb4..8cea2b99f 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 2dbbe4d26..961cf41a6 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 1828c747e..0fbe90726 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 e7608098c..e257e1a67 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 78bad9d17..d11bfe3b5 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 55e7f51e5..355115881 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 33f6d71be..0417e2cbb 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 ee3954f93..d4d726fc1 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 2b5efc96d..4cb77ccb4 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 1ae0ea7b6..e3f300f69 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 0c2e0d330..896b75648 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 a9b6dee15..996af41ce 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 6ed54ed08..86230a76e 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 2d918fe31..b165586ac 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 0b3ad4065..1657641f2 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 d665af83d..7f1edff72 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 5ee57140c..0281114cc 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 26d3eb64a..c6541e49e 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 5b2ec6432..f7b9c8427 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 23bc7d9b4..9cdb877f7 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 245b1e7de..16da8d68e 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 50cb56518..1909b7a8b 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 2ea9c3310..b5cbbf4d1 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 abb6ca706..cd82c9844 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 d80fcaa7f..d36904397 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 efd7f3387..1f9222177 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 708bcc961..7e5e064ef 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 95726d1a4..f97cebabb 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 b81223806..7e21280a4 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 1292c1765..02266a932 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 63aa944d1..1280ad50c 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 76180b280..d2a4dff4a 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 02f606833..ebefe1a97 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 36afabcba..c6f4826e0 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 6d8230f56..3ead2d5b0 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 7d6866b4a..b7503a993 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 50982bdc4..003667cd1 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 941be02ba..d922b74b3 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 df07b0102..7c3b5457a 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 e65a1a916..4e8de11f7 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 5d3375146..194984557 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 ce238ccd3..12967017e 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 734c5c0e5..6e9446d14 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 9f0d408dc..d3e69cd1f 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 1011f0496..f96860fc3 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 f84689af6..c865e7d05 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 f63d86403..fcf9777f4 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 5c3198528..ff74b0b96 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 d2a54f80d..235709753 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 f9b99ae83..7e783f5cb 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 98fb88f38..20fa55aee 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 ff0644413..22ab82b1b 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 028dffb20..0a09d2b19 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 163a5d5cb..29c7a769a 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 cc47c2455..93f63c474 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 2b7df0d87..dcba916c0 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 6c20a7c3c..7fb520f59 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 d2d454dec..0aa6f4f82 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 aafc776a0..9b83b8033 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 49519b26f..e2adf3a3d 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 e3ec59e6a..b84e62095 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 a3f92dfbf..0b120b25c 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 087dc3452..8b256d025 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 acbc06da8..60f6b18ad 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