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/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc
index 2daf11435..db650d264 100644
--- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.cc
@@ -31,10 +31,6 @@
 
 
 #include "beidou_b1i_telemetry_decoder.h"
-#include "beidou_dnav_almanac.h"
-#include "beidou_dnav_ephemeris.h"
-#include "beidou_dnav_iono.h"
-#include "beidou_dnav_utc_model.h"
 #include "configuration_interface.h"
 #include <glog/logging.h>
 
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
index e5b12992c..f6614cd5f 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
@@ -33,10 +33,6 @@
 
 #include "galileo_e1b_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
index 6922b133c..7c1dff20f 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
@@ -36,10 +36,6 @@
 
 #include "galileo_e5a_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "galileo_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc
index c48e2944d..fce316a5d 100644
--- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.cc
@@ -33,9 +33,6 @@
 
 #include "glonass_l1_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc
index 0347cf958..2c8aad54f 100644
--- a/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/glonass_l2_ca_telemetry_decoder.cc
@@ -32,9 +32,6 @@
 
 #include "glonass_l2_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
-#include "glonass_gnav_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
index b4ff602a3..5fadb8025 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
@@ -32,10 +32,6 @@
 
 #include "gps_l1_ca_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "gps_almanac.h"
-#include "gps_ephemeris.h"
-#include "gps_iono.h"
-#include "gps_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc
index 601c6054a..eccee3f2d 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc
@@ -32,10 +32,6 @@
 
 #include "gps_l2c_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "gps_almanac.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "gps_cnav_utc_model.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
index 16d1d5fcb..2621402ab 100644
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
@@ -32,7 +32,6 @@
 
 #include "sbas_l1_telemetry_decoder.h"
 #include "configuration_interface.h"
-#include "sbas_l1_telemetry_decoder_gs.h"
 #include <glog/logging.h>
 
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc
index 8bb55eff2..506a4ff5e 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.cc
@@ -1,7 +1,6 @@
 /*!
  * \file beidou_b1i_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a BEIDOU BI1 DNAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a BEIDOU BI1 DNAV data decoder block
  * \note Code added as part of GSoC 2018 program
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.es
@@ -33,13 +32,22 @@
 
 
 #include "beidou_b1i_telemetry_decoder_gs.h"
+#include "Beidou_B1I.h"
+#include "beidou_dnav_almanac.h"
+#include "beidou_dnav_ephemeris.h"
+#include "beidou_dnav_utc_model.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include <iostream>
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 8
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
index 0cd2da284..e38bfd206 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
@@ -1,9 +1,8 @@
 /*!
  * \file beidou_b1i_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a BEIDOU BI1 DNAV data decoder block
- * to a TelemetryDecoderInterface
- * \details Code added as part of GSoC 2018 program. However new modifications included to mimic
- * decoding of existing signals
+ * \brief Implementation of a BEIDOU BI1 DNAV data decoder block
+ * \details Code added as part of GSoC 2018 program. However new modifications
+ * included to mimic decoding of existing signals
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.es
  *
@@ -35,17 +34,16 @@
 #ifndef GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_GS_H
 #define GNSS_SDR_BEIDOU_B1I_TELEMETRY_DECODER_GS_H
 
-#include "Beidou_B1I.h"
-#include "beidou_dnav_almanac.h"
-#include "beidou_dnav_ephemeris.h"
-#include "beidou_dnav_navigation_message.h"
-#include "beidou_dnav_utc_model.h"
+
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
+#include "beidou_dnav_navigation_message.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>                  // for gr_vector_const_void_star
 #include <fstream>
 #include <string>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <cstdint>
 
 
 class beidou_b1i_telemetry_decoder_gs;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
index 36898d1be..c311342f1 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
@@ -30,13 +30,25 @@
 
 
 #include "galileo_telemetry_decoder_gs.h"
+#include "Galileo_E1.h"   // for GALILEO_E1_CODE_PERIOD_MS
+#include "Galileo_E5a.h"  // for GALILEO_E5A_CODE_PERIO...
 #include "convolutional.h"
 #include "display.h"
+#include "galileo_almanac_helper.h"  // for Galileo_Almanac_Helper
+#include "galileo_ephemeris.h"       // for Galileo_Ephemeris
+#include "galileo_iono.h"            // for Galileo_Iono
+#include "galileo_utc_model.h"       // for Galileo_Utc_Model
 #include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include <iostream>
+#include <cmath>      // for fmod
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr, make_shared
 
 
 #define CRC_ERROR_LIMIT 6
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
index 83dc8118a..89988f8d6 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
@@ -33,20 +33,23 @@
 #define GNSS_SDR_GALILEO_TELEMETRY_DECODER_GS_H
 
 
-#include "Galileo_E1.h"
-#include "Galileo_E5a.h"
-#include "galileo_almanac_helper.h"
-#include "galileo_ephemeris.h"
+//#include "Galileo_E1.h"
+//#include "Galileo_E5a.h"
+//#include "galileo_almanac_helper.h"
+//#include "galileo_ephemeris.h"
 #include "galileo_fnav_message.h"
-#include "galileo_iono.h"
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+//#include "galileo_iono.h"
 #include "galileo_navigation_message.h"
-#include "galileo_utc_model.h"
+//#include "galileo_utc_model.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
+//#include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
 #include <fstream>
 #include <string>
+#include <cstdint>
 
 class galileo_telemetry_decoder_gs;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc
index f859d1644..535917043 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc
@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l1_ca_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L1 C/A NAV data decoder block
  * \note Code added as part of GSoC 2017 program
  * \author Damian Miralles, 2017. dmiralles2009(at)gmail.com
  *
@@ -32,9 +31,20 @@
 
 
 #include "glonass_l1_ca_telemetry_decoder_gs.h"
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for floor, round
+#include <cstdlib>          // for abs, malloc
+#include <cstring>          // for memcpy
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 6
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
index b8cf5f25a..bdf1fd0d2 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l1_ca_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L1 C/A NAV data decoder block
  * \note Code added as part of GSoC 2017 program
  * \author Damian Miralles, 2017. dmiralles2009(at)gmail.com
  *
@@ -35,17 +34,17 @@
 
 
 #include "GLONASS_L1_L2_CA.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_navigation_message.h"
-#include "glonass_gnav_utc_model.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
-#include <fstream>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+#include <cstdint>
+#include <fstream>  // for ofstream
 #include <string>
 
+class Gnss_Synchro;
 
 class glonass_l1_ca_telemetry_decoder_gs;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc
index 2b996d987..8d901cb3a 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc
@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l2_ca_telemetry_decoder_gs.cc
- * \brief Implementation of an adapter of a GLONASS L1 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L2 C/A NAV data decoder block
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  *
  * -------------------------------------------------------------------------
@@ -32,9 +31,20 @@
 
 #include "glonass_l2_ca_telemetry_decoder_gs.h"
 #include "display.h"
+#include "glonass_gnav_almanac.h"
+#include "glonass_gnav_ephemeris.h"
+#include "glonass_gnav_utc_model.h"
+#include "gnss_synchro.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for floor, round
+#include <cstdlib>          // for abs, malloc
+#include <cstring>          // for memcpy
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 #define CRC_ERROR_LIMIT 6
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
index 13ec3876c..f4ba8c231 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
@@ -1,7 +1,6 @@
 /*!
  * \file glonass_l2_ca_telemetry_decoder_gs.h
- * \brief Implementation of an adapter of a GLONASS L2 C/A NAV data decoder block
- * to a TelemetryDecoderInterface
+ * \brief Implementation of a GLONASS L2 C/A NAV data decoder block
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  *
  * -------------------------------------------------------------------------
@@ -34,18 +33,19 @@
 
 
 #include "GLONASS_L1_L2_CA.h"
-#include "glonass_gnav_almanac.h"
-#include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_navigation_message.h"
-#include "glonass_gnav_utc_model.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
 #include <boost/circular_buffer.hpp>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
+#include <cstdint>
 #include <fstream>
 #include <string>
 
 
+class Gnss_Synchro;
+
 class glonass_l2_ca_telemetry_decoder_gs;
 
 using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptr<glonass_l2_ca_telemetry_decoder_gs>;
@@ -53,10 +53,10 @@ using glonass_l2_ca_telemetry_decoder_gs_sptr = boost::shared_ptr<glonass_l2_ca_
 glonass_l2_ca_telemetry_decoder_gs_sptr glonass_l2_ca_make_telemetry_decoder_gs(const Gnss_Satellite &satellite, bool dump);
 
 /*!
- * \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1
- * \see <a href="http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD_GLONASS_eng_v5.1.pdf">GLONASS ICD</a>
- *
- */
+* \brief This class implements a block that decodes the GNAV data defined in GLONASS ICD v5.1
+* \see <a href="http://russianspacesystems.ru/wp-content/uploads/2016/08/ICD_GLONASS_eng_v5.1.pdf">GLONASS ICD</a>
+*
+*/
 class glonass_l2_ca_telemetry_decoder_gs : public gr::block
 {
 public:
@@ -65,8 +65,8 @@ public:
     void set_channel(int32_t channel);                    //!< Set receiver's channel
 
     /*!
-     * \brief This is where all signal processing takes place
-     */
+    * \brief This is where all signal processing takes place
+    */
     int general_work(int noutput_items, gr_vector_int &ninput_items,
         gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc
index e9f925def..e12aa6b89 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.cc
@@ -30,9 +30,20 @@
  */
 
 #include "gps_l1_ca_telemetry_decoder_gs.h"
+#include "gnss_synchro.h"
+#include "gps_ephemeris.h"  // for Gps_Ephemeris
+#include "gps_iono.h"       // for Gps_Iono
+#include "gps_utc_model.h"  // for Gps_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>      // for round
+#include <cstring>    // for memcpy
+#include <exception>  // for exception
+#include <iostream>   // for cout
+#include <memory>     // for shared_ptr
 
 
 #ifndef _rotl
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h
index 38c51af5f..135311b4d 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h
@@ -33,12 +33,16 @@
 
 #include "GPS_L1_CA.h"
 #include "gnss_satellite.h"
-#include "gnss_synchro.h"
 #include "gps_navigation_message.h"
 #include <boost/circular_buffer.hpp>
-#include <gnuradio/block.h>
-#include <fstream>
-#include <string>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
+#include <gnuradio/block.h>      // for block
+#include <gnuradio/types.h>      // for gr_vector_const_void_star
+#include <cstdint>               // for int32_t
+#include <fstream>               // for ofstream
+#include <string>                // for string
+
+class Gnss_Synchro;
 
 class gps_l1_ca_telemetry_decoder_gs;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc
index e8cc9b830..246173919 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.cc
@@ -31,13 +31,21 @@
 
 
 #include "gps_l2c_telemetry_decoder_gs.h"
+#include "GPS_L2C.h"  // for GPS_L2_CNAV_DATA_PAGE_BITS, GPS_L...
 #include "display.h"
 #include "gnss_synchro.h"
+#include "gps_cnav_ephemeris.h"  // for Gps_CNAV_Ephemeris
+#include "gps_cnav_iono.h"       // for Gps_CNAV_Iono
+#include "gps_cnav_utc_model.h"  // for Gps_CNAV_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <bitset>
-#include <iostream>
-#include <sstream>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
+#include <bitset>           // for bitset
+#include <cmath>            // for round
+#include <exception>        // for exception
+#include <iostream>         // for cout
+#include <memory>           // for shared_ptr, make_shared
 
 
 gps_l2c_telemetry_decoder_gs_sptr
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h
index 4503753eb..241ac81e7 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h
@@ -32,24 +32,18 @@
 #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_GS_H
 
 
-#include "GPS_L2C.h"
 #include "gnss_satellite.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
 #include "gps_cnav_navigation_message.h"
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
-#include <algorithm>  // for copy
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 #include <fstream>
 #include <string>
-#include <utility>  // for pair
-#include <vector>
 
 extern "C"
 {
-#include "bits.h"
 #include "cnav_msg.h"
-#include "edc.h"
 }
 
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc
index f6560157a..a70aaebb1 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.cc
@@ -34,11 +34,16 @@
 #include "gnss_synchro.h"
 #include "gps_cnav_ephemeris.h"
 #include "gps_cnav_iono.h"
+#include "gps_cnav_utc_model.h"  // for Gps_CNAV_Utc_Model
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>        // for make_any
+#include <pmt/pmt_sugar.h>  // for mp
 #include <bitset>
+#include <cstdlib>    // for abs
+#include <exception>  // for exception
 #include <iostream>
-#include <sstream>
+#include <memory>  // for shared_ptr, make_shared
 
 
 gps_l5_telemetry_decoder_gs_sptr
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h
index c8f55eb8f..e3fbd2e05 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_gs.h
@@ -31,23 +31,20 @@
 #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_GS_H
 
 
-#include "GPS_L5.h"
-#include "gnss_satellite.h"
-#include "gps_cnav_navigation_message.h"
+#include "GPS_L5.h"                       // for GPS_L5I_NH_CODE_LENGTH
+#include "gnss_satellite.h"               // for Gnss_Satellite
+#include "gps_cnav_navigation_message.h"  // for Gps_CNAV_Navigation_Message
 #include <boost/circular_buffer.hpp>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
-#include <algorithm>
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
 #include <cstdint>
 #include <fstream>
 #include <string>
-#include <utility>
-#include <vector>
 
 extern "C"
 {
-#include "bits.h"
 #include "cnav_msg.h"
-#include "edc.h"
 }
 
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc
index c33e85116..30da62d4f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc
@@ -30,10 +30,13 @@
 
 #include "sbas_l1_telemetry_decoder_gs.h"
 #include "gnss_synchro.h"
+#include "viterbi_decoder.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
-#include <sstream>
-
+#include <pmt/pmt_sugar.h>  // for mp
+#include <cmath>            // for abs
+#include <exception>        // for exception
+#include <iomanip>          // for operator<<, setw
 
 // logging levels
 #define EVENT 2      // logs important events which don't occur every block
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h
index d0c9a25dc..bf9742a91 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.h
@@ -32,10 +32,12 @@
 #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_GS_H
 
 #include "gnss_satellite.h"
-#include "viterbi_decoder.h"
 #include <boost/crc.hpp>
+#include <boost/shared_ptr.hpp>  // for boost::shared_ptr
 #include <gnuradio/block.h>
-#include <algorithm>  // for copy
+#include <gnuradio/types.h>  // for gr_vector_const_void_star
+#include <algorithm>         // for copy
+#include <cstddef>           // for size_t
 #include <cstdint>
 #include <deque>
 #include <fstream>
@@ -43,6 +45,7 @@
 #include <utility>  // for pair
 #include <vector>
 
+class Viterbi_Decoder;
 
 class sbas_l1_telemetry_decoder_gs;
 
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