--- imap.c.orig 2005-08-22 01:59:19.000000000 +0200 +++ imap.c 2005-08-22 01:59:46.000000000 +0200 @@ -44,6 +44,12 @@ #include "config.h" +#include "rcv.h" +#include +#include +#include +#include + /* * Mail -- a mail program * @@ -52,12 +58,6 @@ #ifdef HAVE_SOCKETS -#include "rcv.h" -#include -#include -#include -#include - #include "md5.h" #include