X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f292123e4a8ff7bf829d2954ec838f677043ebd4..6af0c8bb08f8c36e7106ba87f00164b1df3d2774:/mts/smtp/smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index bf0804e1..da02701f 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -18,8 +18,8 @@
 #endif
 
 #ifdef CYRUS_SASL
-#include <sasl.h>
-#include <saslutil.h>
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -502,15 +502,6 @@ rclient (char *server, char *protocol, char *service)
     return NOTOK;
 }
 
-#ifdef CYRUS_SASL
-#include <sasl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
-#endif /* CYRUS_SASL */
-
 int
 sm_winit (int mode, char *from)
 {
@@ -968,7 +959,7 @@ bad_data:
     free (cp);
 
     {
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
 	struct stat st;
 
 	if (fstat (fileno (sm_wfp), &st) == NOTOK || (cc = st.st_blksize) < BUFSIZ)