X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=remailer.c;h=08b7a44d36a1b1eac7722e864da3c258f9618655;hb=d40d2e47d8033cbf917d09c3865179870897e773;hp=b4e526e73e7036de6fc49ced60c5459acff443e1;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;p=apps%2Fmadmutt.git

diff --git a/remailer.c b/remailer.c
index b4e526e..08b7a44 100644
--- a/remailer.c
+++ b/remailer.c
@@ -15,30 +15,29 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#include <fcntl.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
+#include <lib-lib/rx.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
 
 #include "remailer.h"
 
-#include "lib/rx.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
 #ifdef MIXMASTER
@@ -674,7 +673,7 @@ int mix_check_message (HEADER * msg)
 {
   const char *fqdn;
   short need_hostname = 0;
-  ADDRESS *p;
+  address_t *p;
 
   if (msg->env->cc || msg->env->bcc) {
     mutt_error _("Mixmaster doesn't accept Cc or Bcc headers.");