diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index a4af53b69..4065679e5 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -39,7 +39,6 @@
 #include <exception>  // for exception
 #include <iostream>   // for cout, cerr
 #include <sstream>
-#include <string>
 #include <sys/stat.h>   // for S_IXUSR | S_IRWXG | S_IRWXO
 #include <sys/types.h>  // for mode_t
 
diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h
index d093e20ea..b88491da4 100644
--- a/src/algorithms/PVT/libs/kml_printer.h
+++ b/src/algorithms/PVT/libs/kml_printer.h
@@ -35,7 +35,7 @@
 
 #include <fstream>  // for ofstream
 #include <memory>   // for shared_ptr
-
+#include <string>
 
 class Rtklib_Solver;
 
diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
index f62c04813..14639c43a 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
@@ -35,6 +35,9 @@
 #include "monitor_pvt.h"
 #include "serdes_monitor_pvt.h"
 #include <boost/asio.hpp>
+#include <memory>
+#include <string>
+#include <vector>
 
 #if BOOST_GREATER_1_65
 using b_io_context = boost::asio::io_context;
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 13df7ba7f..6dd045389 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -43,6 +43,7 @@
 #include <fcntl.h>
 #include <iostream>  // for cout, cerr
 #include <termios.h>
+#include <utility>
 
 #if HAS_STD_FILESYSTEM
 #include <system_error>
diff --git a/src/algorithms/PVT/libs/rtcm_printer.h b/src/algorithms/PVT/libs/rtcm_printer.h
index 465cc1902..b76c47514 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.h
+++ b/src/algorithms/PVT/libs/rtcm_printer.h
@@ -38,6 +38,7 @@
 #include <fstream>  // for std::ofstream
 #include <map>      // for std::map
 #include <memory>   // std::shared_ptr
+#include <string>
 
 class Galileo_Ephemeris;
 class Glonass_Gnav_Ephemeris;
diff --git a/src/algorithms/PVT/libs/serdes_monitor_pvt.h b/src/algorithms/PVT/libs/serdes_monitor_pvt.h
index 1477442df..07d643b9e 100644
--- a/src/algorithms/PVT/libs/serdes_monitor_pvt.h
+++ b/src/algorithms/PVT/libs/serdes_monitor_pvt.h
@@ -35,6 +35,8 @@
 #include "monitor_pvt.h"
 #include "monitor_pvt.pb.h"  // file created by Protocol Buffers at compile time
 #include <memory>
+#include <string>
+#include <utility>
 
 /*!
  * \brief This class implements serialization and deserialization of
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
index a5ec7dbc9..c1dfef3f0 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -62,6 +62,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
+#include <utility>
 
 
 pcps_opencl_acquisition_cc_sptr pcps_make_opencl_acquisition_cc(
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
index d00ca72bf..b86eb040b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h
@@ -61,6 +61,7 @@
 #include "opencl/cl.hpp"
 #include <cstdint>
 #include <fstream>
+#include <memory>  // for weak_ptr
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index 275f96215..7a414ed62 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -60,6 +60,7 @@
 #include <cassert>
 #include <fstream>
 #include <functional>
+#include <memory>  // for weak_ptr
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index 82374cd0b..32734729e 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -57,6 +57,7 @@
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/gr_complex.h>
 #include <fstream>
+#include <memory>  // for weak_ptr
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc
index fecde02c2..1d79d33d6 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.cc
@@ -32,6 +32,7 @@
 #include "interleaved_byte_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 interleaved_byte_to_complex_byte_sptr make_interleaved_byte_to_complex_byte()
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc
index 0451a136f..b6a1127e7 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.cc
@@ -32,6 +32,7 @@
 #include "interleaved_byte_to_complex_short.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 interleaved_byte_to_complex_short_sptr make_interleaved_byte_to_complex_short()
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc
index 92e3003d8..ee338c42c 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.cc
@@ -32,6 +32,7 @@
 #include "interleaved_short_to_complex_short.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <algorithm>  // for max
 
 
 interleaved_short_to_complex_short_sptr make_interleaved_short_to_complex_short()
diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc
index 5da011608..cf1091a33 100644
--- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc
+++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc
@@ -34,7 +34,7 @@
 #include "notch_lite_cc.h"
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
-#include <cmath>
+#include <algorithm>  // for max
 
 
 NotchFilterLite::NotchFilterLite(ConfigurationInterface* configuration, const std::string& role,
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
index 6a4e3b952..89ad751c9 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
@@ -32,7 +32,7 @@
 #include <boost/math/distributions/chi_squared.hpp>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include <cmath>
+#include <algorithm>
 #include <cstring>
 
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
index 678b0dabc..5a92bc5e8 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
@@ -32,7 +32,7 @@
 #include <boost/math/distributions/chi_squared.hpp>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include <cmath>
+#include <algorithm>
 #include <cstring>
 
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
index 31a766ca9..d12ea1723 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
@@ -32,7 +32,7 @@
 #include <boost/math/distributions/chi_squared.hpp>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-#include <cmath>
+#include <algorithm>
 
 
 pulse_blanking_cc_sptr make_pulse_blanking_cc(float pfa, int32_t length_,
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc
index e13cce98b..250cfa79c 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -35,6 +35,7 @@
 #include "gnss_signal_processing.h"
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc
index 6553a5a3b..f58880eb6 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -36,6 +36,7 @@
 #include "gnss_signal_processing.h"
 #include <gnuradio/gr_complex.h>
 #include <memory>
+#include <utility>
 
 
 void galileo_e5_a_code_gen_complex_primary(gsl::span<std::complex<float>> _dest, int32_t _prn, const std::array<char, 3>& _Signal)
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
index adf506d5a..35d2356d3 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h
@@ -79,6 +79,7 @@
 #define GNSS_SDR_RTKLIB_RTKCMN_H_
 
 #include "rtklib.h"
+#include <string>
 
 
 /* coordinate rotation matrix ------------------------------------------------*/
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
index 1fe23fb0e..99d0e32b2 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/kernel_tests.h
@@ -30,6 +30,7 @@
 
 #include "qa_utils.h"
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <string>
 #include <vector>
 
 
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
index 17240a342..bd3b10c88 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
@@ -45,7 +45,6 @@
 #include <iostream>   // for cerr, cout
 #include <limits>     // for numeric_limits
 #include <utility>    // for move
-#include <vector>     // for vector
 
 #if HAS_STD_FILESYSTEM
 #include <system_error>
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
index 6ab2b1955..b8505e21f 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
@@ -41,6 +41,8 @@
 #include <cstdint>                    // for int32_t
 #include <fstream>                    // for string, ofstream
 #include <memory>                     // for shared_ptr
+#include <string>
+#include <vector>
 
 class Gnss_Synchro;
 class hybrid_observables_gs;
diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
index f7095e55b..02a2029f2 100644
--- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
+++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
@@ -35,7 +35,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <cmath>
 #include <limits>
-
+#include <vector>
 
 MmseResamplerConditioner::MmseResamplerConditioner(
     ConfigurationInterface* configuration, const std::string& role,
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
index cc25e963d..ac60b4b98 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
@@ -34,6 +34,7 @@
 
 #include "direct_resampler_conditioner_cb.h"
 #include <gnuradio/io_signature.h>
+#include <algorithm>  // for min
 
 
 direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
index 3ae95c816..dedb70b74 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
@@ -34,7 +34,7 @@
 
 #include "direct_resampler_conditioner_cc.h"
 #include <gnuradio/io_signature.h>
-
+#include <algorithm>  // for min
 
 direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
     double sample_freq_in, double sample_freq_out)
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
index 255a75d0e..2b0251ceb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
@@ -34,6 +34,7 @@
 
 #include "direct_resampler_conditioner_cs.h"
 #include <gnuradio/io_signature.h>
+#include <algorithm>  // for min
 
 
 direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h
index e96ba12d0..d38df9e22 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.h
+++ b/src/algorithms/signal_generator/adapters/signal_generator.h
@@ -40,6 +40,7 @@
 #include <gnuradio/blocks/vector_to_stream.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
index 99a396c8f..a025cda37 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -38,6 +38,7 @@
 #include <boost/shared_ptr.hpp>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
index 48f796d68..ef3dad169 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@@ -39,6 +39,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index 1772191b3..eafeca41c 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -42,6 +42,7 @@
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
index 0f5743c9d..f937ecbc7 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@@ -43,6 +43,7 @@
 #endif
 #include "concurrent_queue.h"
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h
index 4b6b48ff9..a83c64301 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@@ -37,6 +37,7 @@
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 /*!
diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
index e9df1e1fc..8b1656694 100644
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
@@ -37,6 +37,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h
index 2768531ee..6b36e4deb 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.h
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h
@@ -37,6 +37,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
index 6e6c5e648..5c2f44864 100644
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
@@ -43,6 +43,7 @@
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
index a81c36722..d54f262d3 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -43,6 +43,7 @@
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index 46f999997..5225aada0 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -39,6 +39,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <osmosdr/source.h>
 #include <stdexcept>
 #include <string>
diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
index 1eda54c6b..52ed97acf 100644
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@@ -42,6 +42,7 @@
 #endif
 #include "concurrent_queue.h"
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
index f361801c2..e76944e54 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -37,6 +37,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
index cb2434bfa..6c0a101fc 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -40,6 +40,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_complex.h>
 #include <pmt/pmt.h>
+#include <memory>
 #include <stdexcept>
 #include <string>
 
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
index e6f0f2514..47a383e1e 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -41,6 +41,7 @@
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
index 561bed756..cbbaff624 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
@@ -45,6 +45,7 @@
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
index 80b1ac4a9..f548079ff 100644
--- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
@@ -44,6 +44,7 @@
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 
 
diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
index 4a2e1244d..d017afeef 100644
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
@@ -45,6 +45,7 @@
 #include <gnuradio/hier_block2.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 
 
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index 36066c972..a6dc3c081 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -39,6 +39,7 @@
 #include <gnuradio/uhd/usrp_source.h>
 #include <pmt/pmt.h>
 #include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
index 3fc5cb2d8..2be976ec1 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
@@ -36,6 +36,7 @@
 #include <pmt/pmt.h>
 #include <cstdint>
 #include <fstream>
+#include <memory>
 #include <string>
 
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
index 8421c2ee6..78cab6c39 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -47,6 +47,7 @@
 #include <gnuradio/sync_block.h>
 #include <cstdint>
 #include <string>
+#include <vector>
 
 class rtl_tcp_signal_source_c;
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
index b4514b55b..236cb6842 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -70,6 +70,7 @@
 
 #include <gnuradio/sync_interpolator.h>
 #include <cstdint>
+#include <vector>
 
 class unpack_2bit_samples;
 
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
index ad2b10ebb..32f4219ff 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
@@ -41,6 +41,7 @@
 #include <pmt/pmt.h>
 #include <cstddef>  // for size_t
 #include <cstdint>
+#include <memory>
 
 class Gnss_Sdr_Valve;
 
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
index 9ae57a1e1..9da278800 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
@@ -34,6 +34,7 @@
 #include "rtl_tcp_dongle_info.h"
 #include <boost/foreach.hpp>
 #include <string>
+#include <vector>
 
 using boost::asio::ip::tcp;
 
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 b1be0dd90..02c673daa 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
@@ -34,6 +34,7 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <pmt/pmt_sugar.h>  // for mp
+#include <algorithm>        // for copy
 #include <array>
 #include <cmath>      // for abs
 #include <exception>  // for exception
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
index 4e5b6169c..25c20e4e3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -45,7 +45,8 @@
 #include <pmt/pmt.h>              // for pmt_t
 #include <cstdint>                // for int32_t
 #include <fstream>                // for string, ofstream
-#include <utility>                // for pair
+#include <string>
+#include <utility>  // for pair
 #include <vector>
 
 class Gnss_Synchro;
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h
index c33a48ed7..fb1408194 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h
@@ -44,7 +44,9 @@
 #include <pmt/pmt.h>              // for pmt_t
 #include <cstdint>                // for int32_t
 #include <fstream>                // for string, ofstream
-#include <utility>                // for pair
+#include <memory>
+#include <string>
+#include <utility>  // for pair
 #include <vector>
 
 class Fpga_Multicorrelator_8sc;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
index 049f3ab40..b51e035e7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -46,6 +46,7 @@
 #include "tracking_FLL_PLL_filter.h"
 #include <gnuradio/block.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <deque>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
index b57db18a1..ac8149e0f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
@@ -44,6 +44,7 @@
 #include "tracking_FLL_PLL_filter.h"
 #include <gnuradio/block.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <deque>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/src/algorithms/tracking/libs/fpga_multicorrelator.h b/src/algorithms/tracking/libs/fpga_multicorrelator.h
index c8999d168..618286c06 100644
--- a/src/algorithms/tracking/libs/fpga_multicorrelator.h
+++ b/src/algorithms/tracking/libs/fpga_multicorrelator.h
@@ -39,6 +39,7 @@
 
 #include <gnuradio/block.h>
 #include <cstdint>
+#include <string>
 
 
 /*!
diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h
index fb4343159..0c3023eaf 100644
--- a/src/core/interfaces/acquisition_interface.h
+++ b/src/core/interfaces/acquisition_interface.h
@@ -40,6 +40,7 @@
 
 #include "gnss_block_interface.h"
 #include "gnss_synchro.h"
+#include <memory>
 
 template <typename Data>
 class Concurrent_Queue;
diff --git a/src/core/interfaces/pvt_interface.h b/src/core/interfaces/pvt_interface.h
index 15f758cc8..e40972589 100644
--- a/src/core/interfaces/pvt_interface.h
+++ b/src/core/interfaces/pvt_interface.h
@@ -42,6 +42,7 @@
 #include "gnss_block_interface.h"
 #include "gps_almanac.h"
 #include "gps_ephemeris.h"
+#include <map>
 
 /*!
  * \brief This class represents an interface to a PVT block.
diff --git a/src/core/libs/channel_status_msg_receiver.h b/src/core/libs/channel_status_msg_receiver.h
index 112dd6eaa..24649f61e 100644
--- a/src/core/libs/channel_status_msg_receiver.h
+++ b/src/core/libs/channel_status_msg_receiver.h
@@ -35,6 +35,7 @@
 #include "monitor_pvt.h"
 #include <gnuradio/block.h>
 #include <pmt/pmt.h>
+#include <map>
 #include <memory>
 
 class channel_status_msg_receiver;
diff --git a/src/core/monitor/serdes_gnss_synchro.h b/src/core/monitor/serdes_gnss_synchro.h
index 6cf746636..a123b6c57 100644
--- a/src/core/monitor/serdes_gnss_synchro.h
+++ b/src/core/monitor/serdes_gnss_synchro.h
@@ -35,9 +35,10 @@
 #include "gnss_synchro.h"
 #include "gnss_synchro.pb.h"  // file created by Protocol Buffers at compile time
 #include <array>
+#include <string>
+#include <utility>
 #include <vector>
 
-
 /*!
  * \brief This class implements serialization and deserialization of
  * Gnss_Synchro objects using Protocol Buffers.
diff --git a/src/core/receiver/file_configuration.cc b/src/core/receiver/file_configuration.cc
index c3e8d39c2..70ee6f630 100644
--- a/src/core/receiver/file_configuration.cc
+++ b/src/core/receiver/file_configuration.cc
@@ -39,6 +39,7 @@
 #include "string_converter.h"
 #include <glog/logging.h>
 #include <string>
+#include <utility>
 
 
 FileConfiguration::FileConfiguration(std::string filename)
diff --git a/src/core/system_parameters/Beidou_DNAV.h b/src/core/system_parameters/Beidou_DNAV.h
index 8cd45077c..d955599d3 100644
--- a/src/core/system_parameters/Beidou_DNAV.h
+++ b/src/core/system_parameters/Beidou_DNAV.h
@@ -33,6 +33,7 @@
 
 #include "MATH_CONSTANTS.h"
 #include <cstdint>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h
index fb0321b0f..ff2f72865 100644
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@@ -35,6 +35,7 @@
 #include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 #include <cstdint>
+#include <string>
 #include <utility>  // std::pair
 #include <vector>
 
diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.cc b/src/core/system_parameters/glonass_gnav_ephemeris.cc
index 25607d2c2..e89a70187 100644
--- a/src/core/system_parameters/glonass_gnav_ephemeris.cc
+++ b/src/core/system_parameters/glonass_gnav_ephemeris.cc
@@ -35,6 +35,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/posix_time/time_formatters.hpp>
 #include <cmath>
+#include <string>
 
 
 Glonass_Gnav_Ephemeris::Glonass_Gnav_Ephemeris()
diff --git a/src/tests/common-files/signal_generator_flags.h b/src/tests/common-files/signal_generator_flags.h
index 88d929595..876b927f6 100644
--- a/src/tests/common-files/signal_generator_flags.h
+++ b/src/tests/common-files/signal_generator_flags.h
@@ -33,6 +33,7 @@
 
 #include <gflags/gflags.h>
 #include <limits>
+#include <string>
 
 DEFINE_bool(disable_generator, false, "Disable the signal generator (a external signal file must be available for the test)");
 DEFINE_string(generator_binary, std::string(SW_GENERATOR_BIN), "Path of software-defined signal generator binary");
diff --git a/src/tests/common-files/test_flags.h b/src/tests/common-files/test_flags.h
index 5a22a1e2e..74ed3a49c 100644
--- a/src/tests/common-files/test_flags.h
+++ b/src/tests/common-files/test_flags.h
@@ -32,6 +32,7 @@
 #define GNSS_SDR_TEST_FLAGS_H_
 
 #include <gflags/gflags.h>
+#include <string>
 
 #if defined GNUPLOT_EXECUTABLE
 DEFINE_string(gnuplot_executable, std::string(GNUPLOT_EXECUTABLE), "Gnuplot binary path");
diff --git a/src/tests/common-files/tracking_tests_flags.h b/src/tests/common-files/tracking_tests_flags.h
index 50732e3b1..41e845083 100644
--- a/src/tests/common-files/tracking_tests_flags.h
+++ b/src/tests/common-files/tracking_tests_flags.h
@@ -33,6 +33,7 @@
 
 #include <gflags/gflags.h>
 #include <limits>
+#include <string>
 
 
 DEFINE_string(trk_test_implementation, std::string("GPS_L1_CA_DLL_PLL_Tracking"), "Tracking block implementation under test, defaults to GPS_L1_CA_DLL_PLL_Tracking");
diff --git a/src/tests/system-tests/libs/position_test_flags.h b/src/tests/system-tests/libs/position_test_flags.h
index bfb4c4334..d123a257d 100644
--- a/src/tests/system-tests/libs/position_test_flags.h
+++ b/src/tests/system-tests/libs/position_test_flags.h
@@ -33,6 +33,7 @@
 
 #include <gflags/gflags.h>
 #include <limits>
+#include <string>
 
 DEFINE_string(config_file_ptest, std::string(""), "File containing the configuration parameters for the position test.");
 DEFINE_bool(plot_position_test, false, "Plots results of with gnuplot");