diff --git a/mail/ChangeLog b/mail/ChangeLog
index 74ffc4adce..3e091eb7cc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -6,6 +6,8 @@
 	is rewriting CamelMboxFolder, so I'm not going to bother to try to
 	fix it.
 
+	* mail-ops.c: Add some #includes for the non-HAVE_MKSTEMP case
+
 2000-04-09  Matt Loper  <matt@helixcode.com>
 
 	* folder-browser.c (folder_browser_new): set folder_browser->uri
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index edb3bf0805..9a076c5856 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -32,6 +32,11 @@
 #include "session.h"
 #include "e-util/e-setup.h"
 
+#ifndef HAVE_MKSTEMP
+#include <fcntl.h>
+#include <sys/stat.h>
+#endif
+
 static void
 mail_exception_dialog (char *head, CamelException *ex, GtkWindow *window)
 {