changeset 6410:e4eb71ae8e96 HEAD

Changed .h ifdef/defines to use <NAME>_H format.
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 11:31:27 +0300
parents 7f733ba453bf
children 6a64e64fa3a3
files src/auth/auth-cache.h src/auth/auth-client-connection.h src/auth/auth-client-interface.h src/auth/auth-master-connection.h src/auth/auth-master-interface.h src/auth/auth-master-listener.h src/auth/auth-request-handler.h src/auth/auth-request.h src/auth/auth-stream.h src/auth/auth-worker-client.h src/auth/auth-worker-server.h src/auth/auth.h src/auth/common.h src/auth/db-ldap.h src/auth/db-passwd-file.h src/auth/db-sql.h src/auth/mech.h src/auth/mycrypt.h src/auth/otp-skey-common.h src/auth/passdb-blocking.h src/auth/passdb-cache.h src/auth/passdb.h src/auth/password-scheme.h src/auth/plain-common.h src/auth/userdb-blocking.h src/auth/userdb-static.h src/auth/userdb-vpopmail.h src/auth/userdb.h src/deliver/auth-client.h src/deliver/deliver.h src/deliver/duplicate.h src/deliver/mail-send.h src/deliver/smtp-client.h src/dict/dict-cache.h src/dict/dict-server.h src/imap-login/client-authenticate.h src/imap-login/client.h src/imap-login/imap-proxy.h src/imap/client.h src/imap/commands-util.h src/imap/commands.h src/imap/common.h src/imap/imap-expunge.h src/imap/imap-fetch.h src/imap/imap-messageset.h src/imap/imap-search.h src/imap/imap-sort.h src/imap/imap-status.h src/imap/imap-sync.h src/imap/imap-thread.h src/lib-auth/auth-client.h src/lib-auth/auth-server-connection.h src/lib-auth/auth-server-request.h src/lib-charset/charset-utf8.h src/lib-dict/dict-client.h src/lib-dict/dict-private.h src/lib-dict/dict-sql.h src/lib-dict/dict.h src/lib-imap/imap-base-subject.h src/lib-imap/imap-bodystructure.h src/lib-imap/imap-date.h src/lib-imap/imap-envelope.h src/lib-imap/imap-match.h src/lib-imap/imap-parser.h src/lib-imap/imap-quote.h src/lib-imap/imap-util.h src/lib-index/mail-cache-private.h src/lib-index/mail-cache.h src/lib-index/mail-hash.h src/lib-index/mail-index-private.h src/lib-index/mail-index-sync-private.h src/lib-index/mail-index-transaction-private.h src/lib-index/mail-index-view-private.h src/lib-index/mail-index.h src/lib-index/mail-transaction-log-private.h src/lib-index/mail-transaction-log.h src/lib-index/mailbox-list-index-private.h src/lib-index/mailbox-list-index.h src/lib-mail/istream-header-filter.h src/lib-mail/mail-types.h src/lib-mail/message-address.h src/lib-mail/message-date.h src/lib-mail/message-decoder.h src/lib-mail/message-header-decode.h src/lib-mail/message-header-parser.h src/lib-mail/message-id.h src/lib-mail/message-parser.h src/lib-mail/message-part-serialize.h src/lib-mail/message-search.h src/lib-mail/message-send.h src/lib-mail/message-size.h src/lib-mail/quoted-printable.h src/lib-mail/rfc822-parser.h src/lib-ntlm/ntlm-byteorder.h src/lib-ntlm/ntlm-des.h src/lib-ntlm/ntlm-encrypt.h src/lib-ntlm/ntlm-flags.h src/lib-ntlm/ntlm-message.h src/lib-ntlm/ntlm-types.h src/lib-ntlm/ntlm.h src/lib-otp/otp-dictionary.h src/lib-otp/otp-hash.h src/lib-otp/otp-parity.h src/lib-otp/otp-parse.h src/lib-otp/otp.h src/lib-settings/settings.h src/lib-sql/sql-api-private.h src/lib-sql/sql-api.h src/lib-storage/index/cydir/cydir-storage.h src/lib-storage/index/cydir/cydir-sync.h src/lib-storage/index/dbox/dbox-file.h src/lib-storage/index/dbox/dbox-index.h src/lib-storage/index/dbox/dbox-storage.h src/lib-storage/index/dbox/dbox-sync.h src/lib-storage/index/index-mail.h src/lib-storage/index/index-sort.h src/lib-storage/index/index-storage.h src/lib-storage/index/index-sync-changes.h src/lib-storage/index/maildir/maildir-filename.h src/lib-storage/index/maildir/maildir-keywords.h src/lib-storage/index/maildir/maildir-storage.h src/lib-storage/index/maildir/maildir-sync.h src/lib-storage/index/maildir/maildir-uidlist.h src/lib-storage/index/mbox/istream-raw-mbox.h src/lib-storage/index/mbox/mbox-file.h src/lib-storage/index/mbox/mbox-from.h src/lib-storage/index/mbox/mbox-lock.h src/lib-storage/index/mbox/mbox-md5.h src/lib-storage/index/mbox/mbox-storage.h src/lib-storage/index/mbox/mbox-sync-private.h src/lib-storage/list/index-mailbox-list.h src/lib-storage/list/mailbox-list-fs.h src/lib-storage/list/mailbox-list-maildir.h src/lib-storage/list/mailbox-list-subscriptions.h src/lib-storage/list/subscription-file.h src/lib-storage/mail-copy.h src/lib-storage/mail-error.h src/lib-storage/mail-namespace.h src/lib-storage/mail-search.h src/lib-storage/mail-storage-private.h src/lib-storage/mail-storage.h src/lib-storage/mailbox-list-private.h src/lib-storage/mailbox-list.h src/lib-storage/mailbox-tree.h src/lib/array-decl.h src/lib/array.h src/lib/backtrace-string.h src/lib/base64.h src/lib/bsearch-insert-pos.h src/lib/buffer.h src/lib/close-keep-errno.h src/lib/compat.h src/lib/crc32.h src/lib/data-stack.h src/lib/env-util.h src/lib/failures.h src/lib/fd-close-on-exec.h src/lib/fd-set-nonblock.h src/lib/fdpass.h src/lib/file-cache.h src/lib/file-copy.h src/lib/file-dotlock.h src/lib/file-lock.h src/lib/file-set-size.h src/lib/hash.h src/lib/hex-binary.h src/lib/hex-dec.h src/lib/hmac-md5.h src/lib/home-expand.h src/lib/hostpid.h src/lib/imem.h src/lib/ioloop-internal.h src/lib/ioloop-iolist.h src/lib/ioloop-notify-fd.h src/lib/ioloop.h src/lib/iostream-internal.h src/lib/istream-internal.h src/lib/istream-seekable.h src/lib/istream-tee.h src/lib/istream.h src/lib/lib-signals.h src/lib/lib.h src/lib/macros.h src/lib/md4.h src/lib/md5.h src/lib/mempool.h src/lib/mkdir-parents.h src/lib/mmap-util.h src/lib/module-context.h src/lib/module-dir.h src/lib/mountpoint.h src/lib/network.h src/lib/nfs-workarounds.h src/lib/ostream-crlf.h src/lib/ostream-internal.h src/lib/ostream.h src/lib/primes.h src/lib/printf-format-fix.h src/lib/process-title.h src/lib/randgen.h src/lib/read-full.h src/lib/restrict-access.h src/lib/restrict-process-size.h src/lib/safe-memset.h src/lib/safe-mkdir.h src/lib/safe-mkstemp.h src/lib/sendfile-util.h src/lib/seq-range-array.h src/lib/sha1.h src/lib/str-find.h src/lib/str-sanitize.h src/lib/str.h src/lib/strescape.h src/lib/strfuncs.h src/lib/unichar.h src/lib/unix-socket-create.h src/lib/unlink-directory.h src/lib/unlink-lockfiles.h src/lib/utc-mktime.h src/lib/utc-offset.h src/lib/var-expand.h src/lib/write-full.h src/login-common/client-common.h src/login-common/common.h src/login-common/login-proxy.h src/login-common/master.h src/login-common/sasl-server.h src/login-common/ssl-proxy.h src/master/askpass.h src/master/auth-process.h src/master/capabilities.h src/master/child-process.h src/master/common.h src/master/dict-process.h src/master/dup2-array.h src/master/listener.h src/master/log.h src/master/login-process.h src/master/mail-process.h src/master/master-login-interface.h src/master/master-settings.h src/master/ssl-init.h src/master/syslog-util.h src/plugins/acl/acl-api-private.h src/plugins/acl/acl-api.h src/plugins/acl/acl-backend-vfile.h src/plugins/acl/acl-cache.h src/plugins/acl/acl-plugin.h src/plugins/convert/convert-plugin.h src/plugins/convert/convert-storage.h src/plugins/expire/auth-client.h src/plugins/expire/expire-env.h src/plugins/expire/expire-plugin.h src/plugins/fts-lucene/fts-lucene-plugin.h src/plugins/fts-lucene/lucene-wrapper.h src/plugins/fts-squat/fts-squat-plugin.h src/plugins/fts-squat/squat-trie-private.h src/plugins/fts-squat/squat-trie.h src/plugins/fts-squat/squat-uidlist.h src/plugins/fts/fts-api-private.h src/plugins/fts/fts-api.h src/plugins/fts/fts-plugin.h src/plugins/imap-quota/imap-quota-plugin.h src/plugins/lazy-expunge/lazy-expunge-plugin.h src/plugins/mail-log/mail-log-plugin.h src/plugins/mbox-snarf/mbox-snarf-plugin.h src/plugins/quota/quota-fs.h src/plugins/quota/quota-plugin.h src/plugins/quota/quota-private.h src/plugins/quota/quota.h src/plugins/trash/trash-plugin.h src/plugins/zlib/istream-zlib.h src/plugins/zlib/zlib-plugin.h src/pop3-login/client-authenticate.h src/pop3-login/client.h src/pop3-login/pop3-proxy.h src/pop3/capability.h src/pop3/client.h src/pop3/commands.h src/pop3/common.h
diffstat 280 files changed, 576 insertions(+), 576 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CACHE_H
-#define __AUTH_CACHE_H
+#ifndef AUTH_CACHE_H
+#define AUTH_CACHE_H
 
 struct auth_cache_node {
 	struct auth_cache_node *prev, *next;
--- a/src/auth/auth-client-connection.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-client-connection.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CLIENT_CONNECTION_H
-#define __AUTH_CLIENT_CONNECTION_H
+#ifndef AUTH_CLIENT_CONNECTION_H
+#define AUTH_CLIENT_CONNECTION_H
 
 struct auth_client_connection {
 	struct auth *auth;
--- a/src/auth/auth-client-interface.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-client-interface.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CLIENT_INTERFACE_H
-#define __AUTH_CLIENT_INTERFACE_H
+#ifndef AUTH_CLIENT_INTERFACE_H
+#define AUTH_CLIENT_INTERFACE_H
 
 /* Major version changes are not backwards compatible,
    minor version numbers can be ignored. */
--- a/src/auth/auth-master-connection.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-master-connection.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_MASTER_CONNECTION_H
-#define __AUTH_MASTER_CONNECTION_H
+#ifndef AUTH_MASTER_CONNECTION_H
+#define AUTH_MASTER_CONNECTION_H
 
 struct auth_master_connection {
 	struct auth_master_listener *listener;
--- a/src/auth/auth-master-interface.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-master-interface.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_MASTER_INTERFACE_H
-#define __AUTH_MASTER_INTERFACE_H
+#ifndef AUTH_MASTER_INTERFACE_H
+#define AUTH_MASTER_INTERFACE_H
 
 /* Major version changes are not backwards compatible,
    minor version numbers can be ignored. */
--- a/src/auth/auth-master-listener.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-master-listener.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_MASTER_LISTENER_H
-#define __AUTH_MASTER_LISTENER_H
+#ifndef AUTH_MASTER_LISTENER_H
+#define AUTH_MASTER_LISTENER_H
 
 enum listener_type {
 	LISTENER_MASTER,
--- a/src/auth/auth-request-handler.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-request-handler.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_REQUEST_HANDLER_H
-#define __AUTH_REQUEST_HANDLER_H
+#ifndef AUTH_REQUEST_HANDLER_H
+#define AUTH_REQUEST_HANDLER_H
 
 struct auth_request;
 struct auth_master_connection;
--- a/src/auth/auth-request.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-request.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_REQUEST_H
-#define __AUTH_REQUEST_H
+#ifndef AUTH_REQUEST_H
+#define AUTH_REQUEST_H
 
 #include "network.h"
 #include "mech.h"
--- a/src/auth/auth-stream.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-stream.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_STREAM_H
-#define __AUTH_STREAM_H
+#ifndef AUTH_STREAM_H
+#define AUTH_STREAM_H
 
 struct auth_request;
 
--- a/src/auth/auth-worker-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-worker-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_WORKER_CLIENT_H
-#define __AUTH_WORKER_CLIENT_H
+#ifndef AUTH_WORKER_CLIENT_H
+#define AUTH_WORKER_CLIENT_H
 
 #define AUTH_WORKER_MAX_LINE_LENGTH 1024
 
--- a/src/auth/auth-worker-server.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth-worker-server.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_WORKER_SERVER_H
-#define __AUTH_WORKER_SERVER_H
+#ifndef AUTH_WORKER_SERVER_H
+#define AUTH_WORKER_SERVER_H
 
 struct auth_request;
 
--- a/src/auth/auth.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/auth.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_H
-#define __AUTH_H
+#ifndef AUTH_H
+#define AUTH_H
 
 #define PASSWORD_HIDDEN_STR "<hidden>"
 
--- a/src/auth/common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "lib.h"
 #include "auth.h"
--- a/src/auth/db-ldap.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/db-ldap.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DB_LDAP_H
-#define __DB_LDAP_H
+#ifndef DB_LDAP_H
+#define DB_LDAP_H
 
 /* Functions like ldap_bind() have been deprecated in OpenLDAP 2.3
    This define enables them until the code here can be refactored */
--- a/src/auth/db-passwd-file.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/db-passwd-file.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DB_PASSWD_FILE_H
-#define __DB_PASSWD_FILE_H
+#ifndef DB_PASSWD_FILE_H
+#define DB_PASSWD_FILE_H
 
 #define PASSWD_FILE_DEFAULT_USERNAME_FORMAT "%u"
 #define PASSWD_FILE_DEFAULT_SCHEME "CRYPT"
--- a/src/auth/db-sql.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/db-sql.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DB_SQL_H
-#define __DB_SQL_H
+#ifndef DB_SQL_H
+#define DB_SQL_H
 
 #include "sql-api.h"
 
--- a/src/auth/mech.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/mech.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MECH_H
-#define __MECH_H
+#ifndef MECH_H
+#define MECH_H
 
 #include "auth-client-interface.h"
 
--- a/src/auth/mycrypt.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/mycrypt.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MYCRYPT_H
-#define __MYCRYPT_H
+#ifndef MYCRYPT_H
+#define MYCRYPT_H
 
 /* A simple wrapper to crypt(). Problem with it is that it requires
    _XOPEN_SOURCE define which breaks other things. */
--- a/src/auth/otp-skey-common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/otp-skey-common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OTP_SKEY_COMMON_H__
-#define __OTP_SKEY_COMMON_H__
+#ifndef OTP_SKEY_COMMON_H
+#define OTP_SKEY_COMMON_H
 
 struct otp_auth_request {
 	struct auth_request auth_request;
@@ -19,4 +19,4 @@
 				  struct auth_request *auth_request);
 void mech_otp_skey_auth_free(struct auth_request *auth_request);
 
-#endif	/* __OTP_SKEY_COMMON_H__ */
+#endif
--- a/src/auth/passdb-blocking.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/passdb-blocking.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PASSDB_BLOCKING_H
-#define __PASSDB_BLOCKING_H
+#ifndef PASSDB_BLOCKING_H
+#define PASSDB_BLOCKING_H
 
 void passdb_blocking_verify_plain(struct auth_request *request);
 void passdb_blocking_lookup_credentials(struct auth_request *request);
--- a/src/auth/passdb-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/passdb-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PASSDB_CACHE_H
-#define __PASSDB_CACHE_H
+#ifndef PASSDB_CACHE_H
+#define PASSDB_CACHE_H
 
 #include "auth-cache.h"
 
--- a/src/auth/passdb.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/passdb.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PASSDB_H
-#define __PASSDB_H
+#ifndef PASSDB_H
+#define PASSDB_H
 
 #define IS_VALID_PASSWD(pass) \
 	((pass)[0] != '\0' && (pass)[0] != '*' && (pass)[0] != '!')
--- a/src/auth/password-scheme.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/password-scheme.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PASSWORD_SCHEME_H
-#define __PASSWORD_SCHEME_H
+#ifndef PASSWORD_SCHEME_H
+#define PASSWORD_SCHEME_H
 
 enum password_encoding {
 	PW_ENCODING_NONE,
--- a/src/auth/plain-common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/plain-common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,7 +1,7 @@
-#ifndef __PLAIN_COMMON_H__
-#define __PLAIN_COMMON_H__
+#ifndef PLAIN_COMMON_H
+#define PLAIN_COMMON_H
 
 void plain_verify_callback(enum passdb_result result,
 			   struct auth_request *request);
 
-#endif	/* __PLAIN_COMMON_H__ */
+#endif
--- a/src/auth/userdb-blocking.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/userdb-blocking.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __USERDB_BLOCKING_H
-#define __USERDB_BLOCKING_H
+#ifndef USERDB_BLOCKING_H
+#define USERDB_BLOCKING_H
 
 void userdb_blocking_lookup(struct auth_request *request);
 
--- a/src/auth/userdb-static.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/userdb-static.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __USERDB_STATIC_H
-#define __USERDB_STATIC_H
+#ifndef USERDB_STATIC_H
+#define USERDB_STATIC_H
 
 struct userdb_static_template *
 userdb_static_template_build(pool_t pool, const char *userdb_name,
--- a/src/auth/userdb-vpopmail.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/userdb-vpopmail.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __USERDB_VPOPMAIL_H
-#define __USERDB_VPOPMAIL_H
+#ifndef USERDB_VPOPMAIL_H
+#define USERDB_VPOPMAIL_H
 
 #include <stdio.h>
 #include <vpopmail.h>
--- a/src/auth/userdb.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/auth/userdb.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __USERDB_H
-#define __USERDB_H
+#ifndef USERDB_H
+#define USERDB_H
 
 #include "auth-stream.h"
 
--- a/src/deliver/auth-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/deliver/auth-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CLIENT_H
-#define __AUTH_CLIENT_H
+#ifndef AUTH_CLIENT_H
+#define AUTH_CLIENT_H
 
 int auth_client_lookup_and_restrict(struct ioloop *ioloop,
 				    const char *auth_socket,
--- a/src/deliver/deliver.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/deliver/deliver.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DELIVER_H
-#define __DELIVER_H
+#ifndef DELIVER_H
+#define DELIVER_H
 
 #include <sysexits.h>
 
--- a/src/deliver/duplicate.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/deliver/duplicate.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DUPLICATE_H
-#define __DUPLICATE_H
+#ifndef DUPLICATE_H
+#define DUPLICATE_H
 
 #define DUPLICATE_DEFAULT_KEEP (3600 * 24)
 
--- a/src/deliver/mail-send.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/deliver/mail-send.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_SEND_H
-#define __MAIL_SEND_H
+#ifndef MAIL_SEND_H
+#define MAIL_SEND_H
 
 struct mail;
 
--- a/src/deliver/smtp-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/deliver/smtp-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SMTP_CLIENT_H
-#define __SMTP_CLIENT_H
+#ifndef SMTP_CLIENT_H
+#define SMTP_CLIENT_H
 
 #include <stdio.h>
 
--- a/src/dict/dict-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/dict/dict-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_CACHE_H
-#define __DICT_CACHE_H
+#ifndef DICT_CACHE_H
+#define DICT_CACHE_H
 
 struct dict_cache *dict_cache_init(void);
 void dict_cache_deinit(struct dict_cache *cache);
--- a/src/dict/dict-server.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/dict/dict-server.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_SERVER_H
-#define __DICT_SERVER_H
+#ifndef DICT_SERVER_H
+#define DICT_SERVER_H
 
 struct dict;
 
--- a/src/imap-login/client-authenticate.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap-login/client-authenticate.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_AUTHENTICATE_H
-#define __CLIENT_AUTHENTICATE_H
+#ifndef CLIENT_AUTHENTICATE_H
+#define CLIENT_AUTHENTICATE_H
 
 const char *client_authenticate_get_capabilities(bool secured);
 
--- a/src/imap-login/client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap-login/client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_H
-#define __CLIENT_H
+#ifndef CLIENT_H
+#define CLIENT_H
 
 #include "network.h"
 #include "master.h"
--- a/src/imap-login/imap-proxy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap-login/imap-proxy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_PROXY_H
-#define __IMAP_PROXY_H
+#ifndef IMAP_PROXY_H
+#define IMAP_PROXY_H
 
 #include "login-proxy.h"
 
--- a/src/imap/client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_H
-#define __CLIENT_H
+#ifndef CLIENT_H
+#define CLIENT_H
 
 #include "commands.h"
 
--- a/src/imap/commands-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/commands-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMANDS_UTIL_H
-#define __COMMANDS_UTIL_H
+#ifndef COMMANDS_UTIL_H
+#define COMMANDS_UTIL_H
 
 struct msgset_generator_context {
 	string_t *str;
--- a/src/imap/commands.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/commands.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMANDS_H
-#define __COMMANDS_H
+#ifndef COMMANDS_H
+#define COMMANDS_H
 
 struct client_command_context;
 
--- a/src/imap/common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "lib.h"
 #include "client.h"
--- a/src/imap/imap-expunge.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-expunge.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_EXPUNGE_H
-#define __IMAP_EXPUNGE_H
+#ifndef IMAP_EXPUNGE_H
+#define IMAP_EXPUNGE_H
 
 bool imap_expunge(struct mailbox *box, struct mail_search_arg *next_search_arg);
 
--- a/src/imap/imap-fetch.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-fetch.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_FETCH_H
-#define __IMAP_FETCH_H
+#ifndef IMAP_FETCH_H
+#define IMAP_FETCH_H
 
 struct imap_fetch_context;
 
--- a/src/imap/imap-messageset.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-messageset.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_MESSAGESET_H
-#define __IMAP_MESSAGESET_H
+#ifndef IMAP_MESSAGESET_H
+#define IMAP_MESSAGESET_H
 
 struct mail_search_seqset *
 imap_messageset_parse(pool_t pool, const char *messageset);
--- a/src/imap/imap-search.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-search.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_SEARCH_H
-#define __IMAP_SEARCH_H
+#ifndef IMAP_SEARCH_H
+#define IMAP_SEARCH_H
 
 struct imap_arg;
 struct mailbox;
--- a/src/imap/imap-sort.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-sort.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_SORT_H
-#define __IMAP_SORT_H
+#ifndef IMAP_SORT_H
+#define IMAP_SORT_H
 
 int imap_sort(struct client_command_context *cmd, const char *charset,
 	      struct mail_search_arg *args,
--- a/src/imap/imap-status.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-status.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_STATUS_H
-#define __IMAP_STATUS_H
+#ifndef IMAP_STATUS_H
+#define IMAP_STATUS_H
 
 int imap_status_parse_items(struct client_command_context *cmd,
 			    const struct imap_arg *args,
--- a/src/imap/imap-sync.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-sync.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_SYNC_H
-#define __IMAP_SYNC_H
+#ifndef IMAP_SYNC_H
+#define IMAP_SYNC_H
 
 enum imap_sync_flags {
 	IMAP_SYNC_FLAG_SEND_UID	= 0x01
--- a/src/imap/imap-thread.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/imap/imap-thread.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_THREAD_H
-#define __IMAP_THREAD_H
+#ifndef IMAP_THREAD_H
+#define IMAP_THREAD_H
 
 enum mail_thread_type {
 	MAIL_THREAD_NONE,
--- a/src/lib-auth/auth-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-auth/auth-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CLIENT_H
-#define __AUTH_CLIENT_H
+#ifndef AUTH_CLIENT_H
+#define AUTH_CLIENT_H
 
 #include "network.h"
 #include "../auth/auth-client-interface.h"
--- a/src/lib-auth/auth-server-connection.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-auth/auth-server-connection.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_SERVER_CONNECTION_H
-#define __AUTH_SERVER_CONNECTION_H
+#ifndef AUTH_SERVER_CONNECTION_H
+#define AUTH_SERVER_CONNECTION_H
 
 struct auth_client {
 	unsigned int pid;
--- a/src/lib-auth/auth-server-request.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-auth/auth-server-request.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_SERVER_REQUEST_H
-#define __AUTH_SERVER_REQUEST_H
+#ifndef AUTH_SERVER_REQUEST_H
+#define AUTH_SERVER_REQUEST_H
 
 bool auth_client_input_ok(struct auth_server_connection *conn,
 			  const char *args);
--- a/src/lib-charset/charset-utf8.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-charset/charset-utf8.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CHARSET_UTF8_H
-#define __CHARSET_UTF8_H
+#ifndef CHARSET_UTF8_H
+#define CHARSET_UTF8_H
 
 struct charset_translation;
 
--- a/src/lib-dict/dict-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-dict/dict-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_CLIENT_H
-#define __DICT_CLIENT_H
+#ifndef DICT_CLIENT_H
+#define DICT_CLIENT_H
 
 #include "dict.h"
 
--- a/src/lib-dict/dict-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-dict/dict-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_PRIVATE_H
-#define __DICT_PRIVATE_H
+#ifndef DICT_PRIVATE_H
+#define DICT_PRIVATE_H
 
 #include "dict.h"
 
--- a/src/lib-dict/dict-sql.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-dict/dict-sql.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_SQL_H
-#define __DICT_SQL_H
+#ifndef DICT_SQL_H
+#define DICT_SQL_H
 
 void dict_sql_register(void);
 void dict_sql_unregister(void);
--- a/src/lib-dict/dict.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-dict/dict.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_H
-#define __DICT_H
+#ifndef DICT_H
+#define DICT_H
 
 #define DICT_PATH_PRIVATE "priv/"
 #define DICT_PATH_SHARED "shared/"
--- a/src/lib-imap/imap-base-subject.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-base-subject.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_BASE_SUBJECT_H
-#define __IMAP_BASE_SUBJECT_H
+#ifndef IMAP_BASE_SUBJECT_H
+#define IMAP_BASE_SUBJECT_H
 
 /* Returns the base subject of the given string, according to
    draft-ietf-imapext-sort-10. String is returned so that it's suitable for
--- a/src/lib-imap/imap-bodystructure.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-bodystructure.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_BODYSTRUCTURE_H
-#define __IMAP_BODYSTRUCTURE_H
+#ifndef IMAP_BODYSTRUCTURE_H
+#define IMAP_BODYSTRUCTURE_H
 
 struct message_part;
 struct message_header_line;
--- a/src/lib-imap/imap-date.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-date.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_DATE_H
-#define __IMAP_DATE_H
+#ifndef IMAP_DATE_H
+#define IMAP_DATE_H
 
 /* Parses IMAP date/time string and returns TRUE if the string is valid.
    time_t is filled with UTC date. timezone_offset is filled with parsed
--- a/src/lib-imap/imap-envelope.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-envelope.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_ENVELOPE_H
-#define __IMAP_ENVELOPE_H
+#ifndef IMAP_ENVELOPE_H
+#define IMAP_ENVELOPE_H
 
 struct message_header_line;
 
--- a/src/lib-imap/imap-match.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-match.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_MATCH_H
-#define __IMAP_MATCH_H
+#ifndef IMAP_MATCH_H
+#define IMAP_MATCH_H
 
 enum imap_match_result {
 	IMAP_MATCH_NO 		= 0x00, /* definite non-match */
--- a/src/lib-imap/imap-parser.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-parser.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_PARSER_H
-#define __IMAP_PARSER_H
+#ifndef IMAP_PARSER_H
+#define IMAP_PARSER_H
 
 #include "array.h"
 
--- a/src/lib-imap/imap-quote.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-quote.h	Sun Sep 16 11:31:27 2007 +0300
@@ -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
--- a/src/lib-imap/imap-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-imap/imap-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_UTIL_H
-#define __IMAP_UTIL_H
+#ifndef IMAP_UTIL_H
+#define IMAP_UTIL_H
 
 /* Write flags as a space separated string. */
 void imap_write_flags(string_t *dest, enum mail_flags flags,
--- a/src/lib-index/mail-cache-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-cache-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_CACHE_PRIVATE_H
-#define __MAIL_CACHE_PRIVATE_H
+#ifndef MAIL_CACHE_PRIVATE_H
+#define MAIL_CACHE_PRIVATE_H
 
 #include "file-dotlock.h"
 #include "mail-index-private.h"
--- a/src/lib-index/mail-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_CACHE_H
-#define __MAIL_CACHE_H
+#ifndef MAIL_CACHE_H
+#define MAIL_CACHE_H
 
 #include "mail-index.h"
 
--- a/src/lib-index/mail-hash.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-hash.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_HASH_H
-#define __MAIL_HASH_H
+#ifndef MAIL_HASH_H
+#define MAIL_HASH_H
 
 #include "hash.h"
 
--- a/src/lib-index/mail-index-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-index-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_INDEX_PRIVATE_H
-#define __MAIL_INDEX_PRIVATE_H
+#ifndef MAIL_INDEX_PRIVATE_H
+#define MAIL_INDEX_PRIVATE_H
 
 #include "file-lock.h"
 #include "mail-index.h"
--- a/src/lib-index/mail-index-sync-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-index-sync-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_INDEX_SYNC_PRIVATE_H
-#define __MAIL_INDEX_SYNC_PRIVATE_H
+#ifndef MAIL_INDEX_SYNC_PRIVATE_H
+#define MAIL_INDEX_SYNC_PRIVATE_H
 
 #include "mail-transaction-log.h"
 
--- a/src/lib-index/mail-index-transaction-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-index-transaction-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_INDEX_TRANSACTION_PRIVATE_H
-#define __MAIL_INDEX_TRANSACTION_PRIVATE_H
+#ifndef MAIL_INDEX_TRANSACTION_PRIVATE_H
+#define MAIL_INDEX_TRANSACTION_PRIVATE_H
 
 #include "seq-range-array.h"
 #include "mail-transaction-log.h"
--- a/src/lib-index/mail-index-view-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-index-view-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_INDEX_VIEW_PRIVATE_H
-#define __MAIL_INDEX_VIEW_PRIVATE_H
+#ifndef MAIL_INDEX_VIEW_PRIVATE_H
+#define MAIL_INDEX_VIEW_PRIVATE_H
 
 #include "mail-index-private.h"
 
--- a/src/lib-index/mail-index.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-index.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_INDEX_H
-#define __MAIL_INDEX_H
+#ifndef MAIL_INDEX_H
+#define MAIL_INDEX_H
 
 #include "mail-types.h"
 #include "seq-range-array.h"
--- a/src/lib-index/mail-transaction-log-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-transaction-log-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_TRANSACTION_LOG_VIEW_H
-#define __MAIL_TRANSACTION_LOG_VIEW_H
+#ifndef MAIL_TRANSACTION_LOG_VIEW_H
+#define MAIL_TRANSACTION_LOG_VIEW_H
 
 #include "file-dotlock.h"
 #include "mail-transaction-log.h"
--- a/src/lib-index/mail-transaction-log.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mail-transaction-log.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_TRANSACTION_LOG_H
-#define __MAIL_TRANSACTION_LOG_H
+#ifndef MAIL_TRANSACTION_LOG_H
+#define MAIL_TRANSACTION_LOG_H
 
 #define MAIL_TRANSACTION_LOG_MAJOR_VERSION 1
 #define MAIL_TRANSACTION_LOG_MINOR_VERSION 0
--- a/src/lib-index/mailbox-list-index-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mailbox-list-index-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_INDEX_PRIVATE_H
-#define __MAILBOX_LIST_INDEX_PRIVATE_H
+#ifndef MAILBOX_LIST_INDEX_PRIVATE_H
+#define MAILBOX_LIST_INDEX_PRIVATE_H
 
 #include "file-dotlock.h"
 #include "mailbox-list-index.h"
--- a/src/lib-index/mailbox-list-index.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-index/mailbox-list-index.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_INDEX_H
-#define __MAILBOX_LIST_INDEX_H
+#ifndef MAILBOX_LIST_INDEX_H
+#define MAILBOX_LIST_INDEX_H
 
 struct mailbox_list_index_view;
 struct mailbox_list_index_sync_ctx;
--- a/src/lib-mail/istream-header-filter.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/istream-header-filter.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_HEADER_FILTER_H
-#define __ISTREAM_HEADER_FILTER_H
+#ifndef ISTREAM_HEADER_FILTER_H
+#define ISTREAM_HEADER_FILTER_H
 
 enum header_filter_flags {
 	/* Include only specified headers in output.*/
--- a/src/lib-mail/mail-types.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/mail-types.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_TYPES_H
-#define __MAIL_TYPES_H
+#ifndef MAIL_TYPES_H
+#define MAIL_TYPES_H
 
 enum mail_flags {
 	MAIL_ANSWERED	= 0x01,
--- a/src/lib-mail/message-address.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-address.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_ADDRESS_H
-#define __MESSAGE_ADDRESS_H
+#ifndef MESSAGE_ADDRESS_H
+#define MESSAGE_ADDRESS_H
 
 /* group: ... ; will be stored like:
    {name = NULL, NULL, "group", NULL}, ..., {NULL, NULL, NULL, NULL}
--- a/src/lib-mail/message-date.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-date.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_DATE
-#define __MESSAGE_DATE
+#ifndef MESSAGE_DATE_H
+#define MESSAGE_DATE_H
 
 /* Parses RFC2822 date/time string. timezone_offset is filled with the
    timezone's difference to UTC in minutes. */
--- a/src/lib-mail/message-decoder.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-decoder.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_DECODER_H
-#define __MESSAGE_DECODER_H
+#ifndef MESSAGE_DECODER_H
+#define MESSAGE_DECODER_H
 
 struct message_block;
 
--- a/src/lib-mail/message-header-decode.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-header-decode.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_HEADER_DECODE_H
-#define __MESSAGE_HEADER_DECODE_H
+#ifndef MESSAGE_HEADER_DECODE_H
+#define MESSAGE_HEADER_DECODE_H
 
 /* Return FALSE if you wish to stop decoding. charset is NULL when it's not
    RFC2047-encoded. */
--- a/src/lib-mail/message-header-parser.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-header-parser.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_HEADER_PARSER_H
-#define __MESSAGE_HEADER_PARSER_H
+#ifndef MESSAGE_HEADER_PARSER_H
+#define MESSAGE_HEADER_PARSER_H
 
 #define IS_LWSP(c) \
 	((c) == ' ' || (c) == '\t')
--- a/src/lib-mail/message-id.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-id.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_ID_H
-#define __MESSAGE_ID_H
+#ifndef MESSAGE_ID_H
+#define MESSAGE_ID_H
 
 /* Returns the next valid message ID from a given Message-ID header.
    The return value is allocated from data stack. */
--- a/src/lib-mail/message-parser.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-parser.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_PARSER_H
-#define __MESSAGE_PARSER_H
+#ifndef MESSAGE_PARSER_H
+#define MESSAGE_PARSER_H
 
 #include "message-header-parser.h"
 #include "message-size.h"
--- a/src/lib-mail/message-part-serialize.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-part-serialize.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_PART_SERIALIZE_H
-#define __MESSAGE_PART_SERIALIZE_H
+#ifndef MESSAGE_PART_SERIALIZE_H
+#define MESSAGE_PART_SERIALIZE_H
 
 struct message_part;
 struct message_size;
--- a/src/lib-mail/message-search.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-search.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_SEARCH_H
-#define __MESSAGE_SEARCH_H
+#ifndef MESSAGE_SEARCH_H
+#define MESSAGE_SEARCH_H
 
 struct message_block;
 struct message_part;
--- a/src/lib-mail/message-send.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-send.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_SEND_H
-#define __MESSAGE_SEND_H
+#ifndef MESSAGE_SEND_H
+#define MESSAGE_SEND_H
 
 struct message_size;
 
--- a/src/lib-mail/message-size.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/message-size.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MESSAGE_SIZE_H
-#define __MESSAGE_SIZE_H
+#ifndef MESSAGE_SIZE_H
+#define MESSAGE_SIZE_H
 
 struct message_size {
 	uoff_t physical_size;
--- a/src/lib-mail/quoted-printable.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/quoted-printable.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __QUOTED_PRINTABLE_H
-#define __QUOTED_PRINTABLE_H
+#ifndef QUOTED_PRINTABLE_H
+#define QUOTED_PRINTABLE_H
 
 /* Translates quoted printable data into binary. dest must be at least the
    size of src, and may be same as src. Decoding errors are ignored.
--- a/src/lib-mail/rfc822-parser.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-mail/rfc822-parser.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __RFC822_PARSER_H
-#define __RFC822_PARSER_H
+#ifndef RFC822_PARSER_H
+#define RFC822_PARSER_H
 
 struct rfc822_parser_context {
 	const unsigned char *data, *end;
--- a/src/lib-ntlm/ntlm-byteorder.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-byteorder.h	Sun Sep 16 11:31:27 2007 +0300
@@ -6,8 +6,8 @@
  * This software is released under the MIT license.
  */
 
-#ifndef __NTLM_BYTEORDER_H__
-#define __NTLM_BYTEORDER_H__
+#ifndef NTLM_BYTEORDER_H
+#define NTLM_BYTEORDER_H
 
 #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
 
@@ -105,4 +105,4 @@
 
 #endif
 
-#endif	/* __NTLM_BYTEORDER_H__ */
+#endif
--- a/src/lib-ntlm/ntlm-des.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-des.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,7 +1,7 @@
-#ifndef __NTLM_DES_H__
-#define __NTLM_DES_H__
+#ifndef NTLM_DES_H
+#define NTLM_DES_H
 
 unsigned char * deshash(unsigned char *dst, const unsigned char *key,
 			const unsigned char *src);
 
-#endif	/* __NTLM_DES_H__ */
+#endif
--- a/src/lib-ntlm/ntlm-encrypt.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-encrypt.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __NTLM_ENCRYPT__
-#define __NTLM_ENCRYPT__
+#ifndef NTLM_ENCRYPT_H
+#define NTLM_ENCRYPT_H
 
 const unsigned char *
 lm_hash(const char *passwd, unsigned char hash[LM_HASH_SIZE]);
@@ -22,4 +22,4 @@
 			 const unsigned char *blob, size_t blob_size,
 			 unsigned char response[NTLMSSP_V2_RESPONSE_SIZE]);
 
-#endif	/* __NTLM_ENCRYPT__ */
+#endif
--- a/src/lib-ntlm/ntlm-flags.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-flags.h	Sun Sep 16 11:31:27 2007 +0300
@@ -6,8 +6,8 @@
  * This software is released under the MIT license.
  */
 
-#ifndef __NTLM_FLAGS_H__
-#define __NTLM_FLAGS_H__
+#ifndef NTLM_FLAGS_H
+#define NTLM_FLAGS_H
 
 /*
  * Indicates that Unicode strings are supported for use in security
@@ -134,4 +134,4 @@
  */
 #define NTLMSSP_NEGOTIATE_56 0x80000000 
 
-#endif	/* __NTLM_FLAGS_H__ */
+#endif
--- a/src/lib-ntlm/ntlm-message.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-message.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __NTLM_MESSAGE_H__
-#define __NTLM_MESSAGE_H__
+#ifndef NTLM_MESSAGE_H
+#define NTLM_MESSAGE_H
 
 const struct ntlmssp_challenge *
 ntlmssp_create_challenge(pool_t pool, const struct ntlmssp_request *request,
@@ -10,4 +10,4 @@
 bool ntlmssp_check_response(const struct ntlmssp_response *response,
 			    size_t data_size, const char **error);
 
-#endif	/* __NTLM_MESSAGE_H__ */
+#endif
--- a/src/lib-ntlm/ntlm-types.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm-types.h	Sun Sep 16 11:31:27 2007 +0300
@@ -6,8 +6,8 @@
  * This software is released under the MIT license.
  */
 
-#ifndef __NTLM_TYPES_H__
-#define __NTLM_TYPES_H__
+#ifndef NTLM_TYPES_H
+#define NTLM_TYPES_H
 
 #define NTLMSSP_MAGIC			0x005053534d4c544eULL
 
@@ -127,4 +127,4 @@
 	/* Target Information Block */
 };
 
-#endif	/* __NTLM_TYPES_H__ */
+#endif
--- a/src/lib-ntlm/ntlm.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-ntlm/ntlm.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __NTLM_H__
-#define __NTLM_H__
+#ifndef NTLM_H
+#define NTLM_H
 
 #include <stddef.h>
 
--- a/src/lib-otp/otp-dictionary.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-otp/otp-dictionary.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,6 +1,6 @@
-#ifndef __OTP_DICTIONARY__
-#define __OTP_DICTIONARY__
+#ifndef OTP_DICTIONARY_H
+#define OTP_DICTIONARY_H
 
 int otp_lookup_word(const char *word);
 
-#endif	/* __OTP_DICTIONARY__ */
+#endif
--- a/src/lib-otp/otp-hash.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-otp/otp-hash.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OTP_HASH_H__
-#define __OTP_HASH_H__
+#ifndef OTP_HASH_H
+#define OTP_HASH_H
 
 struct digest_context;
 
@@ -23,4 +23,4 @@
 void otp_next_hash(unsigned int algo, const unsigned char *prev,
 		   unsigned char *result);
 
-#endif	/* __OTP_HASH_H__ */
+#endif
--- a/src/lib-otp/otp-parity.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-otp/otp-parity.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OTP_PARITY_H__
-#define __OTP_PARITY_H__
+#ifndef OTP_PARITY_H
+#define OTP_PARITY_H
 
 const unsigned char parity_table[256];
 
@@ -13,4 +13,4 @@
 	return parity & 3;
 }
 
-#endif	/* __OTP_PARITY_H__ */
+#endif
--- a/src/lib-otp/otp-parse.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-otp/otp-parse.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OTP_PARSE_H__
-#define __OTP_PARSE_H__
+#ifndef OTP_PARSE_H
+#define OTP_PARSE_H
 
 int otp_read_hex(const char *data, const char **endptr, unsigned char *hash);
 int otp_read_words(const char *data, const char **endptr, unsigned char *hash);
@@ -13,4 +13,4 @@
 int otp_parse_dbentry(const char *text, struct otp_state *state);
 const char *otp_print_dbentry(const struct otp_state *state);
 
-#endif	/* __OTP_PARSE_H__ */
+#endif
--- a/src/lib-otp/otp.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-otp/otp.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OTP_H__
-#define __OTP_H__
+#ifndef OTP_H
+#define OTP_H
 
 #define OTP_MAX_SEED_LEN	16
 #define OTP_MAX_WORD_LEN	4
@@ -19,4 +19,4 @@
 #include "otp-parity.h"
 #include "otp-parse.h"
 
-#endif	/* __OTP_H__ */
+#endif
--- a/src/lib-settings/settings.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-settings/settings.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SETTINGS_H
-#define __SETTINGS_H
+#ifndef SETTINGS_H
+#define SETTINGS_H
 
 enum setting_type {
 	SET_STR,
--- a/src/lib-sql/sql-api-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-sql/sql-api-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SQL_API_PRIVATE_H
-#define __SQL_API_PRIVATE_H
+#ifndef SQL_API_PRIVATE_H
+#define SQL_API_PRIVATE_H
 
 #include "sql-api.h"
 
--- a/src/lib-sql/sql-api.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-sql/sql-api.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SQL_API_H
-#define __SQL_API_H
+#ifndef SQL_API_H
+#define SQL_API_H
 
 /* This SQL API is designed to work asynchronously. The underlying drivers
    however may not. */
--- a/src/lib-storage/index/cydir/cydir-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/cydir/cydir-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CYDIR_STORAGE_H
-#define __CYDIR_STORAGE_H
+#ifndef CYDIR_STORAGE_H
+#define CYDIR_STORAGE_H
 
 #include "index-storage.h"
 #include "mailbox-list-private.h"
--- a/src/lib-storage/index/cydir/cydir-sync.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/cydir/cydir-sync.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CYDIR_SYNC_H
-#define __CYDIR_SYNC_H
+#ifndef CYDIR_SYNC_H
+#define CYDIR_SYNC_H
 
 enum mailbox_sync_flags;
 struct mailbox;
--- a/src/lib-storage/index/dbox/dbox-file.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-file.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DBOX_FILE_H
-#define __DBOX_FILE_H
+#ifndef DBOX_FILE_H
+#define DBOX_FILE_H
 
 /* The file begins with a header followed by zero or more messages:
 
--- a/src/lib-storage/index/dbox/dbox-index.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-index.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DBOX_INDEX_H
-#define __DBOX_INDEX_H
+#ifndef DBOX_INDEX_H
+#define DBOX_INDEX_H
 
 /* The file begins with a header followed by zero or more records:
 
--- a/src/lib-storage/index/dbox/dbox-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DBOX_STORAGE_H
-#define __DBOX_STORAGE_H
+#ifndef DBOX_STORAGE_H
+#define DBOX_STORAGE_H
 
 #include "index-storage.h"
 #include "mailbox-list-private.h"
--- a/src/lib-storage/index/dbox/dbox-sync.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/dbox/dbox-sync.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DBOX_SYNC_H
-#define __DBOX_SYNC_H
+#ifndef DBOX_SYNC_H
+#define DBOX_SYNC_H
 
 enum mailbox_sync_flags;
 struct mailbox;
--- a/src/lib-storage/index/index-mail.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/index-mail.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __INDEX_MAIL_H
-#define __INDEX_MAIL_H
+#ifndef INDEX_MAIL_H
+#define INDEX_MAIL_H
 
 #include "message-size.h"
 #include "mail-cache.h"
--- a/src/lib-storage/index/index-sort.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/index-sort.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __INDEX_SORT_H
-#define __INDEX_SORT_H
+#ifndef INDEX_SORT_H
+#define INDEX_SORT_H
 
 struct mail_search_sort_program;
 
--- a/src/lib-storage/index/index-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/index-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __INDEX_STORAGE_H
-#define __INDEX_STORAGE_H
+#ifndef INDEX_STORAGE_H
+#define INDEX_STORAGE_H
 
 #include "file-dotlock.h"
 #include "mail-storage-private.h"
--- a/src/lib-storage/index/index-sync-changes.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/index-sync-changes.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __INDEX_SYNC_CHANGES_H
-#define __INDEX_SYNC_CHANGES_H
+#ifndef INDEX_SYNC_CHANGES_H
+#define INDEX_SYNC_CHANGES_H
 
 struct index_sync_changes_context *
 index_sync_changes_init(struct index_mailbox *ibox,
--- a/src/lib-storage/index/maildir/maildir-filename.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-filename.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILDIR_FILENAME_H
-#define __MAILDIR_FILENAME_H
+#ifndef MAILDIR_FILENAME_H
+#define MAILDIR_FILENAME_H
 
 struct maildir_keywords_sync_ctx;
 
--- a/src/lib-storage/index/maildir/maildir-keywords.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-keywords.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILDIR_KEYWORDS_H
-#define __MAILDIR_KEYWORDS_H
+#ifndef MAILDIR_KEYWORDS_H
+#define MAILDIR_KEYWORDS_H
 
 #define MAILDIR_KEYWORDS_NAME "dovecot-keywords"
 
--- a/src/lib-storage/index/maildir/maildir-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILDIR_STORAGE_H
-#define __MAILDIR_STORAGE_H
+#ifndef MAILDIR_STORAGE_H
+#define MAILDIR_STORAGE_H
 
 #define MAILDIR_STORAGE_NAME "maildir"
 #define MAILDIR_SUBSCRIPTION_FILE_NAME "subscriptions"
--- a/src/lib-storage/index/maildir/maildir-sync.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-sync.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILDIR_SYNC_H
-#define __MAILDIR_SYNC_H
+#ifndef MAILDIR_SYNC_H
+#define MAILDIR_SYNC_H
 
 /* All systems accessing the filesystem must have their clock less than this
    many seconds apart from each others. 0 works only for local filesystems. */
--- a/src/lib-storage/index/maildir/maildir-uidlist.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-uidlist.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILDIR_UIDLI3ST_H
-#define __MAILDIR_UIDLIST_H
+#ifndef MAILDIR_UIDLI3ST_H
+#define MAILDIR_UIDLIST_H
 
 #define MAILDIR_UIDLIST_NAME "dovecot-uidlist"
 
--- a/src/lib-storage/index/mbox/istream-raw-mbox.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_RAW_MBOX_H
-#define __ISTREAM_RAW_MBOX_H
+#ifndef ISTREAM_RAW_MBOX_H
+#define ISTREAM_RAW_MBOX_H
 
 /* Create a mbox stream for parsing mbox. Reading stops before From-line,
    you'll have to call istream_raw_mbox_next() to get to next message. */
--- a/src/lib-storage/index/mbox/mbox-file.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-file.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_FILE_H
-#define __MBOX_FILE_H
+#ifndef MBOX_FILE_H
+#define MBOX_FILE_H
 
 int mbox_file_open(struct mbox_mailbox *mbox);
 void mbox_file_close(struct mbox_mailbox *mbox);
--- a/src/lib-storage/index/mbox/mbox-from.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-from.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_FROM_H
-#define __MBOX_FROM_H
+#ifndef MBOX_FROM_H
+#define MBOX_FROM_H
 
 int mbox_from_parse(const unsigned char *msg, size_t size,
 		    time_t *time_r, char **sender_r);
--- a/src/lib-storage/index/mbox/mbox-lock.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-lock.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_LOCK_H
-#define __MBOX_LOCK_H
+#ifndef MBOX_LOCK_H
+#define MBOX_LOCK_H
 
 /* NOTE: if mbox file is not open, it's opened. if it is open but file has
    been overwritten (ie. inode has changed), it's reopened. */
--- a/src/lib-storage/index/mbox/mbox-md5.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-md5.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_MD5_H
-#define __MBOX_MD5_H
+#ifndef MBOX_MD5_H
+#define MBOX_MD5_H
 
 struct mbox_md5_context *mbox_md5_init(void);
 void mbox_md5_continue(struct mbox_md5_context *ctx,
--- a/src/lib-storage/index/mbox/mbox-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_STORAGE_H
-#define __MBOX_STORAGE_H
+#ifndef MBOX_STORAGE_H
+#define MBOX_STORAGE_H
 
 /* Padding to leave in X-Keywords header when rewriting mbox */
 #define MBOX_HEADER_PADDING 50
--- a/src/lib-storage/index/mbox/mbox-sync-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_SYNC_PRIVATE_H
-#define __MBOX_SYNC_PRIVATE_H
+#ifndef MBOX_SYNC_PRIVATE_H
+#define MBOX_SYNC_PRIVATE_H
 
 #include "md5.h"
 #include "mail-index.h"
--- a/src/lib-storage/list/index-mailbox-list.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/list/index-mailbox-list.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __INDEX_MAILBOX_LIST_H
-#define __INDEX_MAILBOX_LIST_H
+#ifndef INDEX_MAILBOX_LIST_H
+#define INDEX_MAILBOX_LIST_H
 
 #include "module-context.h"
 #include "mailbox-list-private.h"
--- a/src/lib-storage/list/mailbox-list-fs.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/list/mailbox-list-fs.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_FS_H
-#define __MAILBOX_LIST_FS_H
+#ifndef MAILBOX_LIST_FS_H
+#define MAILBOX_LIST_FS_H
 
 #include "mailbox-list-private.h"
 
--- a/src/lib-storage/list/mailbox-list-maildir.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/list/mailbox-list-maildir.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_MAILDIR_H
-#define __MAILBOX_LIST_MAILDIR_H
+#ifndef MAILBOX_LIST_MAILDIR_H
+#define MAILBOX_LIST_MAILDIR_H
 
 #include "mailbox-list-private.h"
 
--- a/src/lib-storage/list/mailbox-list-subscriptions.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/list/mailbox-list-subscriptions.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_SUBSCRIPTIONS_H
-#define __MAILBOX_LIST_SUBSCRIPTIONS_H
+#ifndef MAILBOX_LIST_SUBSCRIPTIONS_H
+#define MAILBOX_LIST_SUBSCRIPTIONS_H
 
 struct mailbox_list_iterate_context;
 struct mailbox_tree_context;
--- a/src/lib-storage/list/subscription-file.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/list/subscription-file.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SUBSCRIPTION_FILE_H
-#define __SUBSCRIPTION_FILE_H
+#ifndef SUBSCRIPTION_FILE_H
+#define SUBSCRIPTION_FILE_H
 
 struct mailbox_list;
 
--- a/src/lib-storage/mail-copy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-copy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_COPY_H
-#define __MAIL_COPY_H
+#ifndef MAIL_COPY_H
+#define MAIL_COPY_H
 
 int mail_storage_copy(struct mailbox_transaction_context *t, struct mail *mail,
 		      enum mail_flags flags, struct mail_keywords *keywords,
--- a/src/lib-storage/mail-error.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-error.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_ERROR_H
-#define __MAIL_ERROR_H
+#ifndef MAIL_ERROR_H
+#define MAIL_ERROR_H
 
 /* Some error strings that should be used everywhere to avoid
    permissions checks from revealing mailbox's existence */
--- a/src/lib-storage/mail-namespace.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-namespace.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_NAMESPACE_H
-#define __MAIL_NAMESPACE_H
+#ifndef MAIL_NAMESPACE_H
+#define MAIL_NAMESPACE_H
 
 enum namespace_type {
 	NAMESPACE_PRIVATE,
--- a/src/lib-storage/mail-search.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-search.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_SEARCH_H
-#define __MAIL_SEARCH_H
+#ifndef MAIL_SEARCH_H
+#define MAIL_SEARCH_H
 
 enum mail_search_arg_type {
 	SEARCH_OR,
--- a/src/lib-storage/mail-storage-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-storage-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_STORAGE_PRIVATE_H
-#define __MAIL_STORAGE_PRIVATE_H
+#ifndef MAIL_STORAGE_PRIVATE_H
+#define MAIL_STORAGE_PRIVATE_H
 
 #include "module-context.h"
 #include "file-lock.h"
--- a/src/lib-storage/mail-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mail-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_STORAGE_H
-#define __MAIL_STORAGE_H
+#ifndef MAIL_STORAGE_H
+#define MAIL_STORAGE_H
 
 struct message_size;
 
--- a/src/lib-storage/mailbox-list-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mailbox-list-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_PRIVATE_H
-#define __MAILBOX_LIST_PRIVATE_H
+#ifndef MAILBOX_LIST_PRIVATE_H
+#define MAILBOX_LIST_PRIVATE_H
 
 #include "mail-namespace.h"
 #include "mailbox-list.h"
--- a/src/lib-storage/mailbox-list.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mailbox-list.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_LIST_H
-#define __MAILBOX_LIST_H
+#ifndef MAILBOX_LIST_H
+#define MAILBOX_LIST_H
 
 #include "mail-error.h"
 
--- a/src/lib-storage/mailbox-tree.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib-storage/mailbox-tree.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAILBOX_TREE_H
-#define __MAILBOX_TREE_H
+#ifndef MAILBOX_TREE_H
+#define MAILBOX_TREE_H
 
 #include "mailbox-list.h"
 
--- a/src/lib/array-decl.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/array-decl.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ARRAY_DECL_H
-#define __ARRAY_DECL_H
+#ifndef ARRAY_DECL_H
+#define ARRAY_DECL_H
 
 #define ARRAY_DEFINE(name, array_type) union { struct array arr; array_type const *const *v; array_type **v_modifiable; } name
 #define ARRAY_INIT { { 0, 0 } }
--- a/src/lib/array.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/array.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ARRAY_H
-#define __ARRAY_H
+#ifndef ARRAY_H
+#define ARRAY_H
 
 /* Array is a buffer accessible using fixed size elements. As long as the
    compiler provides typeof() function, the array provides type safety. If
--- a/src/lib/backtrace-string.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/backtrace-string.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __BACKTRACE_STRING_H
-#define __BACKTRACE_STRING_H
+#ifndef BACKTRACE_STRING_H
+#define BACKTRACE_STRING_H
 
 /* Returns 0 if ok, -1 if failure. */
 int backtrace_append(string_t *str);
--- a/src/lib/base64.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/base64.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __BASE64_H
-#define __BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
 
 /* Translates binary data into base64. The src must not point to dest buffer. */
 void base64_encode(const void *src, size_t src_size, buffer_t *dest);
--- a/src/lib/bsearch-insert-pos.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/bsearch-insert-pos.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __BSEARCH_INSERT_POS
-#define __BSEARCH_INSERT_POS
+#ifndef BSEARCH_INSERT_POS_H
+#define BSEARCH_INSERT_POS_H
 
 /* Binary search template */
 #define BINARY_NUMBER_SEARCH(data, count, value, idx_r) \
--- a/src/lib/buffer.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/buffer.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __BUFFER_H
-#define __BUFFER_H
+#ifndef BUFFER_H
+#define BUFFER_H
 
 /* May be used in calculations of how much memory buffer_t will allocate
    for itself, but this isn't necessary precise. */
--- a/src/lib/close-keep-errno.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/close-keep-errno.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLOSE_KEEP_ERRNO_H
-#define __CLOSE_KEEP_ERRNO_H
+#ifndef CLOSE_KEEP_ERRNO_H
+#define CLOSE_KEEP_ERRNO_H
 
 /* Close the file handle without changing errno. */
 void close_keep_errno(int fd);
--- a/src/lib/compat.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/compat.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMPAT_H
-#define __COMPAT_H
+#ifndef COMPAT_H
+#define COMPAT_H
 
 #if defined (HAVE_INTTYPES_H) && defined(__osf__)
 #  include <inttypes.h>
--- a/src/lib/crc32.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/crc32.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CRC32_H
-#define __CRC32_H
+#ifndef CRC32_H
+#define CRC32_H
 
 uint32_t crc32(const void *data, size_t size);
 uint32_t crc32_str(const char *str);
--- a/src/lib/data-stack.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/data-stack.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DATA_STACK_H
-#define __DATA_STACK_H
+#ifndef DATA_STACK_H
+#define DATA_STACK_H
 
 /* Data stack makes it very easy to implement functions returning dynamic data
    but without having to worry much about memory management like freeing the
--- a/src/lib/env-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/env-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ENV_UTIL_H
-#define __ENV_UTIL_H
+#ifndef ENV_UTIL_H
+#define ENV_UTIL_H
 
 /* Add new environment variable. Wrapper to putenv(). Note that calls to this
    function allocates memory which isn't free'd until env_clean() is called. */
--- a/src/lib/failures.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/failures.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FAILURES_H
-#define __FAILURES_H
+#ifndef FAILURES_H
+#define FAILURES_H
 
 /* Default exit status codes that we could use. */
 enum fatal_exit_status {
--- a/src/lib/fd-close-on-exec.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/fd-close-on-exec.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FD_CLOSE_ON_EXEC_H
-#define __FD_CLOSE_ON_EXEC_H
+#ifndef FD_CLOSE_ON_EXEC_H
+#define FD_CLOSE_ON_EXEC_H
 
 /* Change close-on-exec flag of fd. */
 void fd_close_on_exec(int fd, bool set);
--- a/src/lib/fd-set-nonblock.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/fd-set-nonblock.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FD_SET_NONBLOCK_H
-#define __FD_SET_NONBLOCK_H
+#ifndef FD_SET_NONBLOCK_H
+#define FD_SET_NONBLOCK_H
 
 /* Set file descriptor to blocking/nonblocking state */
 int fd_set_nonblock(int fd, bool nonblock);
--- a/src/lib/fdpass.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/fdpass.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FDPASS_H
-#define __FDPASS_H
+#ifndef FDPASS_H
+#define FDPASS_H
 
 /* Returns number of bytes sent, -1 if error. send_fd can be -1 if we just
    want to send the data with sendmsg(). */
--- a/src/lib/file-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/file-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FILE_CACHE_H
-#define __FILE_CACHE_H
+#ifndef FILE_CACHE_H
+#define FILE_CACHE_H
 
 /* Create a new file cache. It works very much like file-backed mmap()ed
    memory, but it works more nicely with remote filesystems (no SIGBUS). */
--- a/src/lib/file-copy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/file-copy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FILE_COPY_H
-#define __FILE_COPY_H
+#ifndef FILE_COPY_H
+#define FILE_COPY_H
 
 /* Copy file atomically. First try hardlinking, then fallback to creating
    a temporary file (destpath.tmp) and rename()ing it over srcpath.
--- a/src/lib/file-dotlock.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/file-dotlock.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FILE_DOTLOCK_H
-#define __FILE_DOTLOCK_H
+#ifndef FILE_DOTLOCK_H
+#define FILE_DOTLOCK_H
 
 #include <unistd.h>
 #include <fcntl.h>
--- a/src/lib/file-lock.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/file-lock.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FILE_LOCK_H
-#define __FILE_LOCK_H
+#ifndef FILE_LOCK_H
+#define FILE_LOCK_H
 
 #include <unistd.h>
 #include <fcntl.h>
--- a/src/lib/file-set-size.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/file-set-size.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FILE_SET_SIZE_H
-#define __FILE_SET_SIZE_H
+#ifndef FILE_SET_SIZE_H
+#define FILE_SET_SIZE_H
 
 /* Shrink/grow file. If file is grown, the new data is guaranteed to
    be zeros. The file offset may be anywhere after this call.
--- a/src/lib/hash.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/hash.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HASH_H
-#define __HASH_H
+#ifndef HASH_H
+#define HASH_H
 
 /* Returns hash code. */
 typedef unsigned int hash_callback_t(const void *p);
--- a/src/lib/hex-binary.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/hex-binary.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HEX_BINARY_H
-#define __HEX_BINARY_H
+#ifndef HEX_BINARY_H
+#define HEX_BINARY_H
 
 /* Convert binary to hex digits allocating return value from data stack */
 const char *binary_to_hex(const unsigned char *data, size_t size);
--- a/src/lib/hex-dec.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/hex-dec.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HEX_DEC_H
-#define __HEX_DEC_H
+#ifndef HEX_DEC_H
+#define HEX_DEC_H
 
 #define DEC2HEX(hexstr, str) \
 	dec2hex(hexstr, str, sizeof(hexstr))
--- a/src/lib/hmac-md5.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/hmac-md5.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HMAC_MD5_H__
-#define __HMAC_MD5_H__
+#ifndef HMAC_MD5_H
+#define HMAC_MD5_H
 
 #include "md5.h"
 
@@ -26,4 +26,4 @@
 	md5_update(&ctx->ctx, data, size);
 }
 
-#endif /* __HMAC_MD5_H__ */
+#endif
--- a/src/lib/home-expand.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/home-expand.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HOME_EXPAND_H
-#define __HOME_EXPAND_H
+#ifndef HOME_EXPAND_H
+#define HOME_EXPAND_H
 
 /* expand ~/ or ~user/ in beginning of path. If user is unknown, the original
    path is returned without modification. */
--- a/src/lib/hostpid.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/hostpid.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __HOSTPID_H
-#define __HOSTPID_H
+#ifndef HOSTPID_H
+#define HOSTPID_H
 
 extern const char *my_hostname;
 extern const char *my_pid;
--- a/src/lib/imem.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/imem.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMEM_H
-#define __IMEM_H
+#ifndef IMEM_H
+#define IMEM_H
 
 /* For easy allocation of memory from default memory pool. */
 
--- a/src/lib/ioloop-internal.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ioloop-internal.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IOLOOP_INTERNAL_H
-#define __IOLOOP_INTERNAL_H
+#ifndef IOLOOP_INTERNAL_H
+#define IOLOOP_INTERNAL_H
 
 #include "ioloop.h"
 
--- a/src/lib/ioloop-iolist.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ioloop-iolist.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IOLOOP_IOLIST_H
-#define __IOLOOP_IOLIST_H
+#ifndef IOLOOP_IOLIST_H
+#define IOLOOP_IOLIST_H
 
 enum {
 	IOLOOP_IOLIST_INPUT,
--- a/src/lib/ioloop-notify-fd.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ioloop-notify-fd.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IOLOOP_NOTIFY_FD_H
-#define __IOLOOP_NOTIFY_FD_H
+#ifndef IOLOOP_NOTIFY_FD_H
+#define IOLOOP_NOTIFY_FD_H
 
 /* common notify code for fd-based notifications (dnotify, inotify) */
 
--- a/src/lib/ioloop.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ioloop.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IOLOOP_H
-#define __IOLOOP_H
+#ifndef IOLOOP_H
+#define IOLOOP_H
 
 #include <sys/time.h>
 #include <time.h>
--- a/src/lib/iostream-internal.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/iostream-internal.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IOSTREAM_INTERNAL_H
-#define __IOSTREAM_INTERNAL_H
+#ifndef IOSTREAM_INTERNAL_H
+#define IOSTREAM_INTERNAL_H
 
 /* This file is private to input stream and output stream implementations */
 
--- a/src/lib/istream-internal.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/istream-internal.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_INTERNAL_H
-#define __ISTREAM_INTERNAL_H
+#ifndef ISTREAM_INTERNAL_H
+#define ISTREAM_INTERNAL_H
 
 #include "istream.h"
 #include "iostream-internal.h"
--- a/src/lib/istream-seekable.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/istream-seekable.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_SEEKABLE_H
-#define __ISTREAM_SEEKABLE_H
+#ifndef ISTREAM_SEEKABLE_H
+#define ISTREAM_SEEKABLE_H
 
 /* Create a seekable stream from given NULL-terminated list of input streams.
    Try to keep it in memory, but use a temporary file if it's too large.
--- a/src/lib/istream-tee.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/istream-tee.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_TEE_H
-#define __ISTREAM_TEE_H
+#ifndef ISTREAM_TEE_H
+#define ISTREAM_TEE_H
 
 /* Tee can be used to create multiple child input streams which can access
    a single non-blocking input stream in a way that data isn't removed from
--- a/src/lib/istream.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/istream.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_H
-#define __ISTREAM_H
+#ifndef ISTREAM_H
+#define ISTREAM_H
 
 /* Note that some systems (Solaris) may use a macro to redefine struct stat */
 #include <sys/stat.h>
--- a/src/lib/lib-signals.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/lib-signals.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LIB_SIGNALS_H
-#define __LIB_SIGNALS_H
+#ifndef LIB_SIGNALS_H
+#define LIB_SIGNALS_H
 
 #include <signal.h>
 
--- a/src/lib/lib.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/lib.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LIB_H
-#define __LIB_H
+#ifndef LIB_H
+#define LIB_H
 
 /* default lib includes */
 #ifdef HAVE_CONFIG_H
--- a/src/lib/macros.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/macros.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MACROS_H
-#define __MACROS_H
+#ifndef MACROS_H
+#define MACROS_H
 
 /* several useful macros, mostly from glib.h */
 
--- a/src/lib/md4.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/md4.h	Sun Sep 16 11:31:27 2007 +0300
@@ -6,8 +6,8 @@
  * the public domain.  See md4.c for more information.
  */
 
-#ifndef __MD4_H
-#define __MD4_H
+#ifndef MD4_H
+#define MD4_H
 
 #define	MD4_RESULTLEN (128/8)
 
--- a/src/lib/md5.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/md5.h	Sun Sep 16 11:31:27 2007 +0300
@@ -6,8 +6,8 @@
  * the public domain.  See md5.c for more information.
  */
 
-#ifndef __MD5_H
-#define __MD5_H
+#ifndef MD5_H
+#define MD5_H
 
 #define	MD5_RESULTLEN (128/8)
 
--- a/src/lib/mempool.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/mempool.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MEMPOOL_H
-#define __MEMPOOL_H
+#ifndef MEMPOOL_H
+#define MEMPOOL_H
 
 #include "macros.h"
 
--- a/src/lib/mkdir-parents.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/mkdir-parents.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MKDIR_PARENTS_H
-#define __MKDIR_PARENTS_H
+#ifndef MKDIR_PARENTS_H
+#define MKDIR_PARENTS_H
 
 /* Create path and all the directories under it if needed.
    Returns 0 if ok, or if path already exists (not necessarily as directory). */
--- a/src/lib/mmap-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/mmap-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MMAP_UTIL_H
-#define __MMAP_UTIL_H
+#ifndef MMAP_UTIL_H
+#define MMAP_UTIL_H
 
 #include <unistd.h>
 
--- a/src/lib/module-context.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/module-context.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MODULE_CONTEXT_H
-#define __MODULE_CONTEXT_H
+#ifndef MODULE_CONTEXT_H
+#define MODULE_CONTEXT_H
 
 /*
    This is a bit complex to use, but it prevents using wrong module IDs
--- a/src/lib/module-dir.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/module-dir.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MODULE_DIR_H
-#define __MODULE_DIR_H
+#ifndef MODULE_DIR_H
+#define MODULE_DIR_H
 
 struct module {
 	char *path, *name;
--- a/src/lib/mountpoint.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/mountpoint.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MOUNTPOINT_H
-#define __MOUNTPOINT_H
+#ifndef MOUNTPOINT_H
+#define MOUNTPOINT_H
 
 struct mountpoint {
 	char *device_path;
--- a/src/lib/network.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/network.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __NETWORK_H
-#define __NETWORK_H
+#ifndef NETWORK_H
+#define NETWORK_H
 
 #ifndef WIN32
 #  include <sys/socket.h>
--- a/src/lib/nfs-workarounds.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/nfs-workarounds.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __NFS_WORKAROUNDS_H
-#define __NFS_WORKAROUNDS_H
+#ifndef NFS_WORKAROUNDS_H
+#define NFS_WORKAROUNDS_H
 
 /* Note that some systems (Solaris) may use a macro to redefine struct stat */
 #include <sys/stat.h>
--- a/src/lib/ostream-crlf.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ostream-crlf.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OSTREAM_CRLF_H
-#define __OSTREAM_CRLF_H
+#ifndef OSTREAM_CRLF_H
+#define OSTREAM_CRLF_H
 
 /* Replace all plain LFs with CRLF. */
 struct ostream *o_stream_create_crlf(struct ostream *output);
--- a/src/lib/ostream-internal.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ostream-internal.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OSTREAM_INTERNAL_H
-#define __OSTREAM_INTERNAL_H
+#ifndef OSTREAM_INTERNAL_H
+#define OSTREAM_INTERNAL_H
 
 #include "ostream.h"
 #include "iostream-internal.h"
--- a/src/lib/ostream.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/ostream.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __OSTREAM_H
-#define __OSTREAM_H
+#ifndef OSTREAM_H
+#define OSTREAM_H
 
 #include "ioloop.h"
 
--- a/src/lib/primes.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/primes.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PRIMES_H
-#define __PRIMES_H
+#ifndef PRIMES_H
+#define PRIMES_H
 
 /* Returns a prime close to specified number, or the number itself if it's
    a prime. Note that the returned value may be smaller than requested! */
--- a/src/lib/printf-format-fix.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/printf-format-fix.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PRINTF_FORMAT_FIX_H
-#define __PRINTF_FORMAT_FIX_H
+#ifndef PRINTF_FORMAT_FIX_H
+#define PRINTF_FORMAT_FIX_H
 
 /* Replaces %m in format with strerror(errno) and panics if %n modifier is
    used. If the format string was modified, it's returned from data stack. */
--- a/src/lib/process-title.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/process-title.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __PROCESS_TITLE_H
-#define __PROCESS_TITLE_H
+#ifndef PROCESS_TITLE_H
+#define PROCESS_TITLE_H
 
 /* Initialize title changing. */
 void process_title_init(char *argv[], char *envp[]);
--- a/src/lib/randgen.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/randgen.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __RANDGEN_H
-#define __RANDGEN_H
+#ifndef RANDGEN_H
+#define RANDGEN_H
 
 /* Fill given buffer with semi-strong randomness, usually from /dev/urandom. */
 void random_fill(void *buf, size_t size);
--- a/src/lib/read-full.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/read-full.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __READ_FULL_H
-#define __READ_FULL_H
+#ifndef READ_FULL_H
+#define READ_FULL_H
 
 /* Read data from file. Returns -1 if error occurred, or 0 if EOF came before
    everything was read, or 1 if all was ok. */
--- a/src/lib/restrict-access.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/restrict-access.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __RESTRICT_ACCESS_H
-#define __RESTRICT_ACCESS_H
+#ifndef RESTRICT_ACCESS_H
+#define RESTRICT_ACCESS_H
 
 /* set environment variables so they can be read with
    restrict_access_by_env() */
--- a/src/lib/restrict-process-size.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/restrict-process-size.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __RESTRICT_PROCESS_SIZE_H
-#define __RESTRICT_PROCESS_SIZE_H
+#ifndef RESTRICT_PROCESS_SIZE_H
+#define RESTRICT_PROCESS_SIZE_H
 
 /* Restrict max. process size. The size is in megabytes, setting it to
    (unsigned int)-1 sets it unlimited. */
--- a/src/lib/safe-memset.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/safe-memset.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SAFE_MEMSET_H
-#define __SAFE_MEMSET_H
+#ifndef SAFE_MEMSET_H
+#define SAFE_MEMSET_H
 
 /* memset() guaranteed not to get optimized away by compiler.
    Should be used instead of memset() when clearing any sensitive data. */
--- a/src/lib/safe-mkdir.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/safe-mkdir.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SAFE_MKDIR
-#define __SAFE_MKDIR
+#ifndef SAFE_MKDIR_H
+#define SAFE_MKDIR_H
 
 /* Either create a directory or make sure that it already exists with given
    permissions. If anything fails, the i_fatal() is called. Returns 1 if
--- a/src/lib/safe-mkstemp.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/safe-mkstemp.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SAFE_MKSTEMP_H
-#define __SAFE_MKSTEMP_H
+#ifndef SAFE_MKSTEMP_H
+#define SAFE_MKSTEMP_H
 
 /* Create a new file with a given prefix. The string is updated to contain the
    created filename. uid and gid can be (uid_t)-1 and (gid_t)-1 to use the
--- a/src/lib/sendfile-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/sendfile-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SENDFILE_UTIL_H
-#define __SENDFILE_UTIL_H
+#ifndef SENDFILE_UTIL_H
+#define SENDFILE_UTIL_H
 
 /* Wrapper for various sendfile()-like calls. Returns -1 and errno=EINVAL if
    it isn't supported for some reason (out_fd isn't a socket, offset is too
--- a/src/lib/seq-range-array.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/seq-range-array.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SEQ_RANGE_ARRAY_H
-#define __SEQ_RANGE_ARRAY_H
+#ifndef SEQ_RANGE_ARRAY_H
+#define SEQ_RANGE_ARRAY_H
 
 struct seq_range {
 	uint32_t seq1, seq2;
--- a/src/lib/sha1.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/sha1.h	Sun Sep 16 11:31:27 2007 +0300
@@ -35,8 +35,8 @@
  * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
  */
 
-#ifndef __SHA1_H
-#define __SHA1_H
+#ifndef SHA1_H
+#define SHA1_H
 
 /* libmysqlclient really should try to keep its internal stuff internal so
    they won't conflict with the actual programs that are trying to use it.
@@ -77,4 +77,4 @@
 extern void sha1_get_digest(const void *, size_t,
 	unsigned char [SHA1_RESULTLEN]);
 
-#endif /*__SHA1_H*/
+#endif
--- a/src/lib/str-find.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/str-find.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __STR_FIND_H
-#define __STR_FIND_H
+#ifndef STR_FIND_H
+#define STR_FIND_H
 
 struct str_find_context;
 
--- a/src/lib/str-sanitize.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/str-sanitize.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __STR_SANITIZE_H
-#define __STR_SANITIZE_H
+#ifndef STR_SANITIZE_H
+#define STR_SANITIZE_H
 
 /* All control characters in src will be appended as '?'. If src is longer
    than max_len, it's truncated with "..." appended to the end. */
--- a/src/lib/str.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/str.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __STR_H
-#define __STR_H
+#ifndef STR_H
+#define STR_H
 
 string_t *str_new(pool_t pool, size_t initial_size);
 string_t *t_str_new(size_t initial_size);
--- a/src/lib/strescape.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/strescape.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __STRESCAPE_H
-#define __STRESCAPE_H
+#ifndef STRESCAPE_H
+#define STRESCAPE_H
 
 #define IS_ESCAPED_CHAR(c) ((c) == '"' || (c) == '\\' || (c) == '\'')
 
--- a/src/lib/strfuncs.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/strfuncs.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __STRFUNC_H
-#define __STRFUNC_H
+#ifndef STRFUNC_H
+#define STRFUNC_H
 
 #define is_empty_str(str) \
         ((str) == NULL || (str)[0] == '\0')
--- a/src/lib/unichar.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/unichar.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UNICHAR_H
-#define __UNICHAR_H
+#ifndef UNICHAR_H
+#define UNICHAR_H
 
 typedef uint32_t unichar_t;
 
--- a/src/lib/unix-socket-create.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/unix-socket-create.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UNIX_SOCKET_CREATE_H
-#define __UNIX_SOCKET_CREATE_H
+#ifndef UNIX_SOCKET_CREATE_H
+#define UNIX_SOCKET_CREATE_H
 
 int unix_socket_create(const char *path, int mode,
 		       uid_t uid, gid_t gid, int backlog);
--- a/src/lib/unlink-directory.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/unlink-directory.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UNLINK_DIRECTORY_H
-#define __UNLINK_DIRECTORY_H
+#ifndef UNLINK_DIRECTORY_H
+#define UNLINK_DIRECTORY_H
 
 /* Unlink directory and/or everything under it.
    Returns 0 if successful, -1 if error. */
--- a/src/lib/unlink-lockfiles.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/unlink-lockfiles.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UNLINK_LOCKFILES_H
-#define __UNLINK_LOCKFILES_H
+#ifndef UNLINK_LOCKFILES_H
+#define UNLINK_LOCKFILES_H
 
 /* Delete stale lock files. Filenames beginning with pidprefix<PID> are
    deleted immediately if PID doesn't exist. Filenames beginning with
--- a/src/lib/utc-mktime.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/utc-mktime.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UTC_MKTIME_H
-#define __UTC_MKTIME_H
+#ifndef UTC_MKTIME_H
+#define UTC_MKTIME_H
 
 #include <time.h>
 
--- a/src/lib/utc-offset.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/utc-offset.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __UTC_OFFSET_H
-#define __UTC_OFFSET_H
+#ifndef UTC_OFFSET_H
+#define UTC_OFFSET_H
 
 #include <time.h>
 
--- a/src/lib/var-expand.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/var-expand.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __VAR_EXPAND_H
-#define __VAR_EXPAND_H
+#ifndef VAR_EXPAND_H
+#define VAR_EXPAND_H
 
 struct var_expand_table {
 	char key;
--- a/src/lib/write-full.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/lib/write-full.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __WRITE_FULL_H
-#define __WRITE_FULL_H
+#ifndef WRITE_FULL_H
+#define WRITE_FULL_H
 
 /* Write data into file. Returns -1 if error occurred, or 0 if all was ok.
    If there's not enough space in device, -1 with ENOSPC is returned, and
--- a/src/login-common/client-common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/client-common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_COMMON_H
-#define __CLIENT_COMMON_H
+#ifndef CLIENT_COMMON_H
+#define CLIENT_COMMON_H
 
 #include "network.h"
 #include "master.h"
--- a/src/login-common/common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "lib.h"
 
--- a/src/login-common/login-proxy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/login-proxy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LOGIN_PROXY_H
-#define __LOGIN_PROXY_H
+#ifndef LOGIN_PROXY_H
+#define LOGIN_PROXY_H
 
 struct login_proxy;
 
--- a/src/login-common/master.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/master.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MASTER_H
-#define __MASTER_H
+#ifndef MASTER_H
+#define MASTER_H
 
 struct client;
 
--- a/src/login-common/sasl-server.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/sasl-server.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SASL_SERVER_H
-#define __SASL_SERVER_H
+#ifndef SASL_SERVER_H
+#define SASL_SERVER_H
 
 enum sasl_server_reply {
 	SASL_SERVER_REPLY_SUCCESS,
--- a/src/login-common/ssl-proxy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/login-common/ssl-proxy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SSL_PROXY_H
-#define __SSL_PROXY_H
+#ifndef SSL_PROXY_H
+#define SSL_PROXY_H
 
 struct ip_addr;
 struct ssl_proxy;
--- a/src/master/askpass.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/askpass.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ASKPASS_H
-#define __ASKPASS_H
+#ifndef ASKPASS_H
+#define ASKPASS_H
 
 void askpass(const char *prompt, char *buf, size_t buf_size);
 
--- a/src/master/auth-process.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/auth-process.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_PROCESS_H
-#define __AUTH_PROCESS_H
+#ifndef AUTH_PROCESS_H
+#define AUTH_PROCESS_H
 
 struct login_auth_request;
 
--- a/src/master/capabilities.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/capabilities.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CAPABILITIES_H__
-#define __CAPABILITIES_H__
+#ifndef CAPABILITIES_H
+#define CAPABILITIES_H
 
 #if defined(HAVE_LIBCAP)
 
@@ -11,4 +11,4 @@
 
 #endif
 
-#endif	/* __CAPABILITIES_H__ */
+#endif
--- a/src/master/child-process.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/child-process.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CHILD_PROCESS_H
-#define __CHILD_PROCESS_H
+#ifndef CHILD_PROCESS_H
+#define CHILD_PROCESS_H
 
 enum process_type {
 	PROCESS_TYPE_UNKNOWN,
--- a/src/master/common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 struct ip_addr;
 
--- a/src/master/dict-process.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/dict-process.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DICT_PROCESS_H
-#define __DICT_PROCESS_H
+#ifndef DICT_PROCESS_H
+#define DICT_PROCESS_H
 
 void dict_process_init(void);
 void dict_process_deinit(void);
--- a/src/master/dup2-array.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/dup2-array.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __DUP2_ARRAY_H
-#define __DUP2_ARRAY_H
+#ifndef DUP2_ARRAY_H
+#define DUP2_ARRAY_H
 
 struct dup2 {
 	int fd_src, fd_dest;
--- a/src/master/listener.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/listener.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LISTENER_H
-#define __LISTENER_H
+#ifndef LISTENER_H
+#define LISTENER_H
 
 void listeners_open_fds(struct server_settings *old_set, bool retry);
 void listeners_close_fds(void);
--- a/src/master/log.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/log.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LOG_H
-#define __LOG_H
+#ifndef LOG_H
+#define LOG_H
 
 struct log_io;
 
--- a/src/master/login-process.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/login-process.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LOGIN_PROCESS_H
-#define __LOGIN_PROCESS_H
+#ifndef LOGIN_PROCESS_H
+#define LOGIN_PROCESS_H
 
 #include "child-process.h"
 
--- a/src/master/mail-process.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/mail-process.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_PROCESS_H
-#define __MAIL_PROCESS_H
+#ifndef MAIL_PROCESS_H
+#define MAIL_PROCESS_H
 
 #include "child-process.h"
 
--- a/src/master/master-login-interface.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/master-login-interface.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MASTER_LOGIN_INTERFACE_H
-#define __MASTER_LOGIN_INTERFACE_H
+#ifndef MASTER_LOGIN_INTERFACE_H
+#define MASTER_LOGIN_INTERFACE_H
 
 #include "network.h"
 
--- a/src/master/master-settings.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/master-settings.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MASTER_SETTINGS_H
-#define __MASTER_SETTINGS_H
+#ifndef MASTER_SETTINGS_H
+#define MASTER_SETTINGS_H
 
 #include "network.h"
 
--- a/src/master/ssl-init.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/ssl-init.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SSL_INIT_H
-#define __SSL_INIT_H
+#ifndef SSL_INIT_H
+#define SSL_INIT_H
 
 #define SSL_PARAMETERS_FILENAME "ssl-parameters.dat"
 
--- a/src/master/syslog-util.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/master/syslog-util.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SYSLOG_UTIL_H
-#define __SYSLOG_UTIL_H
+#ifndef SYSLOG_UTIL_H
+#define SYSLOG_UTIL_H
 
 struct syslog_facility_list {
 	const char *name;
--- a/src/plugins/acl/acl-api-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/acl/acl-api-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ACL_API_PRIVATE_H
-#define __ACL_API_PRIVATE_H
+#ifndef ACL_API_PRIVATE_H
+#define ACL_API_PRIVATE_H
 
 #include "acl-api.h"
 
--- a/src/plugins/acl/acl-api.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/acl/acl-api.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ACL_API_H
-#define __ACL_API_H
+#ifndef ACL_API_H
+#define ACL_API_H
 
 struct mailbox_list;
 struct mail_storage;
--- a/src/plugins/acl/acl-backend-vfile.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/acl/acl-backend-vfile.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ACL_BACKEND_VFILE_H
-#define __ACL_BACKEND_VFILE_H
+#ifndef ACL_BACKEND_VFILE_H
+#define ACL_BACKEND_VFILE_H
 
 #include "acl-api-private.h"
 
--- a/src/plugins/acl/acl-cache.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/acl/acl-cache.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ACL_CACHE_H
-#define __ACL_CACHE_H
+#ifndef ACL_CACHE_H
+#define ACL_CACHE_H
 
 struct acl_backend;
 struct acl_rights_update;
--- a/src/plugins/acl/acl-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/acl/acl-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ACL_PLUGIN_H
-#define __ACL_PLUGIN_H
+#ifndef ACL_PLUGIN_H
+#define ACL_PLUGIN_H
 
 #include "mail-storage-private.h"
 
--- a/src/plugins/convert/convert-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/convert/convert-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CONVERT_PLUGIN_H
-#define __CONVERT_PLUGIN_H
+#ifndef CONVERT_PLUGIN_H
+#define CONVERT_PLUGIN_H
 
 void convert_plugin_init(void);
 void convert_plugin_deinit(void);
--- a/src/plugins/convert/convert-storage.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/convert/convert-storage.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CONVERT_STORAGE_H
-#define __CONVERT_STORAGE_H
+#ifndef CONVERT_STORAGE_H
+#define CONVERT_STORAGE_H
 
 struct convert_settings {
 	const char *user;
--- a/src/plugins/expire/auth-client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/expire/auth-client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __AUTH_CLIENT_H
-#define __AUTH_CLIENT_H
+#ifndef AUTH_CLIENT_H
+#define AUTH_CLIENT_H
 
 struct auth_connection *auth_connection_init(const char *auth_socket);
 void auth_connection_deinit(struct auth_connection *conn);
--- a/src/plugins/expire/expire-env.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/expire/expire-env.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __EXPIRE_ENV_H
-#define __EXPIRE_ENV_H
+#ifndef EXPIRE_ENV_H
+#define EXPIRE_ENV_H
 
 struct expire_env;
 
--- a/src/plugins/expire/expire-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/expire/expire-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __EXPIRE_PLUGIN_H
-#define __EXPIRE_PLUGIN_H
+#ifndef EXPIRE_PLUGIN_H
+#define EXPIRE_PLUGIN_H
 
 void expire_plugin_init(void);
 void expire_plugin_deinit(void);
--- a/src/plugins/fts-lucene/fts-lucene-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-lucene/fts-lucene-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FTS_LUCENE_PLUGIN_H
-#define __FTS_LUCENE_PLUGIN_H
+#ifndef FTS_LUCENE_PLUGIN_H
+#define FTS_LUCENE_PLUGIN_H
 
 #include "fts-api-private.h"
 
--- a/src/plugins/fts-lucene/lucene-wrapper.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-lucene/lucene-wrapper.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LUCENE_WRAPPER_H
-#define __LUCENE_WRAPPER_H
+#ifndef LUCENE_WRAPPER_H
+#define LUCENE_WRAPPER_H
 
 #include "fts-api-private.h"
 
--- a/src/plugins/fts-squat/fts-squat-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-squat/fts-squat-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FTS_SQUAT_PLUGIN_H
-#define __FTS_SQUAT_PLUGIN_H
+#ifndef FTS_SQUAT_PLUGIN_H
+#define FTS_SQUAT_PLUGIN_H
 
 #include "fts-api-private.h"
 
--- a/src/plugins/fts-squat/squat-trie-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-squat/squat-trie-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SQUAT_TRIE_PRIVATE_H
-#define __SQUAT_TRIE_PRIVATE_H
+#ifndef SQUAT_TRIE_PRIVATE_H
+#define SQUAT_TRIE_PRIVATE_H
 
 struct squat_trie_header {
 	uint8_t version;
--- a/src/plugins/fts-squat/squat-trie.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-squat/squat-trie.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SQUAT_TRIE_H
-#define __SQUAT_TRIE_H
+#ifndef SQUAT_TRIE_H
+#define SQUAT_TRIE_H
 
 enum file_lock_method;
 
--- a/src/plugins/fts-squat/squat-uidlist.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts-squat/squat-uidlist.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __SQUAT_UIDLIST_H
-#define __SQUAT_UIDLIST_H
+#ifndef SQUAT_UIDLIST_H
+#define SQUAT_UIDLIST_H
 
 #include "seq-range-array.h"
 
--- a/src/plugins/fts/fts-api-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts/fts-api-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FTS_API_PRIVATE_H
-#define __FTS_API_PRIVATE_H
+#ifndef FTS_API_PRIVATE_H
+#define FTS_API_PRIVATE_H
 
 #include "fts-api.h"
 
--- a/src/plugins/fts/fts-api.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts/fts-api.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FTS_API_H
-#define __FTS_API_H
+#ifndef FTS_API_H
+#define FTS_API_H
 
 struct mail;
 struct mailbox;
--- a/src/plugins/fts/fts-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/fts/fts-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __FTS_PLUGIN_H
-#define __FTS_PLUGIN_H
+#ifndef FTS_PLUGIN_H
+#define FTS_PLUGIN_H
 
 extern void (*fts_next_hook_mailbox_opened)(struct mailbox *box);
 
--- a/src/plugins/imap-quota/imap-quota-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/imap-quota/imap-quota-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __IMAP_QUOTA_PLUGIN_H
-#define __IMAP_QUOTA_PLUGIN_H
+#ifndef IMAP_QUOTA_PLUGIN_H
+#define IMAP_QUOTA_PLUGIN_H
 
 void imap_quota_plugin_init(void);
 void imap_quota_plugin_deinit(void);
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __LAZY_EXPUNGE_PLUGIN_H
-#define __TLAZY_EXPUNGE_PLUGIN_H
+#ifndef LAZY_EXPUNGE_PLUGIN_H
+#define TLAZY_EXPUNGE_PLUGIN_H
 
 void lazy_expunge_plugin_init(void);
 void lazy_expunge_plugin_deinit(void);
--- a/src/plugins/mail-log/mail-log-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/mail-log/mail-log-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MAIL_LOG_PLUGIN_H
-#define __MAIL_LOG_PLUGIN_H
+#ifndef MAIL_LOG_PLUGIN_H
+#define MAIL_LOG_PLUGIN_H
 
 void mail_log_plugin_init(void);
 void mail_log_plugin_deinit(void);
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __MBOX_SNARF_PLUGIN_H
-#define __MBOX_SNARF_PLUGIN_H
+#ifndef MBOX_SNARF_PLUGIN_H
+#define MBOX_SNARF_PLUGIN_H
 
 void mbox_snarf_plugin_init(void);
 void mbox_snarf_plugin_deinit(void);
--- a/src/plugins/quota/quota-fs.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/quota/quota-fs.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __QUOTA_FS_H
-#define __QUOTA_FS_H
+#ifndef QUOTA_FS_H
+#define QUOTA_FS_H
 
 #if defined (HAVE_STRUCT_DQBLK_CURBLOCKS) || \
 	defined (HAVE_STRUCT_DQBLK_CURSPACE)
--- a/src/plugins/quota/quota-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/quota/quota-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __QUOTA_PLUGIN_H
-#define __QUOTA_PLUGIN_H
+#ifndef QUOTA_PLUGIN_H
+#define QUOTA_PLUGIN_H
 
 struct mail_storage;
 
--- a/src/plugins/quota/quota-private.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/quota/quota-private.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __QUOTA_PRIVATE_H
-#define __QUOTA_PRIVATE_H
+#ifndef QUOTA_PRIVATE_H
+#define QUOTA_PRIVATE_H
 
 #include "mail-storage-private.h"
 #include "quota.h"
--- a/src/plugins/quota/quota.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/quota/quota.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __QUOTA_H
-#define __QUOTA_H
+#ifndef QUOTA_H
+#define QUOTA_H
 
 struct mail;
 struct mailbox;
--- a/src/plugins/trash/trash-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/trash/trash-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __TRASH_PLUGIN_H
-#define __TRASH_PLUGIN_H
+#ifndef TRASH_PLUGIN_H
+#define TRASH_PLUGIN_H
 
 void trash_plugin_init(void);
 void trash_plugin_deinit(void);
--- a/src/plugins/zlib/istream-zlib.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/zlib/istream-zlib.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ISTREAM_ZLIB_H
-#define __ISTREAM_ZLIB_H
+#ifndef ISTREAM_ZLIB_H
+#define ISTREAM_ZLIB_H
 
 struct istream *i_stream_create_zlib(int fd);
 
--- a/src/plugins/zlib/zlib-plugin.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/plugins/zlib/zlib-plugin.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __ZLIB_PLUGIN_H
-#define __ZLIB_PLUGIN_H
+#ifndef ZLIB_PLUGIN_H
+#define ZLIB_PLUGIN_H
 
 void zlib_plugin_init(void);
 void zlib_plugin_deinit(void);
--- a/src/pop3-login/client-authenticate.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3-login/client-authenticate.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_AUTHENTICATE_H
-#define __CLIENT_AUTHENTICATE_H
+#ifndef CLIENT_AUTHENTICATE_H
+#define CLIENT_AUTHENTICATE_H
 
 bool cmd_capa(struct pop3_client *client, const char *args);
 bool cmd_user(struct pop3_client *client, const char *args);
--- a/src/pop3-login/client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3-login/client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_H
-#define __CLIENT_H
+#ifndef CLIENT_H
+#define CLIENT_H
 
 #include "network.h"
 #include "master.h"
--- a/src/pop3-login/pop3-proxy.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3-login/pop3-proxy.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __POP3_PROXY_H
-#define __POP3_PROXY_H
+#ifndef POP3_PROXY_H
+#define POP3_PROXY_H
 
 #include "login-proxy.h"
 
--- a/src/pop3/capability.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3/capability.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __POP3_CAPABILITY_H
-#define __POP3_CAPABILITY_H
+#ifndef POP3_CAPABILITY_H
+#define POP3_CAPABILITY_H
 
 #define POP3_CAPABILITY_REPLY \
 	"CAPA\r\n" \
--- a/src/pop3/client.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3/client.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __CLIENT_H
-#define __CLIENT_H
+#ifndef CLIENT_H
+#define CLIENT_H
 
 struct client;
 struct mail_storage;
--- a/src/pop3/commands.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3/commands.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMANDS_H
-#define __COMMANDS_H
+#ifndef COMMANDS_H
+#define COMMANDS_H
 
 int client_command_execute(struct client *client,
 			   const char *name, const char *args);
--- a/src/pop3/common.h	Sun Sep 16 11:07:42 2007 +0300
+++ b/src/pop3/common.h	Sun Sep 16 11:31:27 2007 +0300
@@ -1,5 +1,5 @@
-#ifndef __COMMON_H
-#define __COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "lib.h"
 #include "client.h"