rework includes a bit

[apps/madmutt.git] / lib-crypt / smime.c

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index eb554e9..5d773cd 100644 (file)
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -13,23 +13,6 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
-
-#include <lib-mime/mime.h>
-
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
-#include <lib-ui/menu.h>
-
-#include "mutt.h"
-#include "handler.h"
-#include "copy.h"
-
-

 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>


@@ -39,17 +22,32 @@
 #include <ctype.h>
 
 #ifdef HAVE_LOCALE_H
 #include <ctype.h>
 
 #ifdef HAVE_LOCALE_H

-#include <locale.h>
+#  include <locale.h>

 #endif
 #endif

-

 #ifdef HAVE_SYS_TIME_H
 #ifdef HAVE_SYS_TIME_H

-# include <sys/time.h>
+#  include <sys/time.h>

 #endif
 #endif

-

 #ifdef HAVE_SYS_RESOURCE_H
 #ifdef HAVE_SYS_RESOURCE_H

-# include <sys/resource.h>
+#  include <sys/resource.h>

 #endif
 
 #endif
 

+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
+#include "mutt.h"
+#include "alias.h"
+#include "handler.h"
+#include "copy.h"
+#include "alias.h"

 #include "crypt.h"
 
 struct smime_command_context {
 #include "crypt.h"
 
 struct smime_command_context {