diff --git a/src/dc_e2ee.rs b/src/dc_e2ee.rs
index bdf07099f..47863a70a 100644
--- a/src/dc_e2ee.rs
+++ b/src/dc_e2ee.rs
@@ -17,13 +17,13 @@ use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
 
 use crate::aheader::*;
 use crate::context::Context;
-use crate::dc_keyring::*;
 use crate::dc_log::*;
 use crate::dc_mimeparser::*;
 use crate::dc_securejoin::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::key::*;
+use crate::keyring::*;
 use crate::peerstate::*;
 use crate::pgp::*;
 use crate::types::*;
diff --git a/src/dc_job.rs b/src/dc_job.rs
index 19f29969e..157949555 100644
--- a/src/dc_job.rs
+++ b/src/dc_job.rs
@@ -11,7 +11,6 @@ use crate::dc_chat::*;
 use crate::dc_configure::*;
 use crate::dc_imex::*;
 use crate::dc_jobthread::*;
-use crate::dc_keyhistory::*;
 use crate::dc_location::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
@@ -21,6 +20,7 @@ use crate::dc_param::*;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::imap::*;
+use crate::keyhistory::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/src/dc_keyhistory.rs b/src/keyhistory.rs
similarity index 100%
rename from src/dc_keyhistory.rs
rename to src/keyhistory.rs
diff --git a/src/dc_keyring.rs b/src/keyring.rs
similarity index 100%
rename from src/dc_keyring.rs
rename to src/keyring.rs
diff --git a/src/lib.rs b/src/lib.rs
index 652d7271e..1e48a2f8f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,6 +27,8 @@ pub mod constants;
 pub mod context;
 pub mod imap;
 pub mod key;
+pub mod keyhistory;
+pub mod keyring;
 pub mod oauth2;
 pub mod peerstate;
 pub mod pgp;
@@ -44,8 +46,6 @@ pub mod dc_e2ee;
 pub mod dc_imex;
 pub mod dc_job;
 pub mod dc_jobthread;
-pub mod dc_keyhistory;
-pub mod dc_keyring;
 pub mod dc_location;
 pub mod dc_loginparam;
 pub mod dc_lot;
diff --git a/src/pgp.rs b/src/pgp.rs
index 8d1f83bad..423ac0f3d 100644
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -12,9 +12,9 @@ use pgp::types::{CompressionAlgorithm, KeyTrait, SecretKeyTrait, StringToKey};
 use rand::thread_rng;
 use sha2::{Digest, Sha256};
 
-use crate::dc_keyring::*;
 use crate::dc_tools::*;
 use crate::key::*;
+use crate::keyring::*;
 use crate::types::*;
 use crate::x::*;
 
diff --git a/tests/stress.rs b/tests/stress.rs
index bb5385614..e4f11b519 100644
--- a/tests/stress.rs
+++ b/tests/stress.rs
@@ -11,7 +11,6 @@ use deltachat::context::*;
 use deltachat::dc_array::*;
 use deltachat::dc_configure::*;
 use deltachat::dc_imex::*;
-use deltachat::dc_keyring::*;
 use deltachat::dc_location::*;
 use deltachat::dc_lot::*;
 use deltachat::dc_mimeparser::*;
@@ -23,6 +22,7 @@ use deltachat::dc_strbuilder::*;
 use deltachat::dc_strencode::*;
 use deltachat::dc_tools::*;
 use deltachat::key::*;
+use deltachat::keyring::*;
 use deltachat::oauth2::*;
 use deltachat::pgp::*;
 use deltachat::types::*;