diff --git a/src/algorithms/PVT/libs/an_packet_printer.cc b/src/algorithms/PVT/libs/an_packet_printer.cc
index a840334fd..88017ed87 100644
--- a/src/algorithms/PVT/libs/an_packet_printer.cc
+++ b/src/algorithms/PVT/libs/an_packet_printer.cc
@@ -22,6 +22,7 @@
 #include "rtklib_solver.h"  // for Rtklib_Solver
 #include <glog/logging.h>   // for DLOG
 #include <cmath>            // for M_PI
+#include <cstring>          // for memcpy
 #include <fcntl.h>          // for fcntl
 #include <iostream>         // for std::cerr
 #include <limits>           // std::numeric_limits
diff --git a/src/algorithms/libs/galileo_e6_signal_replica.cc b/src/algorithms/libs/galileo_e6_signal_replica.cc
index 4b84cad40..bdc73a18c 100644
--- a/src/algorithms/libs/galileo_e6_signal_replica.cc
+++ b/src/algorithms/libs/galileo_e6_signal_replica.cc
@@ -20,7 +20,7 @@
 #include "galileo_e6_signal_replica.h"
 #include "Galileo_E6.h"
 #include "gnss_signal_replica.h"
-#include <iostream>
+#include <utility>
 #include <vector>
 
 void galileo_e6_b_code_gen_complex_primary(own::span<std::complex<float>> dest,
diff --git a/src/algorithms/libs/gnss_sdr_fft.h b/src/algorithms/libs/gnss_sdr_fft.h
index 986a87f9f..826f8829c 100644
--- a/src/algorithms/libs/gnss_sdr_fft.h
+++ b/src/algorithms/libs/gnss_sdr_fft.h
@@ -20,6 +20,8 @@
 
 #include "gnss_sdr_make_unique.h"
 #include <gnuradio/fft/fft.h>
+#include <memory>
+#include <utility>
 
 #if GNURADIO_FFT_USES_TEMPLATES
 using gnss_fft_complex_fwd = gr::fft::fft_complex_fwd;
diff --git a/src/algorithms/signal_source/adapters/fifo_signal_source.h b/src/algorithms/signal_source/adapters/fifo_signal_source.h
index c3c83be9f..c1f98e8c9 100644
--- a/src/algorithms/signal_source/adapters/fifo_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fifo_signal_source.h
@@ -22,7 +22,8 @@
 #include "concurrent_queue.h"
 #include "signal_source_base.h"
 #include <pmt/pmt.h>
-
+#include <cstddef>
+#include <string>
 
 /** \addtogroup Signal_Source
  * \{ */
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h
index aa75f6bcd..87f83cef8 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -22,6 +22,7 @@
 #define GNSS_SDR_FILE_SIGNAL_SOURCE_H
 
 #include "file_source_base.h"
+#include <string>
 
 /** \addtogroup Signal_Source Signal Source
  * Classes for Signal Source management.
diff --git a/src/algorithms/signal_source/adapters/file_source_base.h b/src/algorithms/signal_source/adapters/file_source_base.h
index 2b0eb903e..d6bbf83b8 100644
--- a/src/algorithms/signal_source/adapters/file_source_base.h
+++ b/src/algorithms/signal_source/adapters/file_source_base.h
@@ -20,16 +20,18 @@
 
 #include "concurrent_queue.h"
 #include "signal_source_base.h"
+#include <gnuradio/blocks/file_sink.h>  // for dump
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/throttle.h>
 #include <pmt/pmt.h>
-#include <tuple>
-
-// for dump
-#include <gnuradio/blocks/file_sink.h>
 #include <cstddef>
 #include <string>
+#include <tuple>
 
+/** \addtogroup Signal_Source
+ * \{ */
+/** \addtogroup Signal_Source_adapters
+ * \{ */
 
 class ConfigurationInterface;
 
@@ -61,8 +63,6 @@ class ConfigurationInterface;
 //!   .dump     - whether to archive input data
 //!
 //!   .dump_filename - if dumping, path to file for output
-
-
 class FileSourceBase : public SignalSourceBase
 {
 public:
@@ -182,5 +182,6 @@ private:
     gr::blocks::file_sink::sptr sink_;
 };
 
-
-#endif
+/** \} */
+/** \} */
+#endif  // GNSS_SDR_FILE_SOURCE_BASE_H
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 91540e84f..5677e5695 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -23,6 +23,9 @@
 
 #include "file_source_base.h"
 #include "unpack_byte_2bit_samples.h"
+#include <cstddef>
+#include <string>
+#include <tuple>
 
 /** \addtogroup Signal_Source
  * \{ */
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 f73ee356c..3b7df29b0 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -20,6 +20,9 @@
 
 #include "file_source_base.h"
 #include "unpack_intspir_1bit_samples.h"
+#include <cstddef>
+#include <string>
+#include <tuple>
 
 
 /** \addtogroup Signal_Source
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 2c924918f..f0cd174f8 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
@@ -23,6 +23,9 @@
 #include "file_source_base.h"
 #include "unpack_byte_2bit_cpx_samples.h"
 #include <gnuradio/blocks/interleaved_short_to_complex.h>
+#include <cstddef>
+#include <string>
+#include <tuple>
 
 /** \addtogroup Signal_Source
  * \{ */
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 d4f53da62..0a8225884 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
@@ -24,6 +24,9 @@
 #include "file_source_base.h"
 #include "unpack_2bit_samples.h"
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
+#include <cstddef>
+#include <string>
+#include <tuple>
 
 
 /** \addtogroup Signal_Source
diff --git a/src/algorithms/signal_source/gnuradio_blocks/fifo_reader.h b/src/algorithms/signal_source/gnuradio_blocks/fifo_reader.h
index 3d4e0c520..9e289ebf5 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/fifo_reader.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/fifo_reader.h
@@ -21,6 +21,7 @@
 #include "gnss_block_interface.h"
 #include <gnuradio/sync_block.h>
 #include <fstream>  // std::ifstream
+#include <string>
 
 /** \addtogroup Signal_Source
  * \{ */
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
index 386d617b2..13064906b 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
@@ -28,6 +28,7 @@
 #include <bitset>
 #include <exception>
 #include <iostream>
+#include <memory>
 #include <sstream>
 #include <utility>
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
index 2357f13a7..1d3d91da6 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -21,6 +21,7 @@
 #define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
 
 #include <gnuradio/sync_interpolator.h>
+#include <memory>
 
 /** \addtogroup Signal_Source
  * \{ */
diff --git a/src/algorithms/signal_source/libs/fpga_buffer_monitor.h b/src/algorithms/signal_source/libs/fpga_buffer_monitor.h
index c9631c0eb..88d589d8a 100644
--- a/src/algorithms/signal_source/libs/fpga_buffer_monitor.h
+++ b/src/algorithms/signal_source/libs/fpga_buffer_monitor.h
@@ -26,7 +26,8 @@
 #define GNSS_SDR_FPGA_BUFFER_MONITOR_H
 
 #include <cstdint>  // for int32_t
-#include <fstream>  // for string, ofstream
+#include <fstream>  // for std::ofstream
+#include <string>   // for std::string
 
 /** \addtogroup Signal_Source
  * \{ */
diff --git a/src/core/libs/nav_message_packet.h b/src/core/libs/nav_message_packet.h
index 537c191fe..d4623aed9 100644
--- a/src/core/libs/nav_message_packet.h
+++ b/src/core/libs/nav_message_packet.h
@@ -19,6 +19,7 @@
 
 #include <cstdint>
 #include <string>
+#include <utility>
 
 /** \addtogroup Core
  * \{ */
diff --git a/src/core/libs/serdes_nav_message.h b/src/core/libs/serdes_nav_message.h
index b831267b1..0b7520ca9 100644
--- a/src/core/libs/serdes_nav_message.h
+++ b/src/core/libs/serdes_nav_message.h
@@ -21,7 +21,9 @@
 #include "nav_message.pb.h"  // file created by Protocol Buffers at compile time
 #include "nav_message_packet.h"
 #include <cstdint>
+#include <memory>
 #include <string>
+#include <utility>
 
 /** \addtogroup Telemetry_Decoder
  * \{ */