diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 485fc9711..936f4c05f 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -31,12 +31,12 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 target_link_libraries(pvt_gr_blocks
     PUBLIC
         algorithms_libs_rtklib
-        pvt_libs
         core_system_parameters
         Boost::date_time
         Gnuradio::pmt
         Gnuradio::runtime
     PRIVATE
+        pvt_libs
         algorithms_libs
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
index 352cbe316..da71df27f 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
@@ -31,41 +31,55 @@
 #include "rtklib_pvt_gs.h"
 #include "beidou_dnav_almanac.h"
 #include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_iono.h"
+#include "beidou_dnav_utc_model.h"
 #include "display.h"
 #include "galileo_almanac.h"
 #include "galileo_almanac_helper.h"
 #include "galileo_ephemeris.h"
+#include "galileo_iono.h"
+#include "galileo_utc_model.h"
 #include "geojson_printer.h"
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
 #include "gnss_sdr_create_directory.h"
 #include "gps_almanac.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
+#include "gps_cnav_utc_model.h"
 #include "gps_ephemeris.h"
+#include "gps_iono.h"
+#include "gps_utc_model.h"
 #include "gpx_printer.h"
 #include "kml_printer.h"
+#include "monitor_pvt.h"
 #include "monitor_pvt_udp_sink.h"
 #include "nmea_printer.h"
 #include "pvt_conf.h"
 #include "rinex_printer.h"
 #include "rtcm_printer.h"
 #include "rtklib_solver.h"
-#include <boost/any.hpp>  // for any_cast, any
-#include <boost/archive/xml_iarchive.hpp>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/bind/bind.hpp>  // for bind_t, bind
+#include <boost/any.hpp>                   // for any_cast, any
+#include <boost/archive/xml_iarchive.hpp>  // for xml_iarchive
+#include <boost/archive/xml_oarchive.hpp>  // for xml_oarchive
+#include <boost/bind/bind.hpp>             // for bind_t, bind
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception/exception.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/nvp.hpp>  // for nvp, make_nvp
+#include <boost/system/error_code.hpp>  // for error_code
 #include <glog/logging.h>               // for LOG
 #include <gnuradio/io_signature.h>      // for io_signature
 #include <pmt/pmt_sugar.h>              // for mp
-#include <algorithm>
-#include <exception>
-#include <fstream>
-#include <iostream>
-#include <stdexcept>
-#include <sys/ipc.h>  // for IPC_CREAT
-#include <sys/msg.h>  // for msgctl
+#include <algorithm>                    // for sort, unique
+#include <exception>                    // for exception
+#include <fstream>                      // for ofstream
+#include <iostream>                     // for operator<<
+#include <stdexcept>                    // for length_error
+#include <sys/ipc.h>                    // for IPC_CREAT
+#include <sys/msg.h>                    // for msgctl
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
diff --git a/src/core/receiver/tcp_cmd_interface.cc b/src/core/receiver/tcp_cmd_interface.cc
index 63064b244..f6f549735 100644
--- a/src/core/receiver/tcp_cmd_interface.cc
+++ b/src/core/receiver/tcp_cmd_interface.cc
@@ -31,10 +31,13 @@
 
 #include "tcp_cmd_interface.h"
 #include "control_message_factory.h"
-#include <functional>
-#include <iomanip>  // for setprecision
-#include <sstream>
-#include <utility>
+#include "pvt_interface.h"
+#include <boost/asio.hpp>
+#include <cmath>      // for isnan
+#include <exception>  // for exception
+#include <iomanip>    // for setprecision
+#include <sstream>    // for stringstream
+#include <utility>    // for move
 
 
 TcpCmdInterface::TcpCmdInterface()
diff --git a/src/core/receiver/tcp_cmd_interface.h b/src/core/receiver/tcp_cmd_interface.h
index 2e75298ec..e5658a6d9 100644
--- a/src/core/receiver/tcp_cmd_interface.h
+++ b/src/core/receiver/tcp_cmd_interface.h
@@ -31,20 +31,18 @@
 #ifndef GNSS_SDR_TCP_CMD_INTERFACE_H_
 #define GNSS_SDR_TCP_CMD_INTERFACE_H_
 
-#include "pvt_interface.h"
+
 #include <armadillo>
-#include <boost/asio.hpp>
-#include <gnuradio/message.h>
 #include <gnuradio/msg_queue.h>
-#include <algorithm>
 #include <cstdint>
 #include <ctime>
 #include <functional>
-#include <iostream>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+class PvtInterface;
 
 class TcpCmdInterface
 {
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 2fa1a0e59..aa981c48a 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -29,24 +29,14 @@
  * -------------------------------------------------------------------------
  */
 
-#include "agnss_ref_location.h"
-#include "agnss_ref_time.h"
+
 #include "concurrent_map.h"
 #include "concurrent_queue.h"
-#include "galileo_navigation_message.h"
 #include "gps_acq_assist.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "gps_ephemeris.h"
-#include "gps_navigation_message.h"
-#include <boost/filesystem.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include <gtest/gtest.h>
-#include <cmath>
 #include <iostream>
-#include <queue>
 
 
 Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index c4621c13a..c7a8d6304 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -31,32 +31,11 @@
 
 #include "concurrent_map.h"
 #include "concurrent_queue.h"
-#include "control_thread.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
-#include "gps_almanac.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "gps_ephemeris.h"
-#include "gps_iono.h"
-#include "gps_navigation_message.h"
-#include "gps_utc_model.h"
-#include "sbas_ephemeris.h"
-#include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
+#include "gps_acq_assist.h"
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
 #include <gtest/gtest.h>
-#include <cmath>
 #include <iostream>
-#include <memory>
-#include <queue>
 
 DECLARE_string(log_dir);
 
@@ -71,7 +50,7 @@ DECLARE_string(log_dir);
 #include "unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc"
 #endif  // EXTRA_TESTS
 
-#else
+#else  // UNIT_TESTING_MINIMAL
 
 #include "unit-tests/arithmetic/matio_test.cc"
 #include "unit-tests/arithmetic/code_generation_test.cc"
diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
index 72e12bcc0..bd87a3da7 100644
--- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
+++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
@@ -29,6 +29,7 @@
  * -------------------------------------------------------------------------
  */
 
+#include "GPS_L1_CA.h"
 #include "gnss_signal_processing.h"
 #include <armadillo>
 #include <chrono>
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
index b99db53b6..58dd36719 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@@ -46,6 +46,7 @@
 #include <gtest/gtest.h>
 #include <chrono>
 #include <cstdlib>
+#include <fcntl.h>  // for O_WRONLY
 #include <unistd.h>
 #include <utility>
 #ifdef GR_GREATER_38