diff --git a/src/dc_apeerstate.rs b/src/dc_apeerstate.rs
index 32f695a2d..d1d730927 100644
--- a/src/dc_apeerstate.rs
+++ b/src/dc_apeerstate.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_aheader::*;
@@ -6,7 +5,6 @@ use crate::dc_chat::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_hash::*;
 use crate::dc_key::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_array.rs b/src/dc_array.rs
index 2bc3e9636..a434c5852 100644
--- a/src/dc_array.rs
+++ b/src/dc_array.rs
@@ -1,9 +1,6 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_context::*;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_chat.rs b/src/dc_chat.rs
index 3246d72f7..04ebe923f 100644
--- a/src/dc_chat.rs
+++ b/src/dc_chat.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::*;
@@ -8,7 +7,6 @@ use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_job::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_msg::*;
 use crate::dc_param::*;
 use crate::dc_sqlite3::*;
diff --git a/src/dc_chatlist.rs b/src/dc_chatlist.rs
index 8e0ef4d5e..507491522 100644
--- a/src/dc_chatlist.rs
+++ b/src/dc_chatlist.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_array::*;
diff --git a/src/dc_configure.rs b/src/dc_configure.rs
index 9f3f2c6f8..35a44e94d 100644
--- a/src/dc_configure.rs
+++ b/src/dc_configure.rs
@@ -1,21 +1,16 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
-use crate::dc_array::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
 use crate::dc_imap::*;
 use crate::dc_job::*;
-use crate::dc_jobthread::dc_jobthread_t;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_oauth2::*;
 use crate::dc_saxparser::*;
 use crate::dc_smtp::*;
 use crate::dc_sqlite3::*;
-use crate::dc_stock::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_contact.rs b/src/dc_contact.rs
index f56857161..2e690e39f 100644
--- a/src/dc_contact.rs
+++ b/src/dc_contact.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
@@ -10,7 +9,6 @@ use crate::dc_e2ee::*;
 use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
-use crate::dc_lot::*;
 use crate::dc_pgp::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
diff --git a/src/dc_context.rs b/src/dc_context.rs
index 6209ee5c7..7930943c2 100644
--- a/src/dc_context.rs
+++ b/src/dc_context.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::{Event, VERSION};
diff --git a/src/dc_dehtml.rs b/src/dc_dehtml.rs
index 3b8c30c7e..82b132035 100644
--- a/src/dc_dehtml.rs
+++ b/src/dc_dehtml.rs
@@ -3,7 +3,6 @@ use libc;
 use crate::dc_saxparser::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
-use crate::types::*;
 use crate::x::*;
 
 #[derive(Copy, Clone)]
diff --git a/src/dc_e2ee.rs b/src/dc_e2ee.rs
index 44547971d..39edcc1a8 100644
--- a/src/dc_e2ee.rs
+++ b/src/dc_e2ee.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_aheader::*;
@@ -9,7 +8,6 @@ use crate::dc_hash::*;
 use crate::dc_key::*;
 use crate::dc_keyring::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_mimeparser::*;
 use crate::dc_pgp::*;
 use crate::dc_securejoin::*;
diff --git a/src/dc_imap.rs b/src/dc_imap.rs
index b8df44e4c..8ee5940c4 100644
--- a/src/dc_imap.rs
+++ b/src/dc_imap.rs
@@ -1,13 +1,10 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
-use crate::dc_array::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
 use crate::dc_oauth2::*;
-use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index 3ce712b5d..0588051e4 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 use rand::{thread_rng, Rng};
 
@@ -11,7 +10,6 @@ use crate::dc_job::*;
 use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_msg::*;
 use crate::dc_param::*;
 use crate::dc_pgp::*;
diff --git a/src/dc_job.rs b/src/dc_job.rs
index 47db307bf..0bb291ba4 100644
--- a/src/dc_job.rs
+++ b/src/dc_job.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
@@ -12,7 +11,6 @@ use crate::dc_keyhistory::*;
 use crate::dc_location::*;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_mimefactory::*;
 use crate::dc_msg::*;
 use crate::dc_param::*;
diff --git a/src/dc_jobthread.rs b/src/dc_jobthread.rs
index 4cad0fafb..9182fc28a 100644
--- a/src/dc_jobthread.rs
+++ b/src/dc_jobthread.rs
@@ -1,20 +1,15 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
-use crate::dc_chat::*;
 use crate::dc_configure::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_imap::dc_imap_t;
 use crate::dc_imap::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_smtp::dc_smtp_t;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
 
-/* ** library-private **********************************************************/
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct dc_jobthread_t {
diff --git a/src/dc_key.rs b/src/dc_key.rs
index 811c80b72..b70fb7eed 100644
--- a/src/dc_key.rs
+++ b/src/dc_key.rs
@@ -1,9 +1,7 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_context::dc_context_t;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_pgp::*;
 use crate::dc_sqlite3::*;
 use crate::dc_strbuilder::*;
diff --git a/src/dc_keyhistory.rs b/src/dc_keyhistory.rs
index 0aabaff0f..5a7adbfd6 100644
--- a/src/dc_keyhistory.rs
+++ b/src/dc_keyhistory.rs
@@ -1,11 +1,7 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_context::dc_context_t;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_sqlite3::dc_sqlite3_t;
 use crate::types::*;
-use crate::x::*;
 
 /* yes: uppercase */
 /* library private: key-history */
diff --git a/src/dc_keyring.rs b/src/dc_keyring.rs
index c325dfa3f..4a509ed28 100644
--- a/src/dc_keyring.rs
+++ b/src/dc_keyring.rs
@@ -1,9 +1,6 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
-use crate::dc_context::dc_context_t;
 use crate::dc_key::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_sqlite3::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_location.rs b/src/dc_location.rs
index 4eb2df163..d15c37559 100644
--- a/src/dc_location.rs
+++ b/src/dc_location.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
@@ -7,7 +6,6 @@ use crate::dc_chat::*;
 use crate::dc_context::*;
 use crate::dc_job::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_msg::*;
 use crate::dc_param::*;
 use crate::dc_saxparser::*;
diff --git a/src/dc_log.rs b/src/dc_log.rs
index e9555087f..fc45a9308 100644
--- a/src/dc_log.rs
+++ b/src/dc_log.rs
@@ -1,9 +1,7 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
 use crate::dc_context::dc_context_t;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_loginparam.rs b/src/dc_loginparam.rs
index 4f597f8e1..b1e087d0c 100644
--- a/src/dc_loginparam.rs
+++ b/src/dc_loginparam.rs
@@ -1,8 +1,5 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
-use crate::dc_context::dc_context_t;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_sqlite3::*;
 use crate::dc_strbuilder::*;
 use crate::dc_tools::*;
diff --git a/src/dc_lot.rs b/src/dc_lot.rs
index 196720851..d54ce3e4e 100644
--- a/src/dc_lot.rs
+++ b/src/dc_lot.rs
@@ -1,14 +1,9 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_chat::*;
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_imap::dc_imap_t;
-use crate::dc_jobthread::dc_jobthread_t;
 use crate::dc_msg::*;
-use crate::dc_smtp::dc_smtp_t;
-use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs
index e24d9af85..8354bf1d5 100644
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::VERSION;
@@ -9,7 +8,6 @@ use crate::dc_e2ee::*;
 use crate::dc_hash::*;
 use crate::dc_location::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_msg::*;
 use crate::dc_param::*;
 use crate::dc_sqlite3::*;
@@ -18,9 +16,7 @@ use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
-/* *
- * Library-internal.
- */
+
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct dc_mimefactory_t {
diff --git a/src/dc_mimeparser.rs b/src/dc_mimeparser.rs
index 3bf5e86f9..c5144ccda 100644
--- a/src/dc_mimeparser.rs
+++ b/src/dc_mimeparser.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_contact::*;
@@ -7,10 +6,8 @@ use crate::dc_e2ee::*;
 use crate::dc_hash::*;
 use crate::dc_location::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_param::*;
 use crate::dc_simplify::*;
-use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
 use crate::dc_strbuilder::*;
 use crate::dc_strencode::*;
diff --git a/src/dc_move.rs b/src/dc_move.rs
index 82d7c72e4..bf3e29609 100644
--- a/src/dc_move.rs
+++ b/src/dc_move.rs
@@ -1,16 +1,10 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
-use crate::dc_contact::*;
 use crate::dc_context::*;
 use crate::dc_job::*;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_msg::*;
 use crate::dc_msg::*;
 use crate::dc_sqlite3::*;
-use crate::dc_tools::*;
 use crate::types::*;
-use crate::x::*;
 
 pub unsafe fn dc_do_heuristics_moves(
     mut context: *mut dc_context_t,
diff --git a/src/dc_msg.rs b/src/dc_msg.rs
index fa06338c0..08b6c7ecf 100644
--- a/src/dc_msg.rs
+++ b/src/dc_msg.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
diff --git a/src/dc_oauth2.rs b/src/dc_oauth2.rs
index 3c5bdb04e..be543efb2 100644
--- a/src/dc_oauth2.rs
+++ b/src/dc_oauth2.rs
@@ -1,14 +1,10 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_imap::dc_imap_t;
 use crate::dc_jsmn::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_smtp::dc_smtp_t;
 use crate::dc_sqlite3::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
diff --git a/src/dc_pgp.rs b/src/dc_pgp.rs
index 0993f98d8..71058ac0b 100644
--- a/src/dc_pgp.rs
+++ b/src/dc_pgp.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_context::dc_context_t;
@@ -6,8 +5,6 @@ use crate::dc_hash::*;
 use crate::dc_key::*;
 use crate::dc_keyring::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::pgp as rpgp;
 use crate::types::*;
diff --git a/src/dc_qr.rs b/src/dc_qr.rs
index 2f3512feb..cecd2bc7f 100644
--- a/src/dc_qr.rs
+++ b/src/dc_qr.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_apeerstate::*;
@@ -9,7 +8,6 @@ use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_lot::*;
 use crate::dc_param::*;
-use crate::dc_sqlite3::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 4a66075e4..8609f0d4a 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::*;
@@ -11,12 +10,10 @@ use crate::dc_hash::*;
 use crate::dc_job::*;
 use crate::dc_location::*;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_mimeparser::*;
 use crate::dc_move::*;
 use crate::dc_msg::*;
 use crate::dc_param::*;
-use crate::dc_pgp::*;
 use crate::dc_securejoin::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs
index deb4c21fc..39bfc1617 100644
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
@@ -10,7 +9,6 @@ use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_e2ee::*;
 use crate::dc_hash::*;
-use crate::dc_imap::dc_imap_t;
 use crate::dc_key::*;
 use crate::dc_log::*;
 use crate::dc_lot::*;
@@ -20,7 +18,6 @@ use crate::dc_param::*;
 use crate::dc_qr::*;
 use crate::dc_sqlite3::*;
 use crate::dc_stock::*;
-use crate::dc_stock::*;
 use crate::dc_strencode::*;
 use crate::dc_token::*;
 use crate::dc_tools::*;
diff --git a/src/dc_smtp.rs b/src/dc_smtp.rs
index f76b63ed8..13c5a5156 100644
--- a/src/dc_smtp.rs
+++ b/src/dc_smtp.rs
@@ -1,11 +1,9 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
 use crate::dc_context::dc_context_t;
 use crate::dc_log::*;
 use crate::dc_loginparam::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_oauth2::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_sqlite3.rs b/src/dc_sqlite3.rs
index b8b67c471..fd6cc27ae 100644
--- a/src/dc_sqlite3.rs
+++ b/src/dc_sqlite3.rs
@@ -1,14 +1,10 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_apeerstate::*;
 use crate::dc_context::dc_context_t;
 use crate::dc_hash::*;
-use crate::dc_imap::dc_imap_t;
 use crate::dc_log::*;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_param::*;
-use crate::dc_smtp::dc_smtp_t;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_stock.rs b/src/dc_stock.rs
index 2c638c8e4..29c1e20c6 100644
--- a/src/dc_stock.rs
+++ b/src/dc_stock.rs
@@ -1,10 +1,8 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::constants::Event;
 use crate::dc_contact::*;
 use crate::dc_context::dc_context_t;
-use crate::dc_lot::dc_lot_t;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_strbuilder.rs b/src/dc_strbuilder.rs
index 837789a16..68739bd8c 100644
--- a/src/dc_strbuilder.rs
+++ b/src/dc_strbuilder.rs
@@ -1,6 +1,5 @@
 use libc;
 
-use crate::types::*;
 use crate::x::*;
 
 #[derive(Copy, Clone)]
diff --git a/src/dc_token.rs b/src/dc_token.rs
index 1ff0a0578..6ecc36b9d 100644
--- a/src/dc_token.rs
+++ b/src/dc_token.rs
@@ -1,9 +1,6 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 
 use crate::dc_context::dc_context_t;
-use crate::dc_lot::dc_lot_t;
-use crate::dc_smtp::dc_smtp_t;
 use crate::dc_sqlite3::*;
 use crate::dc_tools::*;
 use crate::types::*;
diff --git a/src/dc_tools.rs b/src/dc_tools.rs
index 1954a7281..a483fec52 100644
--- a/src/dc_tools.rs
+++ b/src/dc_tools.rs
@@ -1,4 +1,3 @@
-use c2rust_bitfields::BitfieldStruct;
 use libc;
 use rand::{thread_rng, Rng};
 
diff --git a/src/lib.rs b/src/lib.rs
index d87aefad5..8ce93849d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,4 @@
 #![allow(
-    unused_imports,
     dead_code,
     mutable_transmutes,
     non_camel_case_types,
diff --git a/src/types.rs b/src/types.rs
index 0cef98fd0..5b70fd2dd 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -4,7 +4,6 @@ use libc;
 use crate::constants::Event;
 use crate::dc_context::dc_context_t;
 use crate::dc_imap::dc_imap_t;
-use crate::dc_sqlite3::dc_sqlite3_t;
 use crate::x::*;
 
 pub use libsqlite3_sys::*;
diff --git a/src/x.rs b/src/x.rs
index 74e5a9a2f..f94ce2677 100644
--- a/src/x.rs
+++ b/src/x.rs
@@ -1,9 +1,5 @@
 use libc::{self, FILE};
 
-use crate::dc_context::dc_context_t;
-use crate::dc_key::dc_key_t;
-use crate::dc_pgp::*;
-use crate::dc_sqlite3::dc_sqlite3_t;
 use crate::dc_strbuilder::dc_strbuilder_t;
 use crate::types::*;