diff --git a/src/lib.rs b/src/lib.rs
index 6162b9d..b55a413 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,10 +14,7 @@ pub mod timebin;
 pub mod vecpreview;
 
 mod log {
-    #[cfg(not(test))]
-    pub use netpod::log::*;
-    #[cfg(test)]
-    pub use netpod::log_direct::*;
+    pub use netpod::log_macros_branch::*;
 }
 
 pub mod bincode {
diff --git a/src/streamitem.rs b/src/streamitem.rs
index 9e64c3f..2df7a88 100644
--- a/src/streamitem.rs
+++ b/src/streamitem.rs
@@ -1,5 +1,5 @@
+use crate::log::Level;
 use daqbuf_err as err;
-use netpod::log::Level;
 use netpod::DiskStats;
 use netpod::EventDataReadStats;
 use netpod::RangeFilterStats;