diff --git a/cpp_src/device/CMakeLists.txt b/cpp_src/device/CMakeLists.txt
index 13af29b..706c495 100644
--- a/cpp_src/device/CMakeLists.txt
+++ b/cpp_src/device/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(uldaq)
 include_directories(portaudio)
 
-add_library(lasp_device_lib OBJECT 
+add_library(lasp_device_lib OBJECT
     lasp_daq.cpp
     lasp_daqconfig.cpp
     lasp_daqdata.cpp
@@ -10,12 +10,8 @@ add_library(lasp_device_lib OBJECT
     lasp_rtaudiodaq.cpp
     lasp_streammgr.cpp
     lasp_indatahandler.cpp
-    lasp_uldaq.cpp
-    uldaq/lasp_uldaq_impl.cpp
-    uldaq/lasp_uldaq_bufhandler.cpp
-    uldaq/lasp_uldaq_common.cpp
     portaudio/lasp_portaudiodaq.cpp
-    )
+)
 
 # Callback requires certain arguments that are not used by code. This disables
 # a compiler warning about it.
@@ -28,7 +24,9 @@ target_include_directories(lasp_device_lib INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(LASP_HAS_ULDAQ)
-    target_link_libraries(lasp_device_lib uldaq)
+    add_subdirectory(uldaq)
+    target_include_directories(lasp_device_lib INTERFACE uldaq)
+    target_link_libraries(lasp_device_lib uldaq_backend uldaq)
 endif()
 if(LASP_HAS_RTAUDIO)
     target_link_libraries(lasp_device_lib rtaudio)
diff --git a/cpp_src/device/uldaq/CMakeLists.txt b/cpp_src/device/uldaq/CMakeLists.txt
new file mode 100644
index 0000000..7dcdb25
--- /dev/null
+++ b/cpp_src/device/uldaq/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+add_library(uldaq_backend lasp_uldaq.cpp lasp_uldaq_bufhandler.cpp lasp_uldaq_common.cpp lasp_uldaq_impl.cpp)
+target_include_directories(uldaq_backend PUBLIC ../)
+target_include_directories(uldaq_backend PUBLIC ../../)
+target_include_directories(uldaq_backend PUBLIC ../../dsp)
+target_include_directories(uldaq_backend INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/cpp_src/device/lasp_uldaq.cpp b/cpp_src/device/uldaq/lasp_uldaq.cpp
similarity index 100%
rename from cpp_src/device/lasp_uldaq.cpp
rename to cpp_src/device/uldaq/lasp_uldaq.cpp
diff --git a/cpp_src/device/lasp_uldaq.h b/cpp_src/device/uldaq/lasp_uldaq.h
similarity index 100%
rename from cpp_src/device/lasp_uldaq.h
rename to cpp_src/device/uldaq/lasp_uldaq.h
diff --git a/cpp_src/device/uldaq/lasp_uldaq_common.cpp b/cpp_src/device/uldaq/lasp_uldaq_common.cpp
index 570621f..69351d4 100644
--- a/cpp_src/device/uldaq/lasp_uldaq_common.cpp
+++ b/cpp_src/device/uldaq/lasp_uldaq_common.cpp
@@ -3,8 +3,8 @@
 #include "lasp_config.h"
 
 #if LASP_HAS_ULDAQ == 1
-#include "lasp_uldaq_common.h"
 #include "lasp_daq.h"
+#include "lasp_uldaq_common.h"
 
 string getErrMsg(UlError err) {
   string errstr;
@@ -21,11 +21,9 @@ void showErr(string errstr) {
   std::cerr << "***********************************************\n\n";
 }
 void showErr(UlError err) {
-  if (err != ERR_NO_ERROR)
-    showErr(getErrMsg(err));
+  if (err != ERR_NO_ERROR) showErr(getErrMsg(err));
 }
 
-
 void throwOnPossibleUlException(UlError err) {
   if (err == ERR_NO_ERROR) {
     return;