diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
index 74807741f..3a17b864e 100644
--- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
@@ -8,7 +8,7 @@
 #ifndef INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP
 #define INCLUDED_LIBUHD_USRP_COMMON_RECV_PACKET_DEMUXER_3000_HPP
 
-#include <uhd/utils/system_time.hpp>
+#include <uhdlib/utils/system_time.hpp>
 #include <uhd/config.hpp>
 #include <uhd/transport/zero_copy.hpp>
 #include <uhd/utils/log.hpp>
diff --git a/host/lib/include/uhd/utils/atomic.hpp b/host/lib/include/uhdlib/utils/atomic.hpp
similarity index 98%
rename from host/lib/include/uhd/utils/atomic.hpp
rename to host/lib/include/uhdlib/utils/atomic.hpp
index 86b1dddda..5436eea81 100644
--- a/host/lib/include/uhd/utils/atomic.hpp
+++ b/host/lib/include/uhdlib/utils/atomic.hpp
@@ -9,8 +9,8 @@
 #define INCLUDED_UHD_UTILS_ATOMIC_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/utils/system_time.hpp>
 #include <uhd/types/time_spec.hpp>
+#include <uhdlib/utils/system_time.hpp>
 #include <boost/thread/thread.hpp>
 #include <atomic>
 
diff --git a/host/lib/include/uhd/utils/system_time.hpp b/host/lib/include/uhdlib/utils/system_time.hpp
similarity index 100%
rename from host/lib/include/uhd/utils/system_time.hpp
rename to host/lib/include/uhdlib/utils/system_time.hpp
diff --git a/host/lib/transport/nirio_zero_copy.cpp b/host/lib/transport/nirio_zero_copy.cpp
index 6ef83ee83..418e78d09 100644
--- a/host/lib/transport/nirio_zero_copy.cpp
+++ b/host/lib/transport/nirio_zero_copy.cpp
@@ -10,7 +10,7 @@
 #include <uhd/transport/nirio/nirio_fifo.h>
 
 #include <uhd/utils/log.hpp>
-#include <uhd/utils/atomic.hpp>
+#include <uhdlib/utils/atomic.hpp>
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/host/lib/transport/tcp_zero_copy.cpp b/host/lib/transport/tcp_zero_copy.cpp
index 5a5937c13..ddbc6b786 100644
--- a/host/lib/transport/tcp_zero_copy.cpp
+++ b/host/lib/transport/tcp_zero_copy.cpp
@@ -10,7 +10,7 @@
 #include <uhd/transport/buffer_pool.hpp>
 
 #include <uhd/utils/log.hpp>
-#include <uhd/utils/atomic.hpp>
+#include <uhdlib/utils/atomic.hpp>
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread/thread.hpp> //sleep
diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp
index de1405a38..dc87d7e4c 100644
--- a/host/lib/transport/udp_zero_copy.cpp
+++ b/host/lib/transport/udp_zero_copy.cpp
@@ -11,7 +11,7 @@
 #include <uhd/transport/buffer_pool.hpp>
 
 #include <uhd/utils/log.hpp>
-#include <uhd/utils/atomic.hpp>
+#include <uhdlib/utils/atomic.hpp>
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread/thread.hpp> //sleep
diff --git a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
index 7efd061c0..54c367077 100644
--- a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
+++ b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
@@ -10,7 +10,7 @@
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/tasks.hpp>
-#include <uhd/utils/atomic.hpp>
+#include <uhdlib/utils/atomic.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
diff --git a/host/lib/usrp/e300/e300_fifo_config.cpp b/host/lib/usrp/e300/e300_fifo_config.cpp
index c02c943dd..044ce01ee 100644
--- a/host/lib/usrp/e300/e300_fifo_config.cpp
+++ b/host/lib/usrp/e300/e300_fifo_config.cpp
@@ -7,7 +7,7 @@
 
 #ifdef E300_NATIVE
 
-#include <uhd/utils/system_time.hpp>
+#include <uhdlib/utils/system_time.hpp>
 #include <uhd/config.hpp>
 #include <stdint.h>
 #include <atomic>
@@ -78,7 +78,7 @@ static UHD_INLINE size_t ZF_STREAM_OFF(const size_t which)
 #include <boost/thread/thread.hpp> //sleep
 #include <uhd/types/time_spec.hpp> //timeout
 #include <uhd/utils/log.hpp>
-#include <uhd/utils/atomic.hpp>
+#include <uhdlib/utils/atomic.hpp>
 
 //locking stuff for shared irq
 #include <boost/thread/mutex.hpp>
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index 061075e32..851f0f507 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -6,7 +6,7 @@
 //
 
 #include "soft_time_ctrl.hpp"
-#include <uhd/utils/system_time.hpp>
+#include <uhdlib/utils/system_time.hpp>
 #include <uhd/utils/tasks.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread/condition_variable.hpp>
diff --git a/host/lib/usrp/x300/x300_dac_ctrl.cpp b/host/lib/usrp/x300/x300_dac_ctrl.cpp
index 400e48282..c200a696a 100644
--- a/host/lib/usrp/x300/x300_dac_ctrl.cpp
+++ b/host/lib/usrp/x300/x300_dac_ctrl.cpp
@@ -7,7 +7,7 @@
 
 #include "x300_dac_ctrl.hpp"
 #include "x300_regs.hpp"
-#include <uhd/utils/system_time.hpp>
+#include <uhdlib/utils/system_time.hpp>
 #include <uhd/types/time_spec.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/safe_call.hpp>
diff --git a/host/lib/utils/system_time.cpp b/host/lib/utils/system_time.cpp
index d371756bc..2434eb949 100644
--- a/host/lib/utils/system_time.cpp
+++ b/host/lib/utils/system_time.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0+
 //
 
-#include <uhd/utils/system_time.hpp>
+#include <uhdlib/utils/system_time.hpp>
 
 using namespace uhd;