From: Richard Russon <rich@flatcap.org>
Date: Wed, 12 Sep 2018 19:41:33 +0000 (+0100)
Subject: rename email include
X-Git-Tag: 2019-10-25~648^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdb71850730151d290ebfaae91c5f09f67c3e23d;p=neomutt

rename email include
---

diff --git a/addrbook.c b/addrbook.c
index d1d586ca4..18e2befeb 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "curs_lib.h"
diff --git a/alias.c b/alias.c
index 4f8b0f1e0..95886739a 100644
--- a/alias.c
+++ b/alias.c
@@ -32,7 +32,7 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "addrbook.h"
diff --git a/bcache.c b/bcache.c
index ec422f802..684f98148 100644
--- a/bcache.c
+++ b/bcache.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "bcache.h"
 #include "mutt_account.h"
 #include "muttlib.h"
diff --git a/browser.c b/browser.c
index a7a97a9b8..c41be05f3 100644
--- a/browser.c
+++ b/browser.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"
diff --git a/color.c b/color.c
index 14004a3d9..963cb2392 100644
--- a/color.c
+++ b/color.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "color.h"
 #include "context.h"
diff --git a/commands.c b/commands.c
index 3269eeef8..f6580a172 100644
--- a/commands.c
+++ b/commands.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"
diff --git a/compose.c b/compose.c
index adaf87b6c..f4349a652 100644
--- a/compose.c
+++ b/compose.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "compose.h"
diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 175b70031..52633da14 100644
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/connaccount.h"
 #include "conn_globals.h"
 #include "connection.h"
diff --git a/conn/ssl.c b/conn/ssl.c
index 9d336ef99..4850729f3 100644
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "ssl.h"
 #include "conn_globals.h"
diff --git a/copy.c b/copy.c
index e42507e21..4d30d1cea 100644
--- a/copy.c
+++ b/copy.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "copy.h"
 #include "context.h"
diff --git a/curs_lib.c b/curs_lib.c
index 631209c93..e73efa990 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -38,7 +38,7 @@
 #include <wchar.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "curs_lib.h"
 #include "browser.h"
diff --git a/curs_main.c b/curs_main.c
index 558b9a6da..ee3b5dad8 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "curs_main.h"
diff --git a/edit.c b/edit.c
index 83be5120e..0ace0b78b 100644
--- a/edit.c
+++ b/edit.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"
diff --git a/editmsg.c b/editmsg.c
index eb40bae1c..6752092bf 100644
--- a/editmsg.c
+++ b/editmsg.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"
diff --git a/email/email.h b/email/lib.h
similarity index 96%
rename from email/email.h
rename to email/lib.h
index 740953ee8..03f17e377 100644
--- a/email/email.h
+++ b/email/lib.h
@@ -45,8 +45,8 @@
  * | email/url.c            | @subpage email_url       |
  */
 
-#ifndef MUTT_EMAIL_EMAIL_H
-#define MUTT_EMAIL_EMAIL_H
+#ifndef MUTT_EMAIL_LIB_H
+#define MUTT_EMAIL_LIB_H
 
 #include "address.h"
 #include "attach.h"
@@ -66,4 +66,4 @@
 #include "thread.h"
 #include "url.h"
 
-#endif /* MUTT_EMAIL_EMAIL_H */
+#endif /* MUTT_EMAIL_LIB_H */
diff --git a/enriched.c b/enriched.c
index 78ea05d03..70c4ad7f4 100644
--- a/enriched.c
+++ b/enriched.c
@@ -31,7 +31,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_window.h"
 #include "state.h"
 
diff --git a/flags.c b/flags.c
index 4e9521a3b..2e73aa8cd 100644
--- a/flags.c
+++ b/flags.c
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "curs_lib.h"
diff --git a/group.c b/group.c
index 29c310601..d8e243856 100644
--- a/group.c
+++ b/group.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "group.h"
 #include "globals.h"
 #include "send.h"
diff --git a/handler.c b/handler.c
index 0d91566a4..b2a7a4749 100644
--- a/handler.c
+++ b/handler.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "handler.h"
 #include "copy.h"
diff --git a/hcache/hcache.c b/hcache/hcache.c
index e5f5fc41d..1fedbf755 100644
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -32,7 +32,7 @@
  */
 
 #include "config.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "muttlib.h"
 #include "serialize.h"
 
diff --git a/hcache/serialize.c b/hcache/serialize.c
index 34c1b7734..867b3eccc 100644
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -36,7 +36,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "hcache.h"
 
 /**
diff --git a/hdrline.c b/hdrline.c
index 399f3170b..3e3ba000a 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "hdrline.h"
 #include "alias.h"
diff --git a/hook.c b/hook.c
index 903f7cfb0..feb8f7e29 100644
--- a/hook.c
+++ b/hook.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "hook.h"
 #include "alias.h"
diff --git a/imap/command.c b/imap/command.c
index 59b5ba23f..a99d934e4 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -40,7 +40,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"
diff --git a/imap/imap.c b/imap/imap.c
index 755da095e..20756245a 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "imap.h"
diff --git a/imap/message.c b/imap/message.c
index 050c19193..8ab10b6ef 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -37,7 +37,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "message.h"
diff --git a/imap/message.h b/imap/message.h
index 48a710684..76ccdd701 100644
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "email/email.h"
+#include "email/lib.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data
diff --git a/imap/util.c b/imap/util.c
index 251dc66a0..4f11b7bb5 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -44,7 +44,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "bcache.h"
 #include "context.h"
diff --git a/init.c b/init.c
index 06f85377e..9c6118771 100644
--- a/init.c
+++ b/init.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "init.h"
 #include "alias.h"
diff --git a/mailbox.c b/mailbox.c
index d51994f28..37be703e3 100644
--- a/mailbox.c
+++ b/mailbox.c
@@ -32,7 +32,7 @@
 #include <utime.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mailbox.h"
 #include "context.h"
diff --git a/maildir/mh.c b/maildir/mh.c
index b059d8c95..6706aabad 100644
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"
diff --git a/main.c b/main.c
index 44676b764..ee256bf05 100644
--- a/main.c
+++ b/main.c
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"
diff --git a/mbox/mbox.c b/mbox/mbox.c
index 59ae78f0e..99ae88751 100644
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mbox.h"
 #include "context.h"
diff --git a/menu.c b/menu.c
index 9ce5299ba..945b88a26 100644
--- a/menu.c
+++ b/menu.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "menu.h"
 #include "color.h"
diff --git a/mutt_account.c b/mutt_account.c
index afa743158..7e63a602c 100644
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
 #include "curs_lib.h"
diff --git a/mutt_attach.c b/mutt_attach.c
index e270b5d01..7d3183cca 100644
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_attach.h"
 #include "context.h"
diff --git a/mutt_body.c b/mutt_body.c
index 0933931e1..441ec324e 100644
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
 #include "sendlib.h"
diff --git a/mutt_header.c b/mutt_header.c
index 17134eb9d..b39b64375 100644
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"
diff --git a/mutt_lua.c b/mutt_lua.c
index 7b4a0b746..138c7aa1a 100644
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_lua.h"
 #include "globals.h"
diff --git a/mutt_parse.c b/mutt_parse.c
index f4e83c45b..f61e788c1 100644
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_parse.h"
 #include "globals.h"
diff --git a/mutt_socket.c b/mutt_socket.c
index 7fd03a119..94882e018 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
 #include "hook.h"
diff --git a/mutt_thread.c b/mutt_thread.c
index 3e3eddbbd..f9d44f4b0 100644
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -28,7 +28,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_thread.h"
 #include "context.h"
diff --git a/mutt_url.c b/mutt_url.c
index 8ab2368e8..ac5138d95 100644
--- a/mutt_url.c
+++ b/mutt_url.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "globals.h"
 
diff --git a/muttlib.c b/muttlib.c
index 595f832d7..9d0842653 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "muttlib.h"
diff --git a/mx.c b/mx.c
index ea01602da..41643e6f7 100644
--- a/mx.c
+++ b/mx.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mx.h"
 #include "alias.h"
diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 725ac6f17..3b2d04528 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -40,7 +40,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index e2abd802b..3a59d7916 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "crypt.h"
diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index 07ac6a2e9..9ec5090c5 100644
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -42,7 +42,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "filter.h"
 #include "globals.h"
 #include "ncrypt.h"
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 4c7302d99..2d5ae827e 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "crypt.h"
 #include "cryptglue.h"
diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 1a3dbadfb..4e0fb608a 100644
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"
diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index b950d145d..0e112c554 100644
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -39,7 +39,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "pgpkey.h"
 #include "crypt.h"
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 2265ba024..34fe05845 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -37,7 +37,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "copy.h"
diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 85d9d6b88..2f8c3b8ad 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "bcache.h"
diff --git a/nntp/nntp.c b/nntp/nntp.c
index f725b0509..85909ed8c 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "nntp.h"
diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 63caf426d..3143a0754 100644
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -55,7 +55,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_notmuch.h"
 #include "context.h"
diff --git a/pager.c b/pager.c
index 24d01a3d0..3954fb30d 100644
--- a/pager.c
+++ b/pager.c
@@ -33,7 +33,7 @@
 #include <wchar.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "pager.h"
 #include "alias.h"
diff --git a/pattern.c b/pattern.c
index 28992d779..1ca722f86 100644
--- a/pattern.c
+++ b/pattern.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"
diff --git a/pop/pop.c b/pop/pop.c
index fcd84181c..352074602 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -39,7 +39,7 @@
 #include "pop_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pop.h"
diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index f745cea78..f456821de 100644
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include "pop_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 87f99a914..049af7348 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -37,7 +37,7 @@
 #include "pop_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"
diff --git a/postpone.c b/postpone.c
index 1e905a4f0..12a22db29 100644
--- a/postpone.c
+++ b/postpone.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"
diff --git a/query.c b/query.c
index e42e0d2ee..a5f5bef3b 100644
--- a/query.c
+++ b/query.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "curs_lib.h"
diff --git a/recvattach.c b/recvattach.c
index c901e8046..73049da25 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "recvattach.h"
 #include "commands.h"
diff --git a/recvcmd.c b/recvcmd.c
index 1cae040b1..b92559671 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "copy.h"
diff --git a/remailer.c b/remailer.c
index c56c03c8e..a2f5726a3 100644
--- a/remailer.c
+++ b/remailer.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "curs_lib.h"
 #include "filter.h"
diff --git a/rfc1524.c b/rfc1524.c
index 2ed57ec1f..75d143a5b 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "rfc1524.h"
 #include "globals.h"
diff --git a/rfc3676.c b/rfc3676.c
index b1917e36f..e34f2930e 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "mutt_window.h"
diff --git a/score.c b/score.c
index f70f246e5..7ca3a6d79 100644
--- a/score.c
+++ b/score.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "score.h"
 #include "context.h"
diff --git a/send.c b/send.c
index a5d3820aa..e3526d8d7 100644
--- a/send.c
+++ b/send.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "send.h"
 #include "alias.h"
diff --git a/sendlib.c b/sendlib.c
index fb3769c49..55e75e809 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "sendlib.h"
 #include "context.h"
diff --git a/smtp.c b/smtp.c
index 11df59a68..e5c58138c 100644
--- a/smtp.c
+++ b/smtp.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "globals.h"
diff --git a/sort.c b/sort.c
index 322204233..e677aef89 100644
--- a/sort.c
+++ b/sort.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "sort.h"
 #include "alias.h"
 #include "context.h"
diff --git a/version.c b/version.c
index 4ac06e2f4..081c94194 100644
--- a/version.c
+++ b/version.c
@@ -35,7 +35,7 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_curses.h"
 #include "ncrypt/crypt_gpgme.h"
 #ifdef USE_INOTIFY