diff --git a/serialize/CMakeLists.txt b/serialize/CMakeLists.txt
new file mode 100644
index 000000000..fc2387e80
--- /dev/null
+++ b/serialize/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		SerialBufferAdapter.cpp
+)
\ No newline at end of file
diff --git a/storagemanager/CMakeLists.txt b/storagemanager/CMakeLists.txt
index 57c921952..b8138cae7 100644
--- a/storagemanager/CMakeLists.txt
+++ b/storagemanager/CMakeLists.txt
@@ -2,4 +2,6 @@ target_sources(${LIB_FSFW_NAME}
 	PRIVATE 
 		ConstStorageAccessor.cpp
 		StorageAccessor.cpp
+		LocalPool.cpp
+		PoolManager.cpp
 )
\ No newline at end of file
diff --git a/tcdistribution/CMakeLists.txt b/tcdistribution/CMakeLists.txt
new file mode 100644
index 000000000..17dc186c3
--- /dev/null
+++ b/tcdistribution/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		CCSDSDistributor.cpp
+		PUSDistributor.cpp
+		TcDistributor.cpp
+		TcPacketCheck.cpp
+)
diff --git a/thermal/CMakeLists.txt b/thermal/CMakeLists.txt
new file mode 100644
index 000000000..ad5327214
--- /dev/null
+++ b/thermal/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		AbstractTemperatureSensor.cpp
+		Heater.cpp
+		RedundantHeater.cpp
+		ThermalComponentCore.cpp
+		ThermalComponent.cpp
+		ThermalModule.cpp
+		ThermalMonitorReporter.cpp
+)