diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 2bf0e3e95..61a6e6f7f 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -31,12 +31,12 @@ add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
 
 target_link_libraries(pvt_adapters
     PUBLIC
-        pvt_gr_blocks
         Armadillo::armadillo
         Gnuradio::runtime
         gnss_system_parameters
         gnss_rx
         pvt_lib
+        pvt_gr_blocks
     PRIVATE
         Boost::serialization
 )
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index e9ce9906e..fa8361704 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -31,8 +31,8 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 target_link_libraries(pvt_gr_blocks
     PUBLIC
         Boost::date_time
-        pvt_lib
         Gnuradio::runtime
+        pvt_lib
         gnss_system_parameters
         gnss_rx
     PRIVATE
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 434c7e5cc..6780c8b50 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -92,11 +92,11 @@ add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 
 target_link_libraries(acq_adapters
     PUBLIC
+        Gnuradio::blocks
         gnss_sp_libs
         gnss_sdr_flags
         acq_gr_blocks
         rx_core_lib
-        Gnuradio::blocks
         gnss_system_parameters
     PRIVATE
         Boost::boost
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 091b2ee38..0d77d88f3 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -35,8 +35,8 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 
 target_link_libraries(channel_fsm
     PUBLIC
-        gnss_rx
         Gnuradio::runtime
+        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index ee3f854ce..1d9760397 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -36,8 +36,8 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
 
 target_link_libraries(conditioner_adapters
     PUBLIC
-        gnss_rx
         Gnuradio::runtime
+        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index d4c0e73fd..3b056f3a6 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -109,9 +109,9 @@ add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 
 target_link_libraries(gnss_sp_libs
     PUBLIC
+        Armadillo::armadillo
         Boost::boost
         Gflags::gflags
-        Armadillo::armadillo
         Gnuradio::runtime
         Gnuradio::blocks
         Volk::volk ${ORC_LIBRARIES}
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index f82258f93..3c33feea9 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -28,9 +28,8 @@ add_library(signal_generator_adapters
 
 target_link_libraries(signal_generator_adapters
     PUBLIC
-        signal_generator_blocks
-        Gnuradio::runtime
         Gnuradio::blocks
+        signal_generator_blocks
         gnss_rx
     PRIVATE
         Gflags::gflags
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 8d82e6ee6..2325d0acb 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -32,8 +32,8 @@ target_link_libraries(signal_generator_blocks
         Gnuradio::runtime
         gnss_system_parameters
     PRIVATE
-        gnss_sp_libs
         Volkgnsssdr::volkgnsssdr
+        gnss_sp_libs
 )
 
 target_include_directories(signal_generator_blocks
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index d83fd26d5..fb76278b4 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -60,9 +60,9 @@ add_library(signal_source_gr_blocks
 
 target_link_libraries(signal_source_gr_blocks
     PUBLIC
-        signal_source_lib
-        Gnuradio::runtime
         Boost::thread
+        Gnuradio::runtime
+        signal_source_lib
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index 6b1c70661..aabd596ca 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -50,12 +50,12 @@ add_library(telemetry_decoder_gr_blocks
 
 target_link_libraries(telemetry_decoder_gr_blocks
     PUBLIC
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
         telemetry_decoder_libswiftcnav
         telemetry_decoder_lib
         gnss_system_parameters
         gnss_rx
-        Gnuradio::runtime
-        Volkgnsssdr::volkgnsssdr
     PRIVATE
         Boost::boost
         Gflags::gflags