diff --git a/src/aheader.rs b/src/aheader.rs
index 6dee60eeb..cc3ee2100 100644
--- a/src/aheader.rs
+++ b/src/aheader.rs
@@ -6,7 +6,7 @@ use std::collections::BTreeMap;
 use std::str::FromStr;
 use std::{fmt, str};
 
-use crate::contact::*;
+use crate::contact::addr_cmp;
 use crate::context::Context;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::key::{DcKey, SignedPublicKey};
diff --git a/src/blob.rs b/src/blob.rs
index 3ff824c3e..03af49d2b 100644
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -12,7 +12,10 @@ use num_traits::FromPrimitive;
 use thiserror::Error;
 
 use crate::config::Config;
-use crate::constants::*;
+use crate::constants::{
+    MediaQuality, Viewtype, BALANCED_AVATAR_SIZE, BALANCED_IMAGE_SIZE, WORSE_AVATAR_SIZE,
+    WORSE_IMAGE_SIZE,
+};
 use crate::context::Context;
 use crate::error::Error;
 use crate::events::EventType;
@@ -517,7 +520,7 @@ pub enum BlobError {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_create() {
diff --git a/src/chat.rs b/src/chat.rs
index 33d47705d..253327305 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -11,19 +11,28 @@ use num_traits::FromPrimitive;
 use serde::{Deserialize, Serialize};
 
 use crate::blob::{BlobError, BlobObject};
-use crate::chatlist::*;
-use crate::config::*;
-use crate::constants::*;
-use crate::contact::*;
+use crate::chatlist::dc_get_archived_cnt;
+use crate::config::Config;
+use crate::constants::{
+    Blocked, Chattype, ShowEmails, Viewtype, DC_CHAT_ID_ALLDONE_HINT, DC_CHAT_ID_ARCHIVED_LINK,
+    DC_CHAT_ID_DEADDROP, DC_CHAT_ID_LAST_SPECIAL, DC_CHAT_ID_TRASH, DC_CONTACT_ID_DEVICE,
+    DC_CONTACT_ID_INFO, DC_CONTACT_ID_LAST_SPECIAL, DC_CONTACT_ID_SELF, DC_GCM_ADDDAYMARKER,
+    DC_RESEND_USER_AVATAR_DAYS,
+};
+use crate::contact::{addr_cmp, Contact, Origin, VerifiedStatus};
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{
+    dc_create_id, dc_create_outgoing_rfc724_mid, dc_create_smeared_timestamp,
+    dc_create_smeared_timestamps, dc_get_abs_path, dc_gm2local_offset, dc_str_to_color,
+    improve_single_line_input, time, IsNoneOrEmpty,
+};
 use crate::ephemeral::{delete_expired_messages, schedule_ephemeral_task, Timer as EphemeralTimer};
 use crate::error::{bail, ensure, format_err, Error};
 use crate::events::EventType;
 use crate::job::{self, Action};
 use crate::message::{self, InvalidMsgId, Message, MessageState, MsgId};
 use crate::mimeparser::SystemMessage;
-use crate::param::*;
+use crate::param::{Param, Params};
 use crate::sql;
 use crate::stock::StockMessage;
 
@@ -2970,8 +2979,10 @@ pub(crate) async fn add_info_msg(context: &Context, chat_id: ChatId, text: impl
 mod tests {
     use super::*;
 
+    use crate::chatlist::Chatlist;
+    use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
     use crate::contact::Contact;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_chat_info() {
diff --git a/src/chatlist.rs b/src/chatlist.rs
index 7e68147d9..47b0d9f34 100644
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -1,10 +1,14 @@
 //! # Chat list module
 
 use crate::chat;
-use crate::chat::*;
-use crate::constants::*;
-use crate::contact::*;
-use crate::context::*;
+use crate::chat::{update_special_chat_names, Chat, ChatId, ChatVisibility};
+use crate::constants::{
+    Chattype, DC_CHAT_ID_ALLDONE_HINT, DC_CHAT_ID_ARCHIVED_LINK, DC_CHAT_ID_DEADDROP,
+    DC_CONTACT_ID_DEVICE, DC_CONTACT_ID_SELF, DC_CONTACT_ID_UNDEFINED, DC_GCL_ADD_ALLDONE_HINT,
+    DC_GCL_ARCHIVED_ONLY, DC_GCL_FOR_FORWARDING, DC_GCL_NO_SPECIALS,
+};
+use crate::contact::Contact;
+use crate::context::Context;
 use crate::ephemeral::delete_expired_messages;
 use crate::error::{bail, ensure, Result};
 use crate::lot::Lot;
@@ -433,7 +437,9 @@ async fn get_last_deaddrop_fresh_msg(context: &Context) -> Option<MsgId> {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::chat::{create_group_chat, ProtectionStatus};
+    use crate::constants::Viewtype;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_try_load() {
diff --git a/src/config.rs b/src/config.rs
index be94261ba..eb62f5be8 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -7,7 +7,7 @@ use crate::blob::BlobObject;
 use crate::chat::ChatId;
 use crate::constants::DC_VERSION_STR;
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{dc_get_abs_path, improve_single_line_input};
 use crate::events::EventType;
 use crate::job;
 use crate::message::MsgId;
@@ -298,7 +298,7 @@ mod tests {
 
     use crate::constants;
     use crate::constants::BALANCED_AVATAR_SIZE;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
     use image::GenericImageView;
     use num_traits::FromPrimitive;
     use std::fs::File;
diff --git a/src/configure/mod.rs b/src/configure/mod.rs
index 7f0965af3..57a268a3d 100644
--- a/src/configure/mod.rs
+++ b/src/configure/mod.rs
@@ -13,16 +13,19 @@ use job::Action;
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
 use crate::config::Config;
-use crate::dc_tools::*;
+use crate::dc_tools::EmailAddress;
 use crate::imap::Imap;
 use crate::login_param::{LoginParam, ServerLoginParam};
 use crate::message::Message;
-use crate::oauth2::*;
+use crate::oauth2::dc_get_oauth2_addr;
 use crate::provider::{Protocol, Socket, UsernamePattern};
 use crate::smtp::Smtp;
 use crate::stock::StockMessage;
 use crate::{chat, e2ee, provider};
-use crate::{constants::*, job};
+use crate::{
+    constants::{Viewtype, DC_LP_AUTH_FLAGS, DC_LP_AUTH_NORMAL, DC_LP_AUTH_OAUTH2},
+    job,
+};
 use crate::{context::Context, param::Params};
 
 use auto_mozilla::moz_autoconfigure;
@@ -620,8 +623,8 @@ pub enum Error {
 mod tests {
     #![allow(clippy::indexing_slicing)]
 
-    use crate::config::*;
-    use crate::test_utils::*;
+    use crate::config::Config;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_no_panic_on_bad_credentials() {
diff --git a/src/constants.rs b/src/constants.rs
index 8d6eb243d..6ce68abd1 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -1,5 +1,5 @@
 //! # Constants
-use deltachat_derive::*;
+use deltachat_derive::{FromSql, ToSql};
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/contact.rs b/src/contact.rs
index c2374e853..6a3e74452 100644
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -1,7 +1,7 @@
 //! Contacts module
 
 use async_std::path::PathBuf;
-use deltachat_derive::*;
+use deltachat_derive::{FromSql, ToSql};
 use itertools::Itertools;
 use once_cell::sync::Lazy;
 use regex::Regex;
@@ -9,17 +9,22 @@ use regex::Regex;
 use crate::aheader::EncryptPreference;
 use crate::chat::ChatId;
 use crate::config::Config;
-use crate::constants::*;
+use crate::constants::{
+    Chattype, DC_CHAT_ID_DEADDROP, DC_CONTACT_ID_DEVICE, DC_CONTACT_ID_DEVICE_ADDR,
+    DC_CONTACT_ID_LAST_SPECIAL, DC_CONTACT_ID_SELF, DC_GCL_ADD_SELF, DC_GCL_VERIFIED_ONLY,
+};
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{
+    dc_get_abs_path, dc_str_to_color, improve_single_line_input, listflags_has, EmailAddress,
+};
 use crate::error::{bail, ensure, format_err, Result};
 use crate::events::EventType;
 use crate::key::{DcKey, SignedPublicKey};
 use crate::login_param::LoginParam;
 use crate::message::MessageState;
 use crate::mimeparser::AvatarAction;
-use crate::param::*;
-use crate::peerstate::*;
+use crate::param::{Param, Params};
+use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::provider::Socket;
 use crate::stock::StockMessage;
 
@@ -1238,7 +1243,7 @@ fn split_address_book(book: &str) -> Vec<(&str, &str)> {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[test]
     fn test_may_be_valid_addr() {
diff --git a/src/context.rs b/src/context.rs
index fafd0bc9e..5edd23393 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -8,12 +8,12 @@ use async_std::path::{Path, PathBuf};
 use async_std::sync::{channel, Arc, Mutex, Receiver, RwLock, Sender};
 use async_std::task;
 
-use crate::chat::*;
+use crate::chat::{get_chat_cnt, ChatId};
 use crate::config::Config;
-use crate::constants::*;
-use crate::contact::*;
+use crate::constants::DC_VERSION_STR;
+use crate::contact::Contact;
 use crate::dc_tools::duration_to_str;
-use crate::error::*;
+use crate::error::{bail, ensure, Result};
 use crate::events::{Event, EventEmitter, EventType, Events};
 use crate::key::{DcKey, SignedPublicKey};
 use crate::login_param::LoginParam;
@@ -514,7 +514,7 @@ pub fn get_version_str() -> &'static str {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_wrong_db() {
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 237ee48b1..53557d857 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -6,19 +6,24 @@ use mailparse::SingleInfo;
 
 use crate::chat::{self, Chat, ChatId, ProtectionStatus};
 use crate::config::Config;
-use crate::constants::*;
-use crate::contact::*;
+use crate::constants::{
+    Blocked, Chattype, ShowEmails, Viewtype, DC_CHAT_ID_TRASH, DC_CONTACT_ID_LAST_SPECIAL,
+    DC_CONTACT_ID_SELF,
+};
+use crate::contact::{addr_cmp, normalize_name, Contact, Origin, VerifiedStatus};
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{
+    dc_create_smeared_timestamp, dc_extract_grpid_from_rfc724_mid, dc_smeared_time, time,
+};
 use crate::ephemeral::{stock_ephemeral_timer_changed, Timer as EphemeralTimer};
 use crate::error::{bail, ensure, format_err, Result};
 use crate::events::EventType;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::job::{self, Action};
 use crate::message::{self, rfc724_mid_exists, Message, MessageState, MessengerMessage, MsgId};
-use crate::mimeparser::*;
-use crate::param::*;
-use crate::peerstate::*;
+use crate::mimeparser::{parse_message_ids, AvatarAction, MimeMessage, SystemMessage};
+use crate::param::{Param, Params};
+use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus};
 use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device};
 use crate::stock::StockMessage;
 use crate::{contact, location};
@@ -1963,8 +1968,9 @@ mod tests {
     use super::*;
     use crate::chat::{ChatItem, ChatVisibility};
     use crate::chatlist::Chatlist;
+    use crate::constants::{DC_CONTACT_ID_INFO, DC_GCL_NO_SPECIALS};
     use crate::message::Message;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[test]
     fn test_hex_hash() {
diff --git a/src/dc_tools.rs b/src/dc_tools.rs
index 7649ecec8..810ffbb85 100644
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -708,8 +708,8 @@ mod tests {
     use super::*;
     use std::convert::TryInto;
 
-    use crate::constants::*;
-    use crate::test_utils::*;
+    use crate::constants::{DC_GCL_ADD_SELF, DC_GCL_VERIFIED_ONLY};
+    use crate::test_utils::TestContext;
 
     #[test]
     fn test_rust_ftoa() {
diff --git a/src/e2ee.rs b/src/e2ee.rs
index 266fb41f5..ea7c54ca5 100644
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -5,15 +5,15 @@ use std::collections::HashSet;
 use mailparse::ParsedMail;
 use num_traits::FromPrimitive;
 
-use crate::aheader::*;
+use crate::aheader::{Aheader, EncryptPreference};
 use crate::config::Config;
 use crate::context::Context;
-use crate::error::*;
+use crate::error::{bail, ensure, format_err, Result};
 use crate::headerdef::HeaderDef;
 use crate::headerdef::HeaderDefMap;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
-use crate::keyring::*;
-use crate::peerstate::*;
+use crate::keyring::Keyring;
+use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::pgp;
 
 #[derive(Debug)]
@@ -348,7 +348,8 @@ mod tests {
     use crate::constants::Viewtype;
     use crate::message::Message;
     use crate::param::Param;
-    use crate::test_utils::*;
+    use crate::peerstate::ToSave;
+    use crate::test_utils::{bob_keypair, TestContext};
 
     mod ensure_secret_key_exists {
         use super::*;
diff --git a/src/ephemeral.rs b/src/ephemeral.rs
index d432b6634..f2740065d 100644
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -462,7 +462,7 @@ mod tests {
     use async_std::task::sleep;
 
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
     use crate::{
         chat::{self, Chat, ChatItem},
         dc_tools::IsNoneOrEmpty,
diff --git a/src/html.rs b/src/html.rs
index d33d2c529..2c3c45bc9 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -245,7 +245,7 @@ impl MsgId {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[async_std::test]
     async fn test_htmlparse_plain_unspecified() {
diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index 47de2a0bd..b906bf4f8 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -14,7 +14,10 @@ use async_std::prelude::*;
 use async_std::sync::Receiver;
 use num_traits::FromPrimitive;
 
-use crate::constants::*;
+use crate::constants::{
+    ShowEmails, Viewtype, DC_CONTACT_ID_SELF, DC_FETCH_EXISTING_MSGS_COUNT,
+    DC_FOLDERS_CONFIGURED_VERSION, DC_LP_AUTH_OAUTH2,
+};
 use crate::context::Context;
 use crate::dc_receive_imf::{from_field_to_contact_id, get_prefetch_parent_message};
 use crate::error::{bail, format_err, Result};
@@ -30,7 +33,7 @@ use crate::provider::Socket;
 use crate::{
     chat, dc_tools::dc_extract_grpid_from_rfc724_mid, scheduler::InterruptInfo, stock::StockMessage,
 };
-use crate::{config::*, dc_receive_imf::dc_receive_imf_inner};
+use crate::{config::Config, dc_receive_imf::dc_receive_imf_inner};
 
 mod client;
 mod idle;
diff --git a/src/imex.rs b/src/imex.rs
index b787308da..07b0a33f3 100644
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -15,16 +15,19 @@ use crate::blob::BlobObject;
 use crate::chat;
 use crate::chat::delete_and_reset_all_device_msgs;
 use crate::config::Config;
-use crate::constants::*;
+use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{
+    dc_copy_file, dc_create_folder, dc_delete_file, dc_delete_files_in_dir, dc_get_filesuffix_lc,
+    dc_open_file_std, dc_read_file, dc_write_file, get_next_backup_path, time, EmailAddress,
+};
 use crate::e2ee;
-use crate::error::*;
+use crate::error::{bail, ensure, format_err, Result};
 use crate::events::EventType;
 use crate::key::{self, DcKey, DcSecretKey, SignedPublicKey, SignedSecretKey};
 use crate::message::{Message, MsgId};
 use crate::mimeparser::SystemMessage;
-use crate::param::*;
+use crate::param::Param;
 use crate::pgp;
 use crate::sql::{self, Sql};
 use crate::stock::StockMessage;
@@ -901,7 +904,7 @@ where
 mod tests {
     use super::*;
     use crate::pgp::{split_armored_data, HEADER_AUTOCRYPT, HEADER_SETUPCODE};
-    use crate::test_utils::*;
+    use crate::test_utils::{alice_keypair, TestContext};
     use ::pgp::armor::BlockType;
 
     #[async_std::test]
diff --git a/src/job.rs b/src/job.rs
index 1584168ba..636d52741 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -15,16 +15,16 @@ use async_smtp::smtp::response::Code;
 use async_smtp::smtp::response::Detail;
 
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{dc_delete_file, dc_read_file, time};
 use crate::ephemeral::load_imap_deletion_msgid;
 use crate::error::{bail, ensure, format_err, Error, Result};
 use crate::events::EventType;
-use crate::imap::*;
+use crate::imap::{Imap, ImapActionResult};
 use crate::location;
 use crate::message::MsgId;
 use crate::message::{self, Message, MessageState};
 use crate::mimefactory::MimeFactory;
-use crate::param::*;
+use crate::param::{Param, Params};
 use crate::smtp::Smtp;
 use crate::{blob::BlobObject, contact::normalize_name, contact::Modifier, contact::Origin};
 use crate::{
@@ -1357,7 +1357,7 @@ LIMIT 1;
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     async fn insert_job(context: &Context, foreign_id: i64) {
         let now = time();
diff --git a/src/key.rs b/src/key.rs
index 7a555d02f..dc75eb0ed 100644
--- a/src/key.rs
+++ b/src/key.rs
@@ -12,7 +12,7 @@ use pgp::types::{KeyTrait, SecretKeyTrait};
 use thiserror::Error;
 
 use crate::config::Config;
-use crate::constants::*;
+use crate::constants::KeyGenType;
 use crate::context::Context;
 use crate::dc_tools::{time, EmailAddress, InvalidEmailError};
 use crate::sql;
@@ -426,7 +426,7 @@ pub enum FingerprintError {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::{alice_keypair, TestContext};
 
     use std::error::Error;
 
diff --git a/src/keyring.rs b/src/keyring.rs
index d0314ddb3..e1a79f112 100644
--- a/src/keyring.rs
+++ b/src/keyring.rs
@@ -62,7 +62,7 @@ where
 mod tests {
     use super::*;
     use crate::key::{SignedPublicKey, SignedSecretKey};
-    use crate::test_utils::*;
+    use crate::test_utils::{alice_keypair, TestContext};
 
     #[test]
     fn test_keyring_add_keys() {
diff --git a/src/lib.rs b/src/lib.rs
index 251891eaf..fd9849ec0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,7 +3,8 @@
     clippy::correctness,
     missing_debug_implementations,
     clippy::all,
-    clippy::indexing_slicing
+    clippy::indexing_slicing,
+    clippy::wildcard_imports
 )]
 #![allow(clippy::match_bool, clippy::eval_order_dependence)]
 
diff --git a/src/location.rs b/src/location.rs
index 7bafb2bf2..c039af4c1 100644
--- a/src/location.rs
+++ b/src/location.rs
@@ -5,15 +5,15 @@ use quick_xml::events::{BytesEnd, BytesStart, BytesText};
 
 use crate::chat::{self, ChatId};
 use crate::config::Config;
-use crate::constants::*;
-use crate::context::*;
-use crate::dc_tools::*;
+use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
+use crate::context::Context;
+use crate::dc_tools::time;
 use crate::error::{ensure, Error};
 use crate::events::EventType;
 use crate::job::{self, Job};
 use crate::message::{Message, MsgId};
 use crate::mimeparser::SystemMessage;
-use crate::param::*;
+use crate::param::Params;
 use crate::stock::StockMessage;
 
 /// Location record
diff --git a/src/message.rs b/src/message.rs
index c62cfb24a..695be074f 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -7,18 +7,25 @@ use serde::{Deserialize, Serialize};
 
 use crate::chat::{self, Chat, ChatId};
 use crate::config::Config;
-use crate::constants::*;
-use crate::contact::*;
-use crate::context::*;
-use crate::dc_tools::*;
+use crate::constants::{
+    Blocked, Chattype, VideochatType, Viewtype, DC_CHAT_ID_DEADDROP, DC_CHAT_ID_TRASH,
+    DC_CONTACT_ID_INFO, DC_CONTACT_ID_LAST_SPECIAL, DC_CONTACT_ID_SELF, DC_MAX_GET_INFO_LEN,
+    DC_MAX_GET_TEXT_LEN, DC_MSG_ID_LAST_SPECIAL,
+};
+use crate::contact::{Contact, Origin};
+use crate::context::Context;
+use crate::dc_tools::{
+    dc_get_filebytes, dc_get_filemeta, dc_gm2local_offset, dc_read_file, dc_timestamp_to_str,
+    dc_truncate, time,
+};
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::error::{ensure, Error};
 use crate::events::EventType;
 use crate::job::{self, Action};
 use crate::lot::{Lot, LotState, Meaning};
 use crate::mimeparser::{FailureReport, SystemMessage};
-use crate::param::*;
-use crate::pgp::*;
+use crate::param::{Param, Params};
+use crate::pgp::split_armored_data;
 use crate::stock::StockMessage;
 use std::collections::BTreeMap;
 
@@ -1869,6 +1876,7 @@ pub async fn update_server_uid(
 mod tests {
     use super::*;
     use crate::chat::ChatItem;
+    use crate::constants::DC_CONTACT_ID_DEVICE;
     use crate::test_utils as test;
 
     #[test]
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index db8382534..8a8b155bd 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -4,18 +4,20 @@ use lettre_email::{mime, Address, Header, MimeMultipartType, PartBuilder};
 use crate::blob::BlobObject;
 use crate::chat::{self, Chat};
 use crate::config::Config;
-use crate::constants::*;
-use crate::contact::*;
+use crate::constants::{Chattype, Viewtype, DC_FROM_HANDSHAKE};
+use crate::contact::Contact;
 use crate::context::{get_version_str, Context};
-use crate::dc_tools::*;
-use crate::e2ee::*;
+use crate::dc_tools::{
+    dc_create_outgoing_rfc724_mid, dc_create_smeared_timestamp, dc_get_filebytes, time,
+};
+use crate::e2ee::EncryptHelper;
 use crate::ephemeral::Timer as EphemeralTimer;
 use crate::error::{bail, ensure, format_err, Error};
 use crate::format_flowed::{format_flowed, format_flowed_quote};
 use crate::location;
 use crate::message::{self, Message};
 use crate::mimeparser::SystemMessage;
-use crate::param::*;
+use crate::param::Param;
 use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
 use crate::simplify::escape_message_footer_marks;
 use crate::stock::StockMessage;
@@ -1278,8 +1280,9 @@ pub fn needs_encoding(to_check: impl AsRef<str>) -> bool {
 mod tests {
     use super::*;
     use crate::chatlist::Chatlist;
+    use crate::contact::Origin;
     use crate::dc_receive_imf::dc_receive_imf;
-    use crate::mimeparser::*;
+    use crate::mimeparser::MimeMessage;
     use crate::test_utils::TestContext;
 
     #[test]
diff --git a/src/mimeparser.rs b/src/mimeparser.rs
index 474fb6689..d44c87aad 100644
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -10,9 +10,9 @@ use once_cell::sync::Lazy;
 use crate::aheader::Aheader;
 use crate::blob::BlobObject;
 use crate::constants::Viewtype;
-use crate::contact::*;
+use crate::contact::addr_normalize;
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::dc_get_filemeta;
 use crate::dehtml::dehtml;
 use crate::e2ee;
 use crate::error::{bail, Result};
@@ -22,9 +22,9 @@ use crate::headerdef::{HeaderDef, HeaderDefMap};
 use crate::key::Fingerprint;
 use crate::location;
 use crate::message;
-use crate::param::*;
+use crate::param::{Param, Params};
 use crate::peerstate::Peerstate;
-use crate::simplify::*;
+use crate::simplify::simplify;
 use crate::stock::StockMessage;
 use charset::Charset;
 use percent_encoding::percent_decode_str;
@@ -1443,7 +1443,7 @@ mod tests {
         constants::Blocked,
         dc_receive_imf::dc_receive_imf,
         message::{Message, MessageState, MessengerMessage},
-        test_utils::*,
+        test_utils::TestContext,
     };
     use mailparse::ParsedMail;
 
diff --git a/src/oauth2.rs b/src/oauth2.rs
index 9a1b8902a..6b6f88fe1 100644
--- a/src/oauth2.rs
+++ b/src/oauth2.rs
@@ -6,7 +6,7 @@ use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::time;
 use crate::provider;
 use crate::provider::Oauth2Authorizer;
 
@@ -348,7 +348,7 @@ fn normalize_addr(addr: &str) -> &str {
 mod tests {
     use super::*;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[test]
     fn test_normalize_addr() {
diff --git a/src/param.rs b/src/param.rs
index 962941d81..9e0f5cffb 100644
--- a/src/param.rs
+++ b/src/param.rs
@@ -379,7 +379,7 @@ mod tests {
     use async_std::fs;
     use async_std::path::Path;
 
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     #[test]
     fn test_dc_param() {
diff --git a/src/peerstate.rs b/src/peerstate.rs
index 890c17818..82652b6c1 100644
--- a/src/peerstate.rs
+++ b/src/peerstate.rs
@@ -4,7 +4,7 @@ use std::fmt;
 
 use num_traits::FromPrimitive;
 
-use crate::aheader::*;
+use crate::aheader::{Aheader, EncryptPreference};
 use crate::chat;
 use crate::constants::Blocked;
 use crate::context::Context;
@@ -487,7 +487,7 @@ impl From<crate::key::FingerprintError> for rusqlite::Error {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::alice_keypair;
     use pretty_assertions::assert_eq;
 
     #[async_std::test]
diff --git a/src/pgp.rs b/src/pgp.rs
index e41f00146..2f3885db7 100644
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -380,7 +380,7 @@ pub async fn symm_decrypt<T: std::io::Read + std::io::Seek>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::{alice_keypair, bob_keypair};
     use once_cell::sync::Lazy;
 
     #[test]
diff --git a/src/provider/data.rs b/src/provider/data.rs
index 50f91fe02..df5abd72b 100644
--- a/src/provider/data.rs
+++ b/src/provider/data.rs
@@ -3,7 +3,7 @@
 use crate::provider::Protocol::*;
 use crate::provider::Socket::*;
 use crate::provider::UsernamePattern::*;
-use crate::provider::*;
+use crate::provider::{Config, ConfigDefault, Oauth2Authorizer, Provider, Server, Status};
 use std::collections::HashMap;
 
 use once_cell::sync::Lazy;
diff --git a/src/qr.rs b/src/qr.rs
index e94c73f3d..54f3202a6 100644
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -5,16 +5,16 @@ use percent_encoding::percent_decode_str;
 use serde::Deserialize;
 
 use crate::chat;
-use crate::config::*;
+use crate::config::Config;
 use crate::constants::Blocked;
-use crate::contact::*;
+use crate::contact::{addr_normalize, may_be_valid_addr, Contact, Origin};
 use crate::context::Context;
 use crate::error::{bail, ensure, format_err, Error};
 use crate::key::Fingerprint;
 use crate::lot::{Lot, LotState};
 use crate::message::Message;
-use crate::param::*;
-use crate::peerstate::*;
+use crate::param::{Param, Params};
+use crate::peerstate::Peerstate;
 
 const OPENPGP4FPR_SCHEME: &str = "OPENPGP4FPR:"; // yes: uppercase
 const DCACCOUNT_SCHEME: &str = "DCACCOUNT:";
diff --git a/src/securejoin.rs b/src/securejoin.rs
index c327096fc..41cbc3f95 100644
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -7,19 +7,19 @@ use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
 
 use crate::aheader::EncryptPreference;
 use crate::chat::{self, Chat, ChatId};
-use crate::config::*;
-use crate::constants::*;
-use crate::contact::*;
+use crate::config::Config;
+use crate::constants::{Blocked, Viewtype, DC_CONTACT_ID_LAST_SPECIAL};
+use crate::contact::{Contact, Origin, VerifiedStatus};
 use crate::context::Context;
-use crate::e2ee::*;
+use crate::e2ee::ensure_secret_key_exists;
 use crate::events::EventType;
 use crate::headerdef::HeaderDef;
 use crate::key::{DcKey, Fingerprint, SignedPublicKey};
 use crate::lot::{Lot, LotState};
 use crate::message::Message;
-use crate::mimeparser::*;
-use crate::param::*;
-use crate::peerstate::*;
+use crate::mimeparser::{MimeMessage, SystemMessage};
+use crate::param::Param;
+use crate::peerstate::{Peerstate, PeerstateKeyType, PeerstateVerifiedStatus, ToSave};
 use crate::qr::check_qr;
 use crate::sql;
 use crate::stock::StockMessage;
diff --git a/src/smtp/mod.rs b/src/smtp/mod.rs
index 5af59fd0b..6b0a4f1e3 100644
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -4,14 +4,14 @@ pub mod send;
 
 use std::time::{Duration, SystemTime};
 
-use async_smtp::smtp::client::net::*;
-use async_smtp::*;
+use async_smtp::smtp::client::net::ClientTlsParameters;
+use async_smtp::{error, smtp, EmailAddress};
 
-use crate::constants::*;
+use crate::constants::DC_LP_AUTH_OAUTH2;
 use crate::context::Context;
 use crate::events::EventType;
 use crate::login_param::{dc_build_tls, CertificateChecks, LoginParam, ServerLoginParam};
-use crate::oauth2::*;
+use crate::oauth2::dc_get_oauth2_access_token;
 use crate::provider::Socket;
 use crate::stock::StockMessage;
 
diff --git a/src/smtp/send.rs b/src/smtp/send.rs
index 25ed97ea1..2b729cec1 100644
--- a/src/smtp/send.rs
+++ b/src/smtp/send.rs
@@ -1,7 +1,7 @@
 //! # SMTP message sending
 
 use super::Smtp;
-use async_smtp::*;
+use async_smtp::{EmailAddress, Envelope, SendableEmail, Transport};
 
 use crate::config::Config;
 use crate::constants::DEFAULT_MAX_SMTP_RCPT_TO;
diff --git a/src/sql.rs b/src/sql.rs
index b9c16078b..7a7997375 100644
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -11,11 +11,11 @@ use rusqlite::{Connection, Error as SqlError, OpenFlags};
 
 use crate::constants::{ShowEmails, DC_CHAT_ID_TRASH};
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{dc_delete_file, time, EmailAddress};
 use crate::ephemeral::start_ephemeral_timers;
 use crate::error::format_err;
-use crate::param::*;
-use crate::peerstate::*;
+use crate::param::{Param, Params};
+use crate::peerstate::Peerstate;
 use crate::provider::get_provider_by_domain;
 use crate::{
     chat::{update_device_icon, update_saved_messages_icon},
diff --git a/src/stock.rs b/src/stock.rs
index 41078031f..afb28e440 100644
--- a/src/stock.rs
+++ b/src/stock.rs
@@ -8,7 +8,7 @@ use strum_macros::EnumProperty;
 use crate::chat;
 use crate::chat::ProtectionStatus;
 use crate::constants::{Viewtype, DC_CONTACT_ID_SELF};
-use crate::contact::*;
+use crate::contact::{Contact, Origin};
 use crate::context::Context;
 use crate::error::{bail, Error};
 use crate::message::Message;
@@ -463,7 +463,7 @@ impl Context {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_utils::*;
+    use crate::test_utils::TestContext;
 
     use crate::constants::DC_CONTACT_ID_SELF;
 
diff --git a/src/token.rs b/src/token.rs
index b3a89d5b4..26f83d2af 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -4,11 +4,11 @@
 //!
 //! Tokens are used in countermitm verification protocols.
 
-use deltachat_derive::*;
+use deltachat_derive::{FromSql, ToSql};
 
 use crate::chat::ChatId;
 use crate::context::Context;
-use crate::dc_tools::*;
+use crate::dc_tools::{dc_create_id, time};
 
 /// Token namespace
 #[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql)]