diff --git a/commonLibs/livoxProto1/broadcastListener.cpp b/commonLibs/livoxProto1/broadcastListener.cpp
index 6f569a3..675868f 100644
--- a/commonLibs/livoxProto1/broadcastListener.cpp
+++ b/commonLibs/livoxProto1/broadcastListener.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <iostream>
 #include <opts.h>
+#include <componentThread.h>
 #include "broadcastListener.h"
 
 namespace livoxProto1 {
diff --git a/include/user/senseApiDesc.h b/include/user/senseApiDesc.h
index 6704077..285ac27 100644
--- a/include/user/senseApiDesc.h
+++ b/include/user/senseApiDesc.h
@@ -6,11 +6,13 @@
 #include <string>
 #include <memory>
 #include <preprocessor.h>
-#include <componentThread.h>
 #include <user/deviceAttachmentSpec.h>
 #include <callback.h>
 
 namespace smo {
+
+class ComponentThread;
+
 namespace stim_buff {
 
 /**
diff --git a/smocore/include/marionette/marionette.h b/smocore/include/marionette/marionette.h
index 70c21a0..fb716d7 100644
--- a/smocore/include/marionette/marionette.h
+++ b/smocore/include/marionette/marionette.h
@@ -4,7 +4,6 @@
 #include <cstdint>
 #include <atomic>
 #include <memory>
-#include <componentThread.h>
 #include <component.h>
 
 namespace smo {
diff --git a/smocore/include/salmanoff.h b/smocore/include/salmanoff.h
index 6259850..9452292 100644
--- a/smocore/include/salmanoff.h
+++ b/smocore/include/salmanoff.h
@@ -3,7 +3,6 @@
 
 #include <memory>
 #include <functional>
-#include <componentThread.h>
 
 namespace smo {
 
diff --git a/smocore/include/stimBuffApis/stimBuffApiManager.h b/smocore/include/stimBuffApis/stimBuffApiManager.h
index 0047738..5491a6a 100644
--- a/smocore/include/stimBuffApis/stimBuffApiManager.h
+++ b/smocore/include/stimBuffApis/stimBuffApiManager.h
@@ -7,7 +7,6 @@
 #include <string>
 #include <optional>
 #include <functional>
-#include <componentThread.h>
 #include <asynchronousLoop.h>
 #include <stimBuffApis/stimBuffApiLib.h>
 #include <user/deviceAttachmentSpec.h>