diff --git a/commonLibs/attachmentSupport/CMakeLists.txt b/commonLibs/attachmentSupport/CMakeLists.txt
index 8fd51c8..bdf8b01 100644
--- a/commonLibs/attachmentSupport/CMakeLists.txt
+++ b/commonLibs/attachmentSupport/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library(attachmentSupport SHARED
 	stimulusProducer.cpp
+	stagingBuffer.cpp
 )
 
 target_include_directories(attachmentSupport PUBLIC
diff --git a/stimBuffApis/livoxGen1/stagingBuffer.cpp b/commonLibs/attachmentSupport/stagingBuffer.cpp
similarity index 99%
rename from stimBuffApis/livoxGen1/stagingBuffer.cpp
rename to commonLibs/attachmentSupport/stagingBuffer.cpp
index c74724e..497194f 100644
--- a/stimBuffApis/livoxGen1/stagingBuffer.cpp
+++ b/commonLibs/attachmentSupport/stagingBuffer.cpp
@@ -1,10 +1,12 @@
-#include "stagingBuffer.h"
+#include <user/stagingBuffer.h>
 #include <unistd.h>
 #include <cstdint>
 #include <stdexcept>
 #include <sys/mman.h>
 #include <vector>
 
+#include <user/frameAssemblyDesc.h>
+
 namespace smo {
 namespace stim_buff {
 
diff --git a/stimBuffApis/livoxGen1/frameAssemblyDesc.h b/include/user/frameAssemblyDesc.h
similarity index 99%
rename from stimBuffApis/livoxGen1/frameAssemblyDesc.h
rename to include/user/frameAssemblyDesc.h
index d0a8fda..72062fb 100644
--- a/stimBuffApis/livoxGen1/frameAssemblyDesc.h
+++ b/include/user/frameAssemblyDesc.h
@@ -62,4 +62,3 @@ public:
 
 #endif // _LIVOX_GEN1_FRAME_ASSEMBLY_DESC_H
 
-
diff --git a/stimBuffApis/livoxGen1/stagingBuffer.h b/include/user/stagingBuffer.h
similarity index 99%
rename from stimBuffApis/livoxGen1/stagingBuffer.h
rename to include/user/stagingBuffer.h
index 8f5ce93..23947c0 100644
--- a/stimBuffApis/livoxGen1/stagingBuffer.h
+++ b/include/user/stagingBuffer.h
@@ -9,11 +9,12 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 
-#include "frameAssemblyDesc.h"
-
 namespace smo {
 namespace stim_buff {
 
+// Forward declaration
+class FrameAssemblyDesc;
+
 /**
  * StagingBuffer manages a large buffer to guide io_uring in assembling some
  * number of Livox Avia pcloud UDP dgrams into a single stim frame.
diff --git a/stimBuffApis/livoxGen1/CMakeLists.txt b/stimBuffApis/livoxGen1/CMakeLists.txt
index 818d478..11d7f5f 100644
--- a/stimBuffApis/livoxGen1/CMakeLists.txt
+++ b/stimBuffApis/livoxGen1/CMakeLists.txt
@@ -58,7 +58,6 @@ if(ENABLE_STIMBUFFAPI_livoxGen1)
 
 	add_library(livoxGen1 SHARED
 		livoxGen1.cpp
-		stagingBuffer.cpp
 		pcloudStimulusProducer.cpp
 		ioUringAssemblyEngine.cpp
 		openClCollatingAndMeshingEngine.cpp
diff --git a/stimBuffApis/livoxGen1/ioUringAssemblyEngine.h b/stimBuffApis/livoxGen1/ioUringAssemblyEngine.h
index 19c9808..2a6876a 100644
--- a/stimBuffApis/livoxGen1/ioUringAssemblyEngine.h
+++ b/stimBuffApis/livoxGen1/ioUringAssemblyEngine.h
@@ -19,7 +19,7 @@
 #include <asynchronousLoop.h>
 #include <callback.h>
 #include <spinLock.h>
-#include "frameAssemblyDesc.h"
+#include <user/frameAssemblyDesc.h>
 
 namespace smo {
 namespace stim_buff {
diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
index f4680b4..1f447ee 100644
--- a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
@@ -15,7 +15,7 @@
 #include "openClCollatingAndMeshingEngine.h"
 #include "pcloudStimulusProducer.h"
 #include "openClKernels.h"
-#include "frameAssemblyDesc.h"
+#include <user/frameAssemblyDesc.h>
 #include "ioUringAssemblyEngine.h"
 
 namespace smo {
diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h
index 8395dc1..523d875 100644
--- a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.h
@@ -15,8 +15,8 @@
 #include <callback.h>
 #include <spinLock.h>
 #include <user/stimulusFrame.h>
-#include "stagingBuffer.h"
-#include "frameAssemblyDesc.h"
+#include <user/stagingBuffer.h>
+#include <user/frameAssemblyDesc.h>
 
 namespace smo {
 namespace stim_buff {
diff --git a/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp b/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp
index 2356c3b..cdcd265 100644
--- a/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp
+++ b/stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp
@@ -8,7 +8,7 @@
 #include <asynchronousLoop.h>
 #include <user/stimulusFrame.h>
 #include "pcloudStimulusProducer.h"
-#include "frameAssemblyDesc.h"
+#include <user/frameAssemblyDesc.h>
 
 namespace smo {
 namespace stim_buff {
diff --git a/stimBuffApis/livoxGen1/pcloudStimulusProducer.h b/stimBuffApis/livoxGen1/pcloudStimulusProducer.h
index 6eefb71..e52caa2 100644
--- a/stimBuffApis/livoxGen1/pcloudStimulusProducer.h
+++ b/stimBuffApis/livoxGen1/pcloudStimulusProducer.h
@@ -8,7 +8,7 @@
 #include <livoxProto1/device.h>
 #include <asynchronousContinuation.h>
 #include <callback.h>
-#include "stagingBuffer.h"
+#include <user/stagingBuffer.h>
 #include "ioUringAssemblyEngine.h"
 #include "openClCollatingAndMeshingEngine.h"
 #include "pcloudXyzStimulusBuffer.h"