diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt
index be3e8ba2..5e46e4b2 100644
--- a/firmware/application/CMakeLists.txt
+++ b/firmware/application/CMakeLists.txt
@@ -127,7 +127,7 @@ set(CPPSRC
 	${COMMON}/wm8731.cpp
 	${COMMON}/ak4951.cpp
 	radio.cpp
-	baseband_cpld.cpp
+	${COMMON}/baseband_cpld.cpp
 	tuning.cpp
 	rf_path.cpp
 	rffc507x.cpp
@@ -196,7 +196,7 @@ set(CPPSRC
 	${COMMON}/cpld_xilinx.cpp
 	${COMMON}/jtag.cpp
 	${COMMON}/jtag_tap.cpp
-	cpld_update.cpp
+	${COMMON}/cpld_update.cpp
 	${CPLD_20150901_DATA_CPP}
 	${CPLD_20170522_DATA_CPP}
 	${HACKRF_CPLD_DATA_CPP}
diff --git a/firmware/application/baseband_cpld.cpp b/firmware/common/baseband_cpld.cpp
similarity index 100%
rename from firmware/application/baseband_cpld.cpp
rename to firmware/common/baseband_cpld.cpp
diff --git a/firmware/application/baseband_cpld.hpp b/firmware/common/baseband_cpld.hpp
similarity index 100%
rename from firmware/application/baseband_cpld.hpp
rename to firmware/common/baseband_cpld.hpp
diff --git a/firmware/application/cpld_update.cpp b/firmware/common/cpld_update.cpp
similarity index 100%
rename from firmware/application/cpld_update.cpp
rename to firmware/common/cpld_update.cpp
diff --git a/firmware/application/cpld_update.hpp b/firmware/common/cpld_update.hpp
similarity index 100%
rename from firmware/application/cpld_update.hpp
rename to firmware/common/cpld_update.hpp