diff --git a/src/riot-rs-core/src/c/thread.rs b/src/riot-rs-core/src/c/thread.rs
index d1ae9ce5b..5073666f6 100644
--- a/src/riot-rs-core/src/c/thread.rs
+++ b/src/riot-rs-core/src/c/thread.rs
@@ -1,7 +1,10 @@
 use core::ffi::{c_char, c_int, c_void};
 use core::unimplemented;
 
-pub use crate::thread::{RunqueueId, Thread, ThreadFlags, ThreadId, ThreadState, WaitMode};
+pub use crate::thread::{
+    flags::{ThreadFlags, WaitMode},
+    RunqueueId, Thread, ThreadId, ThreadState,
+};
 pub use ref_cast::RefCast;
 
 use riot_rs_threads::current_pid;
diff --git a/src/riot-rs-core/src/c/thread_flags.rs b/src/riot-rs-core/src/c/thread_flags.rs
index e6d212c0e..b98dd9368 100644
--- a/src/riot-rs-core/src/c/thread_flags.rs
+++ b/src/riot-rs-core/src/c/thread_flags.rs
@@ -1,6 +1,6 @@
 pub use super::thread::thread_t;
 use super::thread::thread_t2id;
-pub use crate::thread::{thread_flags, ThreadFlags};
+pub use crate::thread::{thread_flags, thread_flags::ThreadFlags};
 
 pub const THREAD_FLAG_MSG_WAITING: ThreadFlags = 1 << 15;
 pub const THREAD_FLAG_TIMEOUT: ThreadFlags = 1 << 14;
diff --git a/src/riot-rs-threads/src/lib.rs b/src/riot-rs-threads/src/lib.rs
index 1a0046a67..68ead82f9 100644
--- a/src/riot-rs-threads/src/lib.rs
+++ b/src/riot-rs-threads/src/lib.rs
@@ -18,7 +18,7 @@ pub mod thread_flags;
 
 pub use arch::schedule;
 pub use thread::{Thread, ThreadState};
-pub use thread_flags::*;
+pub use thread_flags as flags;
 pub use threadlist::ThreadList;
 
 use ensure_once::EnsureOnce;
diff --git a/src/riot-rs-threads/src/thread.rs b/src/riot-rs-threads/src/thread.rs
index dc6ec5985..e5fafac02 100644
--- a/src/riot-rs-threads/src/thread.rs
+++ b/src/riot-rs-threads/src/thread.rs
@@ -1,4 +1,4 @@
-pub use crate::{RunqueueId, ThreadFlags, ThreadId};
+pub use crate::{thread_flags::ThreadFlags, RunqueueId, ThreadId};
 
 /// Main struct for holding thread data
 #[derive(Debug)]