tidy: unify include-guards

- add missing include-guards
- unify existing include-guards
- unnecessary conditionals around whole source

diff --git a/account.h b/account.h
index 8cbc19539876d3d24ee23b5207b3157533ff697c..d418b26828bbd962e5b5a0ad01db3f2055f7eb5b 100644 (file)
--- a/account.h
+++ b/account.h
@@ -17,8 +17,8 @@
 
 /* remote host account manipulation (POP/IMAP) */
 
-#ifndef _MUTT_ACCOUNT_H_
-#define _MUTT_ACCOUNT_H_ 1
+#ifndef _MUTT_ACCOUNT_H
+#define _MUTT_ACCOUNT_H 1
 
 #include "url.h"
 
@@ -58,4 +58,4 @@ int mutt_account_getlogin (ACCOUNT* account);
 int mutt_account_getpass (ACCOUNT* account);
 void mutt_account_unsetpass (ACCOUNT* account);
 
-#endif /* _MUTT_ACCOUNT_H_ */
+#endif /* _MUTT_ACCOUNT_H */

diff --git a/ascii.h b/ascii.h
index d3391398fe2f022c7f76794d24a0776dc43c2a46..eaf13513d35cb906d131be6d3fb6eeb6fee4b606 100644 (file)
--- a/ascii.h
+++ b/ascii.h
@@ -15,14 +15,13 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 /*
  * Versions of the string comparison functions which are
  * locale-insensitive.
  */
 
-#ifndef _ASCII_H
-# define _ASCII_H
+#ifndef _MUTT_ASCII_H
+#define _MUTT_ASCII_H 1
 
 #include <ctype.h>
 
@@ -44,4 +43,4 @@ static inline char* ascii_strlower (char *s)
   return s;
 }
 
-#endif
+#endif /* _MUTT_ASCII_H */

diff --git a/attach.h b/attach.h
index 7aa129a3532b97c062a9e893c85df4efc037d8d3..a581146f3515cc6275a59eb73b5858153a63e4c2 100644 (file)
--- a/attach.h
+++ b/attach.h
@@ -17,8 +17,8 @@
 
 /* common protos for compose / attach menus */
 
-#ifndef _ATTACH_H_
-#define _ATTACH_H_ 1
+#ifndef _MUTT_ATTACH_H
+#define _MUTT_ATTACH_H 1
 
 #include "mutt_menu.h"
 
@@ -52,4 +52,5 @@ void mutt_attach_forward(FILE *fp, HEADER *hdr, ATTACHPTR **idx, short idxlen,
                          BODY *cur, int flags);
 void mutt_attach_reply(FILE *fp, HEADER *hdr, ATTACHPTR **idx, short idxlen,
                        BODY *cur, int flags);
-#endif /* _ATTACH_H_ */
+
+#endif /* _MUTT_ATTACH_H */

diff --git a/bcache.h b/bcache.h
index dfb9d655009e46955c29fa543de6808d15a3cc7f..a0859f9d98c20458a509a216d7ad5fa327835cb5 100644 (file)
--- a/bcache.h
+++ b/bcache.h
@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License along with
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef _BCACHE_H_
-#define _BCACHE_H_ 1
+
+#ifndef _MUTT_BCACHE_H
+#define _MUTT_BCACHE_H 1
 
 #include "account.h"
 
@@ -75,4 +76,4 @@ int mutt_bcache_list(body_cache_t *bcache,
                     int (*want_id)(const char *id, body_cache_t *bcache,
                                    void *data), void *data);
 
-#endif /* _BCACHE_H_ */
+#endif /* _MUTT_BCACHE_H */

diff --git a/browser.h b/browser.h
index 40a9e7baf421c420c768d195132d5d011518edd2..2590e9f792062c5a24ffe28ef154d8122ad9b021 100644 (file)
--- a/browser.h
+++ b/browser.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _BROWSER_H
-#define _BROWSER_H 1
+#ifndef _MUTT_BROWSER_H
+#define _MUTT_BROWSER_H 1
 
 #ifdef USE_NNTP
 #include "nntp.h"
@@ -66,4 +66,5 @@ struct browser_state
   unsigned unmarked : 1;
 #endif
 };
-#endif /* _BROWSER_H */
+
+#endif /* _MUTT_BROWSER_H */

diff --git a/buffer.h b/buffer.h
index 0faa607d129b322c20cd904cf74f8b69b4206a89..c40c891885c8d2270b0c2f80dd155c59e63b0ad5 100644 (file)
--- a/buffer.h
+++ b/buffer.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BUFFER_INCLUDED
-#define BUFFER_INCLUDED
+#ifndef _MUTT_BUFFER_H
+#define _MUTT_BUFFER_H 1
 
 #include <sys/types.h>
 
@@ -44,5 +44,4 @@ void mutt_buffer_addstr(BUFFER *buf, const char *s);
 void mutt_buffer_addch(BUFFER *buf, char c);
 int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags);
 
-#endif
-
+#endif /* _MUTT_BUFFER_H */

diff --git a/buffy.h b/buffy.h
index f6a0c50cff86afd4644154a6e2fd78d8a61dee60..8910f1064842b3f840be681d3882d99be16897f1 100644 (file)
--- a/buffy.h
+++ b/buffy.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _BUFFY_H
-#define _BUFFY_H
+#ifndef _MUTT_BUFFY_H
+#define _MUTT_BUFFY_H 1
 
 /*parameter to mutt_parse_mailboxes*/
 #define MUTT_MAILBOXES   1
@@ -68,4 +68,4 @@ void mutt_buffy_setnotified (const char *path);
 
 int mh_buffy (BUFFY *mailbox, int check_stats);
 
-#endif /* _BUFFY_H */
+#endif /* _MUTT_BUFFY_H */

diff --git a/charset.h b/charset.h
index 6f66b093ae780953fd736b33afc5746eedc61177..29e02f5d7a4d352d154cff509509efd747af7327 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CHARSET_H
-#define _CHARSET_H
+#ifndef _MUTT_CHARSET_H
+#define _MUTT_CHARSET_H 1
 
 #include <iconv.h>
 
@@ -50,4 +50,4 @@ char *mutt_get_default_charset (void);
  */
 int mutt_check_charset (const char *s, int strict);
 
-#endif /* _CHARSET_H */
+#endif /* _MUTT_CHARSET_H */

diff --git a/compress.h b/compress.h
index 94cafeca581289f8b443b03cd1619abfab2a05df..bfa262b673f75cb7ce7019b0a7c8b52f10a571f0 100644 (file)
--- a/compress.h
+++ b/compress.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMPRESS_H_
-#define _COMPRESS_H_
+#ifndef _MUTT_COMPRESS_H
+#define _MUTT_COMPRESS_H 1
 
 int mutt_comp_can_append    (CONTEXT *ctx);
 int mutt_comp_can_read      (const char *path);
@@ -25,4 +25,4 @@ int mutt_comp_valid_command (const char *cmd);
 
 extern struct mx_ops mx_comp_ops;
 
-#endif /* _COMPRESS_H_ */
+#endif /* _MUTT_COMPRESS_H */

diff --git a/copy.h b/copy.h
index 72da8a519f8a5e5eb873bf33745d11839ce26b41..51b69c2658cb64be17bf9d82b05c724ed18b8019 100644 (file)
--- a/copy.h
+++ b/copy.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_COPY_H
+#define _MUTT_COPY_H 1
+
 /* flags to _mutt_copy_message */
 #define MUTT_CM_NOHEADER        1       /* don't copy the message header */
 #define MUTT_CM_PREFIX          (1<<1)  /* quote the message */
@@ -66,3 +69,5 @@ int _mutt_copy_message(FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
 int mutt_copy_message(FILE *fpout, CONTEXT *src, HEADER *hdr, int flags, int chflags);
 
 int mutt_append_message(CONTEXT *dest, CONTEXT *src, HEADER *hdr, int cmflags, int chflags);
+
+#endif /* _MUTT_COPY_H */

diff --git a/crypt-gpgme.h b/crypt-gpgme.h
index 7f5bd82f9bbe9513dc9ac69daadc4551bc6b78bf..f9c174f756a1ac8181479f2648fd1ec9e54652c8 100644 (file)
--- a/crypt-gpgme.h
+++ b/crypt-gpgme.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CRYPT_GPGME_H
-#define CRYPT_GPGME_H
+#ifndef _MUTT_CRYPT_GPGME_H
+#define _MUTT_CRYPT_GPGME_H 1
 
 #include "mutt_crypt.h"
 
@@ -54,4 +54,4 @@ int smime_gpgme_verify_sender (HEADER *h);
 
 void mutt_gpgme_set_sender (const char *sender);
 
-#endif
+#endif /* _MUTT_CRYPT_GPGME_H */

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 1333cf759a23d554d0b92689451e6d81e3549d26..44dffa49cc9b46f84bbe0f5514b35192fbf5efcc 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef CRYPT_BACKEND_GPGME
-
 #include "crypt-mod.h"
 #include "crypt-gpgme.h"
 
@@ -140,4 +138,3 @@ struct crypt_module_specs crypt_mod_pgp_gpgme =
     }
   };
 
-#endif

diff --git a/crypt-mod-smime-gpgme.c b/crypt-mod-smime-gpgme.c
index 368f53a328ac672c61cec1dbc8e3e029bfaeaa0d..b2c19bb0ba5bfd62dc039a5014efe7998acd2a8a 100644 (file)
--- a/crypt-mod-smime-gpgme.c
+++ b/crypt-mod-smime-gpgme.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#ifdef CRYPT_BACKEND_GPGME
-
 #include "crypt-mod.h"
 #include "crypt-gpgme.h"
 
@@ -112,4 +110,3 @@ struct crypt_module_specs crypt_mod_smime_gpgme =
     }
   };
 
-#endif

diff --git a/crypt-mod.h b/crypt-mod.h
index cfa4069232e1c660ed26e4688d3fdf7d0667524f..61149a3096cff928d5a3a797af3cd2ae00971e58 100644 (file)
--- a/crypt-mod.h
+++ b/crypt-mod.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CRYPTOGRAPHY_H
-#define CRYPTOGRAPHY_H
+#ifndef _MUTT_CRYPT_MOD_H
+#define _MUTT_CRYPT_MOD_H 1
 
 #include "mutt.h"
 #include "mutt_crypt.h"
@@ -134,4 +134,4 @@ crypt_module_specs_t crypto_module_lookup (int identifier);
 #define CRYPT_MOD_CALL(identifier, func) \
   *(crypto_module_lookup (APPLICATION_ ## identifier))->functions.func
 
-#endif
+#endif /* _MUTT_CRYPT_MOD_H */

diff --git a/crypthash.h b/crypthash.h
index de7653362be4395a28066f059da8a9d3a9eeb8d9..c00c982947374f121b77920422b5608505e2e42c 100644 (file)
--- a/crypthash.h
+++ b/crypthash.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CRYPTHASH_H
-# define _CRYPTHASH_H
+#ifndef _MUTT_CRYPTHASH_H
+#define _MUTT_CRYPTHASH_H 1
 
 
 # include <sys/types.h>
@@ -29,4 +29,4 @@
 /* POINTER defines a generic pointer type */
 typedef unsigned char *POINTER;
 
-#endif
+#endif /* _MUTT_CRYPTHASH_H */

diff --git a/doc/makedoc-defs.h b/doc/makedoc-defs.h
index 6a4bd2df6b51f17b4ad0af47eee6264495485b15..c6f05c16c753ce92f8fc1cc842b670540be2d67e 100644 (file)
--- a/doc/makedoc-defs.h
+++ b/doc/makedoc-defs.h
@@ -15,6 +15,9 @@
 
 /* build complete documentation */
 
+#ifndef _MUTT_MAKEDOC_DEFS_H
+#define _MUTT_MAKEDOC_DEFS_H 1
+
 #ifdef MAKEDOC_FULL
 # ifndef CRYPT_BACKEND_GPGME
 #  define CRYPT_BACKEND_GPGME
@@ -83,3 +86,5 @@
 #  define USE_LUA
 # endif
 #endif
+
+#endif /* _MUTT_MAKEDOC_DEFS_H */

diff --git a/dotlock.h b/dotlock.h
index 1a67a78d805477f8caf2af323ffe8616f4896c18..145e4e430c72682cdcc09a89f7c85602f4df4e79 100644 (file)
--- a/dotlock.h
+++ b/dotlock.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DOTLOCK_H
-#define _DOTLOCK_H
+#ifndef _MUTT_DOTLOCK_H
+#define _MUTT_DOTLOCK_H 1
 
 /* exit values */
 
@@ -42,4 +42,4 @@
 int dotlock_invoke (const char *, int, int, int);
 #endif
 
-#endif
+#endif /* _MUTT_DOTLOCK_H */

diff --git a/filter.h b/filter.h
index aa13fb72e00f734ee58f671399f586c4635e2b43..90c24ff968273dd812c73adc8b86f10a0c401b0e 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILTER_INCLUDED
-#define FILTER_INCLUDED
+#ifndef _MUTT_FILTER_H
+#define _MUTT_FILTER_H 1
 
 #include <unistd.h>
 #include <stdio.h>
@@ -24,5 +24,4 @@ pid_t mutt_create_filter_fd(const char *cmd, FILE **in, FILE **out, FILE **err,
 pid_t mutt_create_filter(const char *s, FILE **in, FILE **out, FILE **err);
 int mutt_wait_filter(pid_t pid);
 
-#endif
-
+#endif /* _MUTT_FILTER_H */

diff --git a/functions.h b/functions.h
index 829344212ea086c425f1696a57385609dbfdc510..b458cc20a4188289a3afd26f8a70f42790107ea7 100644 (file)
--- a/functions.h
+++ b/functions.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_FUNCTIONS_H
+#define _MUTT_FUNCTIONS_H 1
+
 /*
  * This file contains the structures needed to parse ``bind'' commands, as
  * well as the default bindings for each menu.
@@ -565,3 +568,5 @@ const struct binding_t OpMix[] = { /* map: mixmaster */
 };
 #endif /* MIXMASTER */
 // clang-format on
+
+#endif /* _MUTT_FUNCTIONS_H */

diff --git a/globals.h b/globals.h
index e8d2ebeaf49db14942433a4580a43be9c23062b0..96467138c75b10e81c1acc118401b671c58591db 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_GLOBALS_H
+#define _MUTT_GLOBALS_H 1
+
 WHERE void (*mutt_error) (const char *, ...);
 WHERE void (*mutt_message) (const char *, ...);
 
@@ -350,3 +353,5 @@ extern const char * const Months[];
 #include "mutt_crypt.h"
 #include "git-ver.h"
 #endif /* MAIN_C */
+
+#endif /* _MUTT_GLOBALS_H */

diff --git a/group.h b/group.h
index ac1b3df79cee1d14dc297736252e22eaf0d70f12..bcdabc055d3169be33debf0058a95fb6c199c376 100644 (file)
--- a/group.h
+++ b/group.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_GROUP_H_
-#define _MUTT_GROUP_H_ 1
+#ifndef _MUTT_GROUP_H
+#define _MUTT_GROUP_H 1
 
 #define MUTT_GROUP   0
 #define MUTT_UNGROUP 1
@@ -33,4 +33,4 @@ int mutt_group_context_clear(group_context_t **ctx);
 int mutt_group_context_remove_rx(group_context_t *ctx, const char *s);
 int mutt_group_context_remove_adrlist(group_context_t *ctx, ADDRESS *a);
 
-#endif /* _MUTT_GROUP_H_ */
+#endif /* _MUTT_GROUP_H */

diff --git a/hash.h b/hash.h
index 501fbf2814c5d9312192edec6485fd360fa8f3c0..fca5e0486f71e9c52298e76b793c5f1baf1c952f 100644 (file)
--- a/hash.h
+++ b/hash.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HASH_H
-#define _HASH_H
+#ifndef _MUTT_HASH_H
+#define _MUTT_HASH_H 1
 
 union hash_key
 {
@@ -74,4 +74,4 @@ struct hash_walk_state {
 
 struct hash_elem *hash_walk(const HASH *table, struct hash_walk_state *state);
 
-#endif
+#endif /* _MUTT_HASH_H */

diff --git a/hcache-backend.h b/hcache-backend.h
index 29c38e451d1745a0df0ac218cfc31983da1bfd8b..9d7b1ecb478992e60ef2a371b11cd7f010495d0b 100644 (file)
--- a/hcache-backend.h
+++ b/hcache-backend.h
@@ -18,8 +18,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HCACHE_BACKEND_H_
-#define _HCACHE_BACKEND_H_
+#ifndef _MUTT_HCACHE_BACKEND_H
+#define _MUTT_HCACHE_BACKEND_H 1
 
 #include <stdlib.h> /* for size_t */
 
@@ -128,4 +128,4 @@ typedef struct
     .backend = hcache_##_name##_backend       \
   };
 
-#endif /* _HCACHE_BACKEND_H_ */
+#endif /* _MUTT_HCACHE_BACKEND_H */

diff --git a/hcache.h b/hcache.h
index 53ebd2fa8243f46bde81f9f1a1bfaf9efec9b35e..7af66ce293f5333b3641c53c15060b427ddf574a 100644 (file)
--- a/hcache.h
+++ b/hcache.h
@@ -18,8 +18,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HCACHE_H_
-#define _HCACHE_H_ 1
+#ifndef _MUTT_HCACHE_H
+#define _MUTT_HCACHE_H 1
 
 #include "mutt.h"
 
@@ -157,4 +157,4 @@ int
 mutt_hcache_is_valid_backend(const char *s);
 
 
-#endif /* _HCACHE_H_ */
+#endif /* _MUTT_HCACHE_H */

diff --git a/history.h b/history.h
index f3c12402ff74d62beb35f1ce508e0015ced336c4..cd8610b5df825d544065d37383ae834f5c2e6a1b 100644 (file)
--- a/history.h
+++ b/history.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HISTORY_H
-#define _HISTORY_H
+#ifndef _MUTT_HISTORY_H
+#define _MUTT_HISTORY_H 1
 
 enum history_class
 {
@@ -44,4 +44,4 @@ void mutt_reset_history_state(history_class_t hclass);
 int mutt_history_at_scratch(history_class_t hclass);
 void mutt_history_save_scratch(history_class_t hclass, const char *s);
 
-#endif
+#endif /* _MUTT_HISTORY_H */

diff --git a/imap/auth.h b/imap/auth.h
index a457181042ec91470f6793bf83ecb3c911ffd3b7..8ff959861acf473876d46d1e47d422dbfa056518 100644 (file)
--- a/imap/auth.h
+++ b/imap/auth.h
@@ -18,8 +18,8 @@
 /* common defs for authenticators. A good place to set up a generic callback
  * system */
 
-#ifndef _IMAP_AUTH_H
-#define _IMAP_AUTH_H 1
+#ifndef _MUTT_IMAP_AUTH_H
+#define _MUTT_IMAP_AUTH_H 1
 
 typedef enum
 {
@@ -52,4 +52,4 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA* idata, const char* method);
 imap_auth_res_t imap_auth_sasl (IMAP_DATA* idata, const char* method);
 #endif
 
-#endif /* _IMAP_AUTH_H */
+#endif /* _MUTT_IMAP_AUTH_H */

diff --git a/imap/imap.h b/imap/imap.h
index c2b437aabcce01c90eaa0a20f5a8530c5d7a2fd7..53a7a1ef149f14731dffca8d7291d957d3bcdefe 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _IMAP_H
-#define _IMAP_H 1
+#ifndef _MUTT_IMAP_H
+#define _MUTT_IMAP_H 1
 
 #include "account.h"
 #include "browser.h"
@@ -73,4 +73,4 @@ void imap_get_parent (char *output, const char *mbox, size_t olen, char delim);
 void imap_get_parent_path (char *output, const char *path, size_t olen);
 void imap_clean_path (char *path, size_t plen);
 
-#endif
+#endif /* _MUTT_IMAP_H */

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 6011749232a21714e7b12a9e059859b374ab2ed6..011285684d530563d029858ad76ff79566789ccd 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _IMAP_PRIVATE_H
-#define _IMAP_PRIVATE_H 1
+#ifndef _MUTT_IMAP_PRIVATE_H
+#define _MUTT_IMAP_PRIVATE_H 1
 
 #include "account.h"
 #include "imap.h"
@@ -309,4 +309,4 @@ void imap_utf_decode (IMAP_DATA *idata, char **s);
 #define imap_hcache_keylen mutt_strlen
 #endif /* USE_HCACHE */
 
-#endif
+#endif /* _MUTT_IMAP_PRIVATE_H */

diff --git a/imap/message.h b/imap/message.h
index 24066dd4008d2fb7b25ece63ded01c57adf1e0fb..163859d80ca519943e8099a84260ef96c8535868 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -18,8 +18,8 @@
 
 /* message.c data structures */
 
-#ifndef MESSAGE_H
-#define MESSAGE_H 1
+#ifndef _MUTT_IMAP_MESSAGE_H
+#define _MUTT_IMAP_MESSAGE_H 1
 
 /* -- data structures -- */
 /* IMAP-specific header data, stored as HEADER->data */
@@ -52,4 +52,4 @@ typedef struct
 /* -- macros -- */
 #define HEADER_DATA(ph) ((IMAP_HEADER_DATA*) ((ph)->data))
 
-#endif /* MESSAGE_H */
+#endif /* _MUTT_IMAP_MESSAGE_H */

diff --git a/init.h b/init.h
index 0056d4bf951c8d2323d1070a022b0b0f1dbde358..8581fd8e1ed7d11513650b2cc59690414e57ddf7 100644 (file)
--- a/init.h
+++ b/init.h
@@ -16,6 +16,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_INIT_H
+#define _MUTT_INIT_H 1
+
 #ifdef _MAKEDOC
 # include "config.h"
 # include "doc/makedoc-defs.h"
@@ -4525,3 +4528,5 @@ const struct command_t Commands[] = {
   { "unsubscribe",     parse_unsubscribe,      0 },
   { NULL,              NULL,                   0 }
 };
+
+#endif /* _MUTT_INIT_H */

diff --git a/keymap.h b/keymap.h
index e15c65b064949f00358a92f39baa7836666e36d1..e1300103e9636070345878645ab1f9d7db32aafa 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYMAP_H
-#define KEYMAP_H
+#ifndef _MUTT_KEYMAP_H
+#define _MUTT_KEYMAP_H 1
 
 #include "mapping.h"
 
@@ -118,4 +118,4 @@ extern const struct binding_t OpMix[];
 
 #include "keymap_defs.h"
 
-#endif /* KEYMAP_H */
+#endif /* _MUTT_KEYMAP_H */

diff --git a/lib.h b/lib.h
index 7404bcbc683f18011cd1cd408bc7ce27eb311c58..da02da64d7b74b57ae602be01efdb2af5a754c93 100644 (file)
--- a/lib.h
+++ b/lib.h
@@ -18,8 +18,8 @@
 
 /* mutt functions which are generally useful. */
 
-#ifndef _LIB_H
-# define _LIB_H
+#ifndef _MUTT_LIB_H
+#define _MUTT_LIB_H 1
 
 # include <stdio.h>
 # include <string.h>
@@ -206,4 +206,5 @@ void safe_realloc (void *, size_t);
 int  mutt_inbox_cmp (const char *a, const char *b);
 
 const char *mutt_strsysexit(int e);
-#endif
+
+#endif /* _MUTT_LIB_H */

diff --git a/mailbox.h b/mailbox.h
index 9e626bdb40eda4f96eac49b1077d2cd753ed5e07..dee3e77ee88cc9ca1be556ccbd84f31e44100f86 100644 (file)
--- a/mailbox.h
+++ b/mailbox.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MAILBOX_H
-#define _MAILBOX_H
+#ifndef _MUTT_MAILBOX_H
+#define _MUTT_MAILBOX_H 1
 
 /* flags for mutt_open_mailbox() */
 #define MUTT_NOSORT     (1<<0) /* do not sort the mailbox after opening it */
@@ -88,4 +88,4 @@ int mx_check_empty(const char *path);
 int mx_is_maildir(const char *path);
 int mx_is_mh(const char *path);
 
-#endif
+#endif /* _MUTT_MAILBOX_H */

diff --git a/mapping.h b/mapping.h
index ef75c2110cd8ff0529219046b66ea80a399173dc..7d6c007e7fa08d3ec233939ec72fdbc82a7430df 100644 (file)
--- a/mapping.h
+++ b/mapping.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPPING_H
-#define MAPPING_H
+#ifndef _MUTT_MAPPING_H
+#define _MUTT_MAPPING_H 1
 
 struct mapping_t
 {
@@ -29,4 +29,4 @@ char *mutt_compile_help(char *buf, size_t buflen, int menu, const struct mapping
 
 int mutt_getvaluebyname(const char *name, const struct mapping_t *map);
 
-#endif
+#endif /* _MUTT_MAPPING_H */

diff --git a/mbyte.h b/mbyte.h
index 8fde29b97867106a8a0bbcd8f1d98370f6d6e770..3ad916c1d60c35e52a0eac231d236090a92c602f 100644 (file)
--- a/mbyte.h
+++ b/mbyte.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MBYTE_H
-# define _MBYTE_H
+#ifndef _MUTT_MBYTE_H
+#define _MUTT_MBYTE_H 1
 
 # ifdef HAVE_WC_FUNCS
 #  ifdef HAVE_WCHAR_H
@@ -65,4 +65,4 @@ extern int Charset_is_utf8;
 wchar_t replacement_char(void);
 int is_display_corrupting_utf8(wchar_t wc);
 
-#endif /* _MBYTE_H */
+#endif /* _MUTT_MBYTE_H */

diff --git a/md5.h b/md5.h
index 1280c0fce878c9bcdc97c59df52a990955bd694b..c06c357f3e8524638fe038524fc8c09ed87b3ced 100644 (file)
--- a/md5.h
+++ b/md5.h
@@ -22,8 +22,8 @@
  * Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
  */
 
-#ifndef _MD5_H
-#define _MD5_H 1
+#ifndef _MUTT_MD5_H
+#define _MUTT_MD5_H 1
 
 #include <stdio.h>
 
@@ -127,4 +127,4 @@ extern int __md5_stream (FILE *stream, void *resblock) __THROW;
 extern void *__md5_buffer (const char *buffer, size_t len,
                           void *resblock) __THROW;
 
-#endif /* md5.h */
+#endif /* _MUTT_MD5_H */

diff --git a/mime.h b/mime.h
index cbf0b6eedece0e327a852450c8e8cc2bfee0988b..028de19e7e4b1fca5945750f52d2aa42d251d747 100644 (file)
--- a/mime.h
+++ b/mime.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_MIME_H
+#define _MUTT_MIME_H 1
+
 /* Content-Type */
 enum
 {
@@ -76,3 +79,5 @@ extern const char *BodyEncodings[];
 #ifndef _SENDLIB_C
 extern char MimeSpecials[];
 #endif
+
+#endif /* _MUTT_MIME_H */

diff --git a/mutt.h b/mutt.h
index 93ae78e08b8f206957e3dc81b08aafdb7f2c92c1..48ba7c67392a281e3b2c64769c95c69e3bb930fa 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTT_H
-#define MUTT_H
+#ifndef _MUTT_H
+#define _MUTT_H 1
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1157,8 +1157,4 @@ typedef struct
 #include "lib.h"
 #include "globals.h"
 
-#endif /*MUTT_H*/
-
-
-
-
+#endif /* _MUTT_H */

diff --git a/mutt_commands.h b/mutt_commands.h
index c0550b2d7c001ee3bd41cc3da8dd21094be28861..ea18bde4c38614c530456a027be73239c07ffedf 100644 (file)
--- a/mutt_commands.h
+++ b/mutt_commands.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTT_COMMANDS_H
-#define MUTT_COMMANDS_H
+#ifndef _MUTT_COMMANDS_H
+#define _MUTT_COMMANDS_H 1
 
 #include "mutt.h"
 
@@ -30,4 +30,4 @@ struct command_t
 const struct command_t *mutt_command_get(const char *s);
 void mutt_commands_apply(void *data, void (*application)(void *, const struct command_t *));
 
-#endif
+#endif /* _MUTT_COMMANDS_H */

diff --git a/mutt_crypt.h b/mutt_crypt.h
index 6413cbd3e2a5b66ebe362ad08b355b4a967ad190..08bd3e463c9c59e2f42c7cb17881a3902a546c81 100644 (file)
--- a/mutt_crypt.h
+++ b/mutt_crypt.h
@@ -21,8 +21,8 @@
    all defined in crypt.c and cryptglue.c
 */
 
-#ifndef MUTT_CRYPT_H
-#define MUTT_CRYPT_H
+#ifndef _MUTT_CRYPT_H
+#define _MUTT_CRYPT_H 1
 
 #include "mutt.h"        /* Need this to declare BODY, ADDRESS. STATE etc. */
 /* FIXME: They should be pointer to anonymous structures for better
@@ -285,4 +285,4 @@ int crypt_smime_verify_one (BODY *sigbdy, STATE *s, const char *tempf);
 
 void crypt_init (void);
 
-#endif /*MUTT_CRYPT_H*/
+#endif /* _MUTT_CRYPT_H */

diff --git a/mutt_curses.h b/mutt_curses.h
index ffe8eacfbc2c2db4e404fecd467f392f688088a3..766078a4ce7c13a6643e48a1922f8bc488f81714 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_CURSES_H_
-#define _MUTT_CURSES_H_ 1
+#ifndef _MUTT_CURSES_H
+#define _MUTT_CURSES_H 1
 
 #ifdef USE_SLANG_CURSES
 
@@ -258,4 +258,4 @@ void ci_start_color (void);
 
 #define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
 
-#endif /* _MUTT_CURSES_H_ */
+#endif /* _MUTT_CURSES_H */

diff --git a/mutt_idna.h b/mutt_idna.h
index 60ee6beafc47d31fc670b0f1319d05fff1c74459..454d6dd5681a8ba7fba0ac6e29f342ed0d0f12cf 100644 (file)
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -16,7 +16,7 @@
  */
 
 #ifndef _MUTT_IDNA_H
-# define _MUTT_IDNA_H
+#define _MUTT_IDNA_H 1
 
 #include "rfc822.h"
 #include "charset.h"
@@ -52,4 +52,4 @@ int mutt_env_to_intl(ENVELOPE *env, char **tag, char **err);
 
 const char *mutt_addr_for_display (ADDRESS *a);
 
-#endif
+#endif /* _MUTT_IDNA_H */

diff --git a/mutt_lua.h b/mutt_lua.h
index 5521cfe47c89ba87bbdeea669d65974bdeb33af5..7a9f88ff70df17abb4ef353330522fd3f8e838d7 100644 (file)
--- a/mutt_lua.h
+++ b/mutt_lua.h
@@ -16,7 +16,7 @@
  */
 
 #ifndef _MUTT_LUA_H
-#define _MUTT_LUA_H
+#define _MUTT_LUA_H 1
 
 #include "mutt.h"
 

diff --git a/mutt_menu.h b/mutt_menu.h
index 9c55b44c6feadb7e08fa4d6e54dfeb2ec3194f7f..606183d75b1dd9db4c85b226a9355a50fe9328fa 100644 (file)
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -19,8 +19,8 @@
  * This file is named mutt_menu.h so it doesn't collide with ncurses menu.h
  */
 
-#ifndef _MUTT_MENU_H_
-#define _MUTT_MENU_H_ 1
+#ifndef _MUTT_MENU_H
+#define _MUTT_MENU_H 1
 
 #include "keymap.h"
 #include "mutt_regex.h"
@@ -127,4 +127,4 @@ int index_color(int index_no);
 
 int mutt_limit_current_thread (HEADER *h);
 
-#endif /* _MUTT_MENU_H_ */
+#endif /* _MUTT_MENU_H */

diff --git a/mutt_notmuch.h b/mutt_notmuch.h
index b7620fbc101d95f99052fe29c37fff6309bf4bf8..349b1f80c6387482eff76bec69095d69901c0880 100644 (file)
--- a/mutt_notmuch.h
+++ b/mutt_notmuch.h
@@ -16,7 +16,7 @@
  */
 
 #ifndef _MUTT_NOTMUCH_H
-#define _MUTT_NOTMUCH_H
+#define _MUTT_NOTMUCH_H 1
 
 #include <stdbool.h>
 

diff --git a/mutt_options.h b/mutt_options.h
index 56c54f2f9f930e1a5cf5efedf82d0aa01c403d52..fcfc399106a1a0a37a3d249160a1c3e5e4086a10 100644 (file)
--- a/mutt_options.h
+++ b/mutt_options.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTT_OPTIONS_H
-#define MUTT_OPTIONS_H
+#ifndef _MUTT_OPTIONS_H
+#define _MUTT_OPTIONS_H 1
 
 #include "mutt.h"
 
@@ -58,4 +58,4 @@ int mutt_option_to_string(const struct option_t *opt, char *val, size_t len);
 const struct option_t *mutt_option_get(const char *s);
 int mutt_option_set(const struct option_t *val, BUFFER *err);
 
-#endif
+#endif /* _MUTT_OPTIONS_H */

diff --git a/mutt_regex.h b/mutt_regex.h
index af98baad512777b15df1ee00e4bbc9e23ceeb18c..eb6e1f00288f332f49439a9e1d082d3adf5490ef 100644 (file)
--- a/mutt_regex.h
+++ b/mutt_regex.h
@@ -19,8 +19,8 @@
  * A (more) generic interface to regular expression matching
  */
 
-#ifndef MUTT_REGEX_H
-#define MUTT_REGEX_H
+#ifndef _MUTT_REGEX_H
+#define _MUTT_REGEX_H 1
 
 #include <regex.h>
 
@@ -47,4 +47,4 @@ WHERE REGEXP ReplyRegexp;
 WHERE REGEXP Smileys;
 WHERE REGEXP GecosMask;
 
-#endif /* MUTT_REGEX_H */
+#endif /* _MUTT_REGEX_H */

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 2dfaf27646b5953ce149e2b74c5becc5206b48fa..5393085b7a418ec3c01b663f3c0973378a9f2848 100644 (file)
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -17,8 +17,8 @@
 
 /* common SASL helper routines */
 
-#ifndef _MUTT_SASL_H_
-#define _MUTT_SASL_H_ 1
+#ifndef _MUTT_SASL_H
+#define _MUTT_SASL_H 1
 
 #include <sasl/sasl.h>
 
@@ -50,4 +50,4 @@ typedef struct
 }
 SASL_DATA;
 
-#endif /* _MUTT_SASL_H_ */
+#endif /* _MUTT_SASL_H */

diff --git a/mutt_sasl_plain.h b/mutt_sasl_plain.h
index 9c6410deb78820f804788c7157d099f346713368..fd3934d028a775f5aa30ba09acb005bc0e5fdca8 100644 (file)
--- a/mutt_sasl_plain.h
+++ b/mutt_sasl_plain.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_SASL_PLAIN_H_
-#define _MUTT_SASL_PLAIN_H_
+#ifndef _MUTT_SASL_PLAIN_H
+#define _MUTT_SASL_PLAIN_H 1
 
 #include <stdlib.h> /* for size_t */
 
@@ -42,4 +42,4 @@
 size_t mutt_sasl_plain_msg(char *buf, size_t buflen, const char *cmd,
                            const char *authz, const char *user, const char *pass);
 
-#endif /* _MUTT_SASL_PLAIN_H_ */
+#endif /* _MUTT_SASL_PLAIN_H */

diff --git a/mutt_socket.h b/mutt_socket.h
index b4a436bcc4d95ef636d1dac57ed0b0de713c6994..6f6f5844fc1e867af7b78ea7c1885146f7d770a1 100644 (file)
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_SOCKET_H_
-#define _MUTT_SOCKET_H_ 1
+#ifndef _MUTT_SOCKET_H
+#define _MUTT_SOCKET_H 1
 
 #include "account.h"
 #include "lib.h"
@@ -71,4 +71,4 @@ int raw_socket_open(CONNECTION *conn);
 int raw_socket_close(CONNECTION *conn);
 int raw_socket_poll(CONNECTION *conn);
 
-#endif /* _MUTT_SOCKET_H_ */
+#endif /* _MUTT_SOCKET_H */

diff --git a/mutt_ssl.h b/mutt_ssl.h
index 3550655720fd2e2979471cb088e6da22cd88ffa2..4d49280b7c16188531c90aa14462113c4deebf21 100644 (file)
--- a/mutt_ssl.h
+++ b/mutt_ssl.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_SSL_H_
-#define _MUTT_SSL_H_ 1
+#ifndef _MUTT_SSL_H
+#define _MUTT_SSL_H 1
 
 #include "mutt_socket.h"
 
@@ -25,4 +25,4 @@ int mutt_ssl_starttls (CONNECTION* conn);
 int mutt_ssl_socket_setup (CONNECTION *conn);
 #endif
 
-#endif /* _MUTT_SSL_H_ */
+#endif /* _MUTT_SSL_H */

diff --git a/mutt_tunnel.h b/mutt_tunnel.h
index 36e0becd8140ebf1063fe40b453c6ee148a1a93b..360af096b10026e46d78a13af9ce561f9bd426a3 100644 (file)
--- a/mutt_tunnel.h
+++ b/mutt_tunnel.h
@@ -13,11 +13,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_TUNNEL_H_
-#define _MUTT_TUNNEL_H_ 1
+#ifndef _MUTT_TUNNEL_H
+#define _MUTT_TUNNEL_H 1
 
 #include "mutt_socket.h"
 
 int mutt_tunnel_socket_setup(CONNECTION *conn);
 
-#endif /* _MUTT_TUNNEL_H_ */
+#endif /* _MUTT_TUNNEL_H */

diff --git a/mx.h b/mx.h
index d66f79156727a7f305f2ffd68f5204fc55987c06..249720f7f24fca682c1155cf19056dbea23388ee 100644 (file)
--- a/mx.h
+++ b/mx.h
@@ -21,8 +21,8 @@
  * generic mailbox api.  None of these functions should be called directly.
  */
 
-#ifndef _MX_H
-#define _MX_H
+#ifndef _MUTT_MX_H
+#define _MUTT_MX_H 1
 
 #include "mailbox.h"
 #include "buffy.h"
@@ -89,4 +89,4 @@ extern struct mx_ops mx_mbox_ops;
 extern struct mx_ops mx_mh_ops;
 extern struct mx_ops mx_mmdf_ops;
 
-#endif
+#endif /* _MUTT_MX_H */

diff --git a/myvar.h b/myvar.h
index e3f07934ccfb9f5ceee27f10ace52f54598f4f88..911c853777d7fba926225bb75ec0272d5874850b 100644 (file)
--- a/myvar.h
+++ b/myvar.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MYVAR_INCLUDED
-#define MYVAR_INCLUDED
+#ifndef _MUTT_MYVAR_H
+#define _MUTT_MYVAR_H 1
 
 #include <sys/types.h>
 
@@ -22,5 +22,4 @@ const char *myvar_get(const char *var);
 int var_to_string(int idx, char *val, size_t len);
 int mutt_option_index(const char *s);
 
-#endif
-
+#endif /* _MUTT_MYVAR_H */

diff --git a/nntp.h b/nntp.h
index a66509722a85b6875676a5604552c3b44f68deaf..8b140693ff229c7fa6d68e8902f4f6dd055dd65f 100644 (file)
--- a/nntp.h
+++ b/nntp.h
@@ -17,8 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _NNTP_H_
-#define _NNTP_H_ 1
+#ifndef _MUTT_NNTP_H
+#define _MUTT_NNTP_H 1
 
 #include "mutt_socket.h"
 #include "mailbox.h"
@@ -162,4 +162,4 @@ void nntp_hcache_update(NNTP_DATA *nntp_data, header_cache_t *hc);
 
 extern struct mx_ops mx_nntp_ops;
 
-#endif /* _NNTP_H_ */
+#endif /* _MUTT_NNTP_H */

diff --git a/pager.h b/pager.h
index f12c945b2b43430adf211d0c337b935a8428b696..8eccf66962be6492466e22c96f9f410b6e1bc59a 100644 (file)
--- a/pager.h
+++ b/pager.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_PAGER_H
+#define _MUTT_PAGER_H 1
+
 #include "attach.h"
 
 /* dynamic internal flags */
@@ -48,3 +51,5 @@ typedef struct
 int mutt_do_pager(const char *banner, const char *tempfile, int do_color, pager_t *info);
 int mutt_pager(const char *banner, const char *fname, int flags, pager_t *extra);
 void update_index(MUTTMENU *menu, CONTEXT *ctx, int check, int oldcount, int index_hint);
+
+#endif /* _MUTT_PAGER_H */

diff --git a/pgp.c b/pgp.c
index 70ebbcc1e2c998654ab0a5f7148cb3927ac07c63..be560c967eaf4ba1e34b979e31b6d9cc4df4e4ee 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -55,8 +55,6 @@
 # include <sys/resource.h>
 #endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 #include "mutt_crypt.h"
 #include "mutt_menu.h"
 
@@ -1806,5 +1804,3 @@ int pgp_send_menu (HEADER *msg, int *redraw)
   return (msg->security);
 }
 
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */

diff --git a/pgp.h b/pgp.h
index 872b33e536a0f899e406be733055ed255a8351b9..b31bec2441a56c16973e29f349b4e234bf65368f 100644 (file)
--- a/pgp.h
+++ b/pgp.h
@@ -17,6 +17,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_PGP_H
+#define _MUTT_PGP_H 1
+
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
 
 #include "mutt_crypt.h"
@@ -90,3 +93,5 @@ BODY *pgp_sign_message(BODY *a);
 int pgp_send_menu(HEADER *msg, int *redraw);
 
 #endif /* CRYPT_BACKEND_CLASSIC_PGP */
+
+#endif /* _MUTT_PGP_H */

diff --git a/pgpkey.c b/pgpkey.c
index 595f771ed12c727565dce407c40e068f58807832..1d0d1d250d3d148926e21900ca09dda9daaa2212 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -36,8 +36,6 @@
 
 #include <locale.h>
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 struct pgp_cache
 {
   char *what;
@@ -1030,4 +1028,3 @@ out:
   return NULL;
 }
 
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */

diff --git a/pgplib.h b/pgplib.h
index 421d8d2bc53279ccf419abf31e62ee907e339e8f..dc541389f9bfd4ad56355aa066a83c1c34032ccd 100644 (file)
--- a/pgplib.h
+++ b/pgplib.h
@@ -16,6 +16,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_PGPLIB_H
+#define _MUTT_PGPLIB_H 1
+
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
 
 #include "mutt_crypt.h"
@@ -84,3 +87,5 @@ static inline pgp_key_t pgp_new_keyinfo(void)
 }
 
 #endif /* CRYPT_BACKEND_CLASSIC_PGP */
+
+#endif /* _MUTT_PGPLIB_H */

diff --git a/pgppacket.h b/pgppacket.h
index 8d8785b9d9cdfcc7ef5d47e9795e3cb3a97df856..ae7713d05db5f5e3a11469823570dec25cb95b9a 100644 (file)
--- a/pgppacket.h
+++ b/pgppacket.h
@@ -20,8 +20,8 @@
  * by mutt proper and the PGP public key ring lister.
  */
 
-#ifndef _PGPPACKET_H
-# define _PGPPACKET_H
+#ifndef _MUTT_PGPPACKET_H
+#define _MUTT_PGPPACKET_H 1
 
 enum packet_tags
 {
@@ -47,4 +47,4 @@ enum packet_tags
 unsigned char *pgp_read_packet(FILE *fp, size_t *len);
 void pgp_release_packet(void);
 
-#endif
+#endif /* _MUTT_PGPPACKET_H */

diff --git a/pop.h b/pop.h
index 265a86a9ec1272a7fe2304ae1f9a8eb5a95caf96..1eef3721ac141a109725a04f57fbd30b9a837f90 100644 (file)
--- a/pop.h
+++ b/pop.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _POP_H
-#define _POP_H 1
+#ifndef _MUTT_POP_H
+#define _MUTT_POP_H 1
 
 #include "mailbox.h"
 #include "mutt_socket.h"
@@ -108,4 +108,4 @@ void pop_fetch_mail(void);
 
 extern struct mx_ops mx_pop_ops;
 
-#endif
+#endif /* _MUTT_POP_H */

diff --git a/protos.h b/protos.h
index 29672848bd18a8d9ea164a6ee9f10bac89d09e9e..7aebc7028a40198c6f39eefe87b1d231c0f1424c 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -16,6 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_PROTOS_H
+#define _MUTT_PROTOS_H 1
 
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
@@ -495,3 +497,4 @@ int wcscasecmp(const wchar_t *a, const wchar_t *b);
 char *strcasestr(const char *s1, const char *s2);
 #endif
 
+#endif /* _MUTT_PROTOS_H */

diff --git a/remailer.c b/remailer.c
index 61acc87210dd44bf08dc4a05a0870d6c0c799aad..c20710a277d622708c5b88690a96caabf5238591 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -38,8 +38,6 @@
 #include <sys/file.h>
 #include <fcntl.h>
 
-#ifdef MIXMASTER
-
 struct coord
 {
   short r, c;
@@ -753,5 +751,3 @@ int mix_send_message (LIST *chain, const char *tempfile)
   return i;
 }
 
-
-#endif

diff --git a/remailer.h b/remailer.h
index b65de95f540cd7dd0cb5556f7b10d9411fe58bfa..f148d626f48d0a16db7fb4f0ed6a0107da96e0dd 100644 (file)
--- a/remailer.h
+++ b/remailer.h
@@ -1,6 +1,3 @@
-#ifndef _REMAILER_H
-#define _REMAILER_H
-
 /**
  * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
  *
@@ -22,6 +19,9 @@
  * Mixmaster support for Mutt
  */
 
+#ifndef _MUTT_REMAILER_H
+#define _MUTT_REMAILER_H 1
+
 #ifdef MIXMASTER
 
 #define MIX_CAP_COMPRESS  (1 << 0)
@@ -59,4 +59,4 @@ void mix_make_chain(LIST **chainp, int *redraw);
 
 #endif /* MIXMASTER */
 
-#endif /* _REMAILER_H */
+#endif /* _MUTT_REMAILER_H */

diff --git a/rfc1524.h b/rfc1524.h
index fe99510627727a15cf2fd84871432a36c0815bb0..c8c6fad343eb4897a29fbc678c51b62b7d4b9685 100644 (file)
--- a/rfc1524.h
+++ b/rfc1524.h
@@ -15,8 +15,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _RFC1524_H
-#define _RFC1524_H
+#ifndef _MUTT_RFC1524_H
+#define _MUTT_RFC1524_H 1
 
 typedef struct rfc1524_mailcap_entry {
   char *command;
@@ -38,4 +38,4 @@ int rfc1524_expand_filename(char *nametemplate, char *oldfile, char *newfile, si
 int rfc1524_mailcap_lookup(BODY *a, char *type, rfc1524_entry *entry, int opt);
 int mutt_rename_file(char *oldfile, char *newfile);
 
-#endif /* _RFC1524_H */
+#endif /* _MUTT_RFC1524_H */

diff --git a/rfc2047.h b/rfc2047.h
index 4da6b8d0e65ff98fd5a5cd756d28a5816bfe0c27..3806672db4e721eb50d53ce6a2309e7b33f54150 100644 (file)
--- a/rfc2047.h
+++ b/rfc2047.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_RFC2047_H
+#define _MUTT_RFC2047_H 1
+
 char *mutt_choose_charset(const char *fromcode, const char *charsets, char *u,
                           size_t ulen, char **d, size_t *dlen);
 int convert_nonmime_string(char **ps);
@@ -26,3 +29,5 @@ void rfc2047_encode_adrlist(ADDRESS *addr, const char *tag);
 
 void rfc2047_decode(char **pd);
 void rfc2047_decode_adrlist(ADDRESS *a);
+
+#endif /* _MUTT_RFC2047_H */

diff --git a/rfc2231.h b/rfc2231.h
index 37bee797c412465c1018e928bbc60b1471d71685..f27840968b7bd81386bef49bbc438d0edb16b119 100644 (file)
--- a/rfc2231.h
+++ b/rfc2231.h
@@ -15,6 +15,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_RFC2231_H
+#define _MUTT_RFC2231_H 1
+
 void rfc2231_decode_parameters(PARAMETER **headp);
 int rfc2231_encode_string(char **pd);
 
+
+#endif /* _MUTT_RFC2231_H */

diff --git a/rfc3676.h b/rfc3676.h
index e7bd28313625f86281ae41f59df3f40194b5d555..ca323dc01d9719981494e1dbb2e6f0a0ee1d1ce3 100644 (file)
--- a/rfc3676.h
+++ b/rfc3676.h
@@ -20,7 +20,7 @@
 /* This file was originally part of mutt-ng */
 
 #ifndef _MUTT_RFC3676_H
-#define _MUTT_RFC3676_H
+#define _MUTT_RFC3676_H 1
 
 #include "mutt.h"
 
@@ -30,4 +30,4 @@ int rfc3676_handler(BODY *a, STATE *s);
 /* this does the space-stuffing for RfC3676 style messages */
 void rfc3676_space_stuff(HEADER *hdr);
 
-#endif /* !_MUTT_RFC3676_H */
+#endif /* _MUTT_RFC3676_H */

diff --git a/rfc822.h b/rfc822.h
index 05a8f643591ef29abc61b3001e11c1e69d1c9918..344344f9cea24172e60f6ca7992d71cbf4c10617 100644 (file)
--- a/rfc822.h
+++ b/rfc822.h
@@ -16,8 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef rfc822_h
-#define rfc822_h
+#ifndef _MUTT_RFC822_H
+#define _MUTT_RFC822_H 1
 
 #include "lib.h"
 
@@ -70,4 +70,4 @@ static inline ADDRESS *rfc822_new_address (void)
   return safe_calloc (1, sizeof (ADDRESS));
 }
 
-#endif /* rfc822_h */
+#endif /* _MUTT_RFC822_H */

diff --git a/sha1.h b/sha1.h
index a33988f9d3ea20e7a0c24962ee7b5eac7be53772..b866754263903a8e6ef95fb0f5ce75457ac1550f 100644 (file)
--- a/sha1.h
+++ b/sha1.h
@@ -5,8 +5,8 @@
  * fit into mutt by Thomas Roessler <roessler@does-not-exist.org>.
  */
 
-#ifndef _SHA1_H
-# define _SHA1_H
+#ifndef _MUTT_SHA1_H
+#define _MUTT_SHA1_H 1
 
 #include "crypthash.h"
 
@@ -28,4 +28,4 @@ void sha1_final(unsigned char digest[20], SHA1_CTX *context);
 
 # define SHA_DIGEST_LENGTH 20
 
-#endif
+#endif /* _MUTT_SHA1_H */

diff --git a/sidebar.h b/sidebar.h
index fca5a651a90a147a11ad54103fac98a7e3ca0fd0..8df84a7f806a613611aeabf7b19933434358c729 100644 (file)
--- a/sidebar.h
+++ b/sidebar.h
@@ -17,8 +17,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIDEBAR_H
-#define SIDEBAR_H
+#ifndef _MUTT_SIDEBAR_H
+#define _MUTT_SIDEBAR_H 1
 
 #include "mutt.h"
 #include "buffy.h"
@@ -31,4 +31,4 @@ void         mutt_sb_set_buffystats (const CONTEXT *ctx);
 void         mutt_sb_set_open_buffy (void);
 void         mutt_sb_toggle_virtual (void);
 
-#endif /* SIDEBAR_H */
+#endif /* _MUTT_SIDEBAR_H */

diff --git a/smime.c b/smime.c
index ed6b4aa013a0e6fc817339799163fd23dab8a1e7..f80a4c36a2431dee22a7a27908f51a34b420f473 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -47,8 +47,6 @@
 # include <sys/resource.h>
 #endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
-
 #include "mutt_crypt.h"
 
 struct smime_command_context {
@@ -2278,5 +2276,3 @@ int smime_send_menu (HEADER *msg, int *redraw)
   return (msg->security);
 }
 
-
-#endif /* CRYPT_BACKEND_CLASSIC_SMIME */

diff --git a/smime.h b/smime.h
index 10a6b9dbe269494b81803dc1df8e01bf9e6aeda1..f8e618d46af15bd85503934b66110951626ed882 100644 (file)
--- a/smime.h
+++ b/smime.h
@@ -16,6 +16,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_SMIME_H
+#define _MUTT_SMIME_H 1
 
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
 
@@ -59,4 +61,4 @@ int smime_send_menu(HEADER *msg, int *redraw);
 
 #endif
 
-
+#endif /* _MUTT_SMIME_H */

diff --git a/sort.h b/sort.h
index 190db29e03310a45609d487585aebaf203550b62..a87febee30f80d9a8c9a9c869a9ce8a99ab17769 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -15,6 +15,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _MUTT_SORT_H
+#define _MUTT_SORT_H 1
+
 #define SORT_DATE      1   /* the date the mail was sent. */
 #define SORT_SIZE      2
 #define SORT_SUBJECT   3
@@ -73,3 +76,5 @@ WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);
 
 #include "mapping.h"
 extern const struct mapping_t SortMethods[];
+
+#endif /* _MUTT_SORT_H */

diff --git a/url.h b/url.h
index fc15b42236ef237f1d04e2e86a838540b6cad83f..50000c23209ed7092b9576c4fa7466e1d6a98060 100644 (file)
--- a/url.h
+++ b/url.h
@@ -13,8 +13,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _URL_H
-# define _URL_H
+#ifndef _MUTT_URL_H
+#define _MUTT_URL_H 1
 
 #include "mutt.h"
 
@@ -57,4 +57,4 @@ int url_ciss_tostring(ciss_url_t *ciss, char *dest, size_t len, int flags);
 int url_parse_mailto(ENVELOPE *e, char **body, const char *src);
 int url_pct_decode(char *s);
 
-#endif
+#endif /* _MUTT_URL_H */

diff --git a/utf8.c b/utf8.c
index f39655fe3ec51153563e81578618626be24d2a75..4c3c4ec7415f4e8c0daaa435bc108dafde43fb76 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -15,8 +15,6 @@
 
 #include "config.h"
 
-#ifndef HAVE_WC_FUNCS
-
 #include <sys/types.h>
 #include <errno.h>
 
@@ -91,4 +89,3 @@ int mutt_wctoutf8 (char *s, unsigned int c, size_t buflen)
   return -1;
 }
 
-#endif /* !HAVE_WC_FUNCS */

diff --git a/version.c b/version.c
index 10f22d75089063b6d84406699aa102daa10ab3c5..a88bb78ea787d6667bdc9eb8cf4bd56a15a5ab3a 100644 (file)
--- a/version.c
+++ b/version.c
@@ -29,7 +29,7 @@
 #include <idn/stringprep.h>
 #endif
 #ifdef USE_SLANG_CURSES
-#include "slang.h"
+#include <slang.h>
 #endif
 
 #include "lib.h"

diff --git a/version.h b/version.h
index 040ca0fb28262d6819b7c2a0903e03e1226d55ae..1bc57cf24412990e0ba92706d3d985997dd4b7e1 100644 (file)
--- a/version.h
+++ b/version.h
@@ -15,11 +15,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _VERSION_H_
-#define _VERSION_H_
+#ifndef _MUTT_VERSION_H
+#define _MUTT_VERSION_H 1
 
 void print_version (void);
 void print_copyright (void);
 int feature_enabled (const char *name);
 
-#endif /* _VERSION_H_ */
+#endif /* _MUTT_VERSION_H */

diff --git a/wcwidth.c b/wcwidth.c
index c23bd42becfe2859d7144c5bf007cba10d1ebdd2..818549fd1b6f6093ccc0194369790be2fe668322 100644 (file)
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#ifndef HAVE_WC_FUNCS
-
 #include "mutt.h"
 #include "mbyte.h"
 
@@ -165,5 +163,3 @@ int wcwidth_ucs(wchar_t ucs)
       (ucs >= 0x30000 && ucs <= 0x3fffd)));
 }
 
-#endif /* !HAVE_WC_FUNCS */
-