diff --git a/src/dc_e2ee.rs b/src/dc_e2ee.rs
index 97f1515ed..d6e5ac0ea 100644
--- a/src/dc_e2ee.rs
+++ b/src/dc_e2ee.rs
@@ -1,13 +1,15 @@
 use mmime::clist::*;
+use mmime::mailimf::*;
 use mmime::mailimf_types::*;
 use mmime::mailimf_types_helper::*;
 use mmime::mailmime::*;
 use mmime::mailmime_content::*;
 use mmime::mailmime_types::*;
 use mmime::mailmime_types_helper::*;
+use mmime::mailmime_write_mem::*;
 use mmime::mailprivacy_prepare_mime;
 use mmime::mmapstring::*;
-use mmime::MAILIMF_NO_ERROR;
+use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
 
 use crate::dc_aheader::*;
 use crate::dc_apeerstate::*;
diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index 4fe31d6ac..3f2a0a001 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -1,3 +1,6 @@
+use mmime::mailmime_content::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
 use rand::{thread_rng, Rng};
 
 use crate::constants::Event;
diff --git a/src/dc_job.rs b/src/dc_job.rs
index fc14c27bb..cecc14f22 100644
--- a/src/dc_job.rs
+++ b/src/dc_job.rs
@@ -1,3 +1,5 @@
+use mmime::mmapstring::*;
+
 use std::ffi::CStr;
 use std::time::{Duration, SystemTime};
 
diff --git a/src/dc_key.rs b/src/dc_key.rs
index 061d14738..f7b0a6884 100644
--- a/src/dc_key.rs
+++ b/src/dc_key.rs
@@ -1,3 +1,7 @@
+use mmime::mailmime_content::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
+
 use std::collections::BTreeMap;
 use std::ffi::CString;
 use std::io::Cursor;
diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs
index 1e10e7d26..4b2355713 100644
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
@@ -1,4 +1,11 @@
+use mmime::mailimf_types::*;
+use mmime::mailimf_types_helper::*;
+use mmime::mailmime_disposition::*;
 use mmime::mailmime_types::*;
+use mmime::mailmime_types_helper::*;
+use mmime::mailmime_write_mem::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
 
 use crate::constants::VERSION;
 use crate::dc_chat::*;
diff --git a/src/dc_mimeparser.rs b/src/dc_mimeparser.rs
index 3fb1d7b41..f4617fed8 100644
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
@@ -1,3 +1,13 @@
+use mmime::charconv::*;
+use mmime::mailimf::*;
+use mmime::mailimf_types::*;
+use mmime::mailmime::*;
+use mmime::mailmime_content::*;
+use mmime::mailmime_disposition::*;
+use mmime::mailmime_types::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
+
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 85473ca46..3f5884e56 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1,3 +1,11 @@
+use mmime::mailimf::*;
+use mmime::mailimf_types::*;
+use mmime::mailmime::*;
+use mmime::mailmime_content::*;
+use mmime::mailmime_types::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
+
 use crate::constants::*;
 use crate::dc_apeerstate::*;
 use crate::dc_array::*;
diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs
index 780a99666..b9e243cca 100644
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
@@ -1,3 +1,5 @@
+use mmime::mailimf_types::*;
+
 use crate::constants::Event;
 use crate::dc_apeerstate::*;
 use crate::dc_array::*;
diff --git a/src/dc_strencode.rs b/src/dc_strencode.rs
index 7ee42c395..18280e53e 100644
--- a/src/dc_strencode.rs
+++ b/src/dc_strencode.rs
@@ -1,15 +1,10 @@
+use mmime::charconv::*;
+use mmime::mailmime_decode::*;
+use mmime::mmapstring::*;
+use mmime::other::*;
+
 use crate::dc_tools::*;
 use crate::types::*;
-use crate::x::*;
-
-#[inline]
-unsafe fn __isctype(mut _c: __darwin_ct_rune_t, mut _f: libc::c_ulong) -> __darwin_ct_rune_t {
-    return if _c < 0i32 || _c >= 1i32 << 8i32 {
-        0i32
-    } else {
-        (0 != _DefaultRuneLocale.__runetype[_c as usize] as libc::c_ulong & _f) as libc::c_int
-    };
-}
 
 #[inline]
 pub fn isalnum(mut _c: libc::c_int) -> libc::c_int {
diff --git a/src/dc_tools.rs b/src/dc_tools.rs
index fa75e3a1e..39ff4f342 100644
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -1,5 +1,6 @@
 use std::fs;
 
+use mmime::mailimf_types::*;
 use rand::{thread_rng, Rng};
 
 use crate::dc_array::*;
diff --git a/tests/stress.rs b/tests/stress.rs
index d3d4f3294..82d7c8155 100644
--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -1,6 +1,11 @@
 //! Stress some functions for testing; if used as a lib, this file is obsolete.
 
 use std::ffi::{CStr, CString};
+
+use mmime::mailimf_types::*;
+use mmime::mailmime_content::*;
+use mmime::mailmime_types::*;
+use mmime::other::*;
 use tempfile::tempdir;
 
 use deltachat::constants::*;