diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 967109d53..1ba2bd509 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -30,13 +30,14 @@
 
 
 #include "rtklib_pvt.h"
-#include <glog/logging.h>
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/math/common_factor_rt.hpp>
 #include <boost/serialization/map.hpp>
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h
index f37515323..f0b4238b4 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.h
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.h
@@ -33,9 +33,9 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_H_
 #define GNSS_SDR_RTKLIB_PVT_H_
 
-#include <string>
 #include "pvt_interface.h"
 #include "rtklib_pvt_cc.h"
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 85290da73..b800b0fc3 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -29,17 +29,18 @@
  */
 
 #include "rtklib_pvt_cc.h"
-#include <algorithm>
-#include <iostream>
-#include <map>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/math/common_factor_rt.hpp>
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/serialization/map.hpp>
+#include <glog/logging.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
-#include <glog/logging.h>
+#include <algorithm>
+#include <iostream>
+#include <map>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 7e71b21a0..635dfb7d7 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -31,20 +31,21 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_CC_H
 #define GNSS_SDR_RTKLIB_PVT_CC_H
 
-#include <chrono>
-#include <fstream>
-#include <utility>
-#include <string>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <gnuradio/sync_block.h>
+
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "geojson_printer.h"
 #include "rinex_printer.h"
 #include "rtcm_printer.h"
 #include "rtklib_solver.h"
+#include <gnuradio/sync_block.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <chrono>
+#include <fstream>
+#include <utility>
+#include <string>
 
 
 class rtklib_pvt_cc;
diff --git a/src/algorithms/PVT/libs/geojson_printer.cc b/src/algorithms/PVT/libs/geojson_printer.cc
index b1062f65f..5820778d4 100644
--- a/src/algorithms/PVT/libs/geojson_printer.cc
+++ b/src/algorithms/PVT/libs/geojson_printer.cc
@@ -31,10 +31,11 @@
 
 
 #include "geojson_printer.h"
-#include <iomanip>
-#include <sstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <iomanip>
+#include <sstream>
+
 
 GeoJSON_Printer::GeoJSON_Printer()
 {
diff --git a/src/algorithms/PVT/libs/geojson_printer.h b/src/algorithms/PVT/libs/geojson_printer.h
index b286e164a..17e080975 100644
--- a/src/algorithms/PVT/libs/geojson_printer.h
+++ b/src/algorithms/PVT/libs/geojson_printer.h
@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_GEOJSON_PRINTER_H_
 #define GNSS_SDR_GEOJSON_PRINTER_H_
 
+#include "pvt_solution.h"
 #include <fstream>
 #include <memory>
 #include <string>
-#include "pvt_solution.h"
 
 
 /*!
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
index 2deb7c05b..202f01709 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
@@ -30,10 +30,10 @@
  */
 
 #include "hybrid_ls_pvt.h"
-#include <glog/logging.h>
 #include "Galileo_E1.h"
 #include "GPS_L1_CA.h"
 #include "GPS_L2C.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.h b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
index 4e026b913..37fb6e15d 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.h
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
@@ -32,15 +32,15 @@
 #ifndef GNSS_SDR_HYBRID_LS_PVT_H_
 #define GNSS_SDR_HYBRID_LS_PVT_H_
 
-#include <fstream>
-#include <map>
-#include <string>
 #include "ls_pvt.h"
 #include "galileo_navigation_message.h"
 #include "gps_navigation_message.h"
 #include "gps_cnav_navigation_message.h"
 #include "gnss_synchro.h"
 #include "rtklib_rtkcmn.h"
+#include <fstream>
+#include <map>
+#include <string>
 
 /*!
  * \brief This class implements a simple PVT Least Squares solution
diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index 1db4f6f61..7e6e53ae5 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -30,9 +30,9 @@
  */
 
 #include "kml_printer.h"
-#include <sstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <sstream>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc
index 91620e8ce..daef8f3f2 100644
--- a/src/algorithms/PVT/libs/ls_pvt.cc
+++ b/src/algorithms/PVT/libs/ls_pvt.cc
@@ -30,10 +30,10 @@
  */
 
 #include "ls_pvt.h"
-#include <exception>
-#include <stdexcept>
 #include "GPS_L1_CA.h"
 #include <glog/logging.h>
+#include <exception>
+#include <stdexcept>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 5398af18b..f2fcda3e8 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -34,10 +34,10 @@
  */
 
 #include "nmea_printer.h"
-#include <fcntl.h>
-#include <termios.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <glog/logging.h>
+#include <fcntl.h>
+#include <termios.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h
index 6e83523f6..0e378ca8b 100644
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -36,10 +36,9 @@
 #ifndef GNSS_SDR_NMEA_PRINTER_H_
 #define GNSS_SDR_NMEA_PRINTER_H_
 
-
+#include "pvt_solution.h"
 #include <fstream>
 #include <string>
-#include "pvt_solution.h"
 
 
 /*!
diff --git a/src/algorithms/PVT/libs/pvt_solution.cc b/src/algorithms/PVT/libs/pvt_solution.cc
index 5e53dc9d0..5872d5ba7 100644
--- a/src/algorithms/PVT/libs/pvt_solution.cc
+++ b/src/algorithms/PVT/libs/pvt_solution.cc
@@ -30,9 +30,9 @@
  */
 
 #include "pvt_solution.h"
-#include <exception>
 #include "GPS_L1_CA.h"
 #include <glog/logging.h>
+#include <exception>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/pvt_solution.h b/src/algorithms/PVT/libs/pvt_solution.h
index 0a7cc451d..cf209004e 100644
--- a/src/algorithms/PVT/libs/pvt_solution.h
+++ b/src/algorithms/PVT/libs/pvt_solution.h
@@ -33,9 +33,9 @@
 #define GNSS_SDR_PVT_SOLUTION_H_
 
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <deque>
 #include <armadillo>
-#include <boost/date_time/posix_time/posix_time.hpp>
 
 const unsigned int PVT_MAX_CHANNELS = 90;
 const unsigned int PVT_MAX_PRN = 127;  // 126 is SBAS
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index f1dec9219..7d4990a77 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -29,6 +29,11 @@
  */
 
 #include "rinex_printer.h"
+#include <boost/date_time/time_zone_base.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/local_time/local_time.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <glog/logging.h>
 #include <unistd.h>  // for getlogin_r()
 #include <algorithm> // for min and max
 #include <cmath>     // for floor
@@ -38,11 +43,6 @@
 #include <set>
 #include <utility>
 #include <vector>
-#include <boost/date_time/time_zone_base.hpp>
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/local_time/local_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h
index 0aa6abb99..69ffe24e5 100644
--- a/src/algorithms/PVT/libs/rinex_printer.h
+++ b/src/algorithms/PVT/libs/rinex_printer.h
@@ -51,12 +51,6 @@
 #ifndef GNSS_SDR_RINEX_PRINTER_H_
 #define GNSS_SDR_RINEX_PRINTER_H_
 
-#include <string>
-#include <fstream>
-#include <sstream>  // for stringstream
-#include <iomanip>  // for setprecision
-#include <map>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include "gps_navigation_message.h"
 #include "gps_cnav_navigation_message.h"
 #include "galileo_navigation_message.h"
@@ -65,6 +59,12 @@
 #include "Galileo_E1.h"
 #include "GLONASS_L1_CA.h"
 #include "gnss_synchro.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <string>
+#include <fstream>
+#include <sstream>  // for stringstream
+#include <iomanip>  // for setprecision
+#include <map>
 
 class Sbas_Raw_Msg;
 
diff --git a/src/algorithms/PVT/libs/rtcm_printer.cc b/src/algorithms/PVT/libs/rtcm_printer.cc
index c5518dddf..4766ad480 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.cc
+++ b/src/algorithms/PVT/libs/rtcm_printer.cc
@@ -32,11 +32,12 @@
  */
 
 #include "rtcm_printer.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <glog/logging.h>
 #include <iomanip>
 #include <fcntl.h>    // for O_RDWR
 #include <termios.h>  // for tcgetattr
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/PVT/libs/rtcm_printer.h b/src/algorithms/PVT/libs/rtcm_printer.h
index 5c1445713..8568273bf 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.h
+++ b/src/algorithms/PVT/libs/rtcm_printer.h
@@ -34,9 +34,10 @@
 #ifndef GNSS_SDR_RTCM_PRINTER_H_
 #define GNSS_SDR_RTCM_PRINTER_H_
 
+#include "rtcm.h"
 #include <fstream>  // std::ofstream
 #include <memory>   // std::shared_ptr
-#include "rtcm.h"
+
 
 /*!
  * \brief This class provides a implementation of a subset of the RTCM Standard 10403.2 messages
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index 24bd8f163..2067e42f8 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -52,11 +52,11 @@
  * -----------------------------------------------------------------------*/
 
 #include "rtklib_solver.h"
-#include <glog/logging.h>
 #include "rtklib_conversions.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
 #include "GLONASS_L1_CA.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h
index bed0b9cde..af53b4811 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.h
+++ b/src/algorithms/PVT/libs/rtklib_solver.h
@@ -54,9 +54,7 @@
 #ifndef GNSS_SDR_RTKLIB_SOLVER_H_
 #define GNSS_SDR_RTKLIB_SOLVER_H_
 
-#include <fstream>
-#include <map>
-#include <string>
+
 #include "rtklib_rtkpos.h"
 #include "galileo_navigation_message.h"
 #include "gps_navigation_message.h"
@@ -64,6 +62,10 @@
 #include "glonass_gnav_navigation_message.h"
 #include "gnss_synchro.h"
 #include "pvt_solution.h"
+#include <fstream>
+#include <map>
+#include <string>
+
 
 /*!
  * \brief This class implements a simple PVT Least Squares solution
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 17ef914e0..c3ada5ef3 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -30,13 +30,14 @@
  */
 
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
+#include "configuration_interface.h"
+#include "galileo_e1_signal_processing.h"
+#include "Galileo_E1.h"
+#include "gnss_sdr_flags.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include "galileo_e1_signal_processing.h"
-#include "Galileo_E1.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
index c08db5b7c..41ed6e7ca 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
@@ -32,14 +32,14 @@
 #ifndef GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 #define GNSS_SDR_GALILEO_E1_PCPS_AMBIGUOUS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
index d3df351e5..1bcb950a8 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
@@ -29,14 +29,15 @@
  */
 
 #include "galileo_e5a_pcps_acquisition.h"
+#include "configuration_interface.h"
+#include "galileo_e5_signal_processing.h"
+#include "Galileo_E5a.h"
+#include "gnss_sdr_flags.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>
-#include "galileo_e5_signal_processing.h"
-#include "Galileo_E5a.h"
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h
index bfbc08a95..db6023160 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h
@@ -31,11 +31,12 @@
 #ifndef GALILEO_E5A_PCPS_ACQUISITION_H_
 #define GALILEO_E5A_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include "gnss_synchro.h"
+
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
index 5ce79503c..06dac08ee 100644
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
@@ -32,12 +32,12 @@
  */
 
 #include "glonass_l1_ca_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#include <glog/logging.h>
+#include "configuration_interface.h"
 #include "glonass_l1_signal_processing.h"
 #include "GLONASS_L1_CA.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
index 874e928b5..9251eb71d 100644
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h
@@ -34,14 +34,13 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GLONASS_L1_CA_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
-
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index c1f62ace7..5010c224c 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -34,12 +34,13 @@
  */
 
 #include "gps_l1_ca_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#include <glog/logging.h>
+#include "configuration_interface.h"
 #include "gps_sdr_signal_processing.h"
 #include "GPS_L1_CA.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
+
 
 
 using google::LogMessage;
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
index 9b692fb6c..104911ff1 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
@@ -36,15 +36,14 @@
 #ifndef GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index 595f64d82..a8c2bab9e 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -32,12 +32,12 @@
  */
 
 #include "gps_l2_m_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#include <glog/logging.h>
+#include "configuration_interface.h"
 #include "gps_l2c_signal.h"
 #include "GPS_L2C.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
index cf410b6b3..5fa3e1a0b 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
@@ -34,14 +34,14 @@
 #ifndef GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L2_M_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <string>
 
 
 
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index 9c0d8ef51..4d72ad74b 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -32,12 +32,12 @@
  */
 
 #include "gps_l5i_pcps_acquisition.h"
-#include <boost/math/distributions/exponential.hpp>
-#include <glog/logging.h>
+#include "configuration_interface.h"
 #include "gps_l5_signal.h"
 #include "GPS_L5.h"
-#include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/math/distributions/exponential.hpp>
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
index 1c1891045..977b70c60 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
@@ -34,15 +34,14 @@
 #ifndef GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_
 #define GNSS_SDR_GPS_L5i_PCPS_ACQUISITION_H_
 
-#include <string>
-#include <gnuradio/blocks/stream_to_vector.h>
-#include <gnuradio/blocks/float_to_complex.h>
-#include "gnss_synchro.h"
 #include "acquisition_interface.h"
+#include "gnss_synchro.h"
 #include "pcps_acquisition.h"
 #include "complex_byte_to_float_x2.h"
+#include <gnuradio/blocks/stream_to_vector.h>
+#include <gnuradio/blocks/float_to_complex.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
index affd45952..3c261cd07 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
@@ -34,14 +34,13 @@
  */
 
 #include "pcps_acquisition.h"
-#include <cstring>
+#include "GPS_L1_CA.h"     // for GPS_TWO_PI
+#include "GLONASS_L1_CA.h" // for GLONASS_TWO_PI
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
 #include <volk/volk.h>
-#include "GPS_L1_CA.h" //GPS_TWO_PI
-#include "GLONASS_L1_CA.h" //GLONASS_TWO_PI
-
+#include <cstring>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
index b9e88c79b..c8ba1ef1b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
@@ -52,13 +52,12 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_H_
 #define GNSS_SDR_PCPS_ACQUISITION_H_
 
-
-#include <string>
+#include "gnss_synchro.h"
 #include <armadillo>
 #include <gnuradio/block.h>
 #include <gnuradio/fft/fft.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "gnss_synchro.h"
+#include <string>
 
 
 class pcps_acquisition;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
index 0f80cf3bd..12520a89e 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@@ -31,16 +31,16 @@
  */
 
 #include "pcps_acquisition_fine_doppler_cc.h"
-#include <algorithm>    // std::rotate, std::fill_n
-#include <sstream>
+#include "gps_sdr_signal_processing.h"
+#include "control_message_factory.h"
+#include "GPS_L1_CA.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "concurrent_map.h"
-#include "gps_sdr_signal_processing.h"
-#include "control_message_factory.h"
-#include "GPS_L1_CA.h"
+#include <algorithm>    // std::rotate, std::fill_n
+#include <sstream>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
index cd3d75e5f..f174efdc7 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@@ -48,12 +48,12 @@
 #ifndef GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 #define GNSS_SDR_PCPS_ACQUISITION_FINE_DOPPLER_CC_H_
 
-#include <fstream>
-#include <string>
+#include "gnss_synchro.h"
 #include <gnuradio/block.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
+#include <fstream>
+#include <string>
 
 class pcps_acquisition_fine_doppler_cc;
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index cbc541c33..3a6a8c319 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -29,14 +29,14 @@
  */
 
 #include "pcps_quicksync_acquisition_cc.h"
-#include <cmath>
-#include <sstream>
+#include "control_message_factory.h"
+#include "GPS_L1_CA.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "control_message_factory.h"
-#include "GPS_L1_CA.h"
+#include <cmath>
+#include <sstream>
 
 
 using google::LogMessage;
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 1196e6821..5840e3442 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -51,15 +51,15 @@
 #ifndef GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_
 #define GNSS_SDR_PCPS_QUICKSYNC_ACQUISITION_CC_H_
 
+#include "gnss_synchro.h"
+#include <gnuradio/block.h>
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/fft/fft.h>
 #include <fstream>
 #include <string>
 #include <algorithm>
 #include <functional>
-#include <assert.h>
-#include <gnuradio/block.h>
-#include <gnuradio/gr_complex.h>
-#include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
+#include <cassert>
 
 class pcps_quicksync_acquisition_cc;
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index 676705a23..28e28abf6 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -49,13 +49,13 @@
  */
 
 #include "pcps_tong_acquisition_cc.h"
-#include <sstream>
+#include "control_message_factory.h"
+#include "GPS_L1_CA.h" // for GPS_TWO_PI
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include "control_message_factory.h"
-#include "GPS_L1_CA.h" //GPS_TWO_PI
+#include <sstream>
 
 using google::LogMessage;
 
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 7174f2a88..4afb487fe 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -51,12 +51,13 @@
 #ifndef GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_
 #define GNSS_SDR_PCPS_TONG_ACQUISITION_CC_H_
 
-#include <fstream>
-#include <string>
+#include "gnss_synchro.h"
 #include <gnuradio/block.h>
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/fft/fft.h>
-#include "gnss_synchro.h"
+#include <fstream>
+#include <string>
+
 
 class pcps_tong_acquisition_cc;
 
diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc
index 59c56eeee..5cfb237f6 100644
--- a/src/algorithms/channel/adapters/channel.cc
+++ b/src/algorithms/channel/adapters/channel.cc
@@ -30,10 +30,11 @@
  */
 
 #include "channel.h"
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h
index 8740b5ad9..d9ec7b9fe 100644
--- a/src/algorithms/channel/adapters/channel.h
+++ b/src/algorithms/channel/adapters/channel.h
@@ -35,15 +35,15 @@
 #ifndef GNSS_SDR_CHANNEL_H_
 #define GNSS_SDR_CHANNEL_H_
 
-#include <memory>
-#include <string>
-#include <mutex>
-#include <gnuradio/msg_queue.h>
-#include <gnuradio/block.h>
 #include "channel_interface.h"
 #include "channel_fsm.h"
 #include "gnss_synchro.h"
 #include "channel_msg_receiver_cc.h"
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/block.h>
+#include <memory>
+#include <string>
+#include <mutex>
 
 class ConfigurationInterface;
 class AcquisitionInterface;
diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc
index b6f23cbeb..4a96029b5 100644
--- a/src/algorithms/channel/libs/channel_fsm.cc
+++ b/src/algorithms/channel/libs/channel_fsm.cc
@@ -30,8 +30,9 @@
  */
 
 #include "channel_fsm.h"
-#include <glog/logging.h>
 #include "control_message_factory.h"
+#include <glog/logging.h>
+
 
 
 ChannelFsm::ChannelFsm()
diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h
index 23b92c394..37e57a326 100644
--- a/src/algorithms/channel/libs/channel_fsm.h
+++ b/src/algorithms/channel/libs/channel_fsm.h
@@ -32,12 +32,13 @@
 #ifndef GNSS_SDR_CHANNEL_FSM_H
 #define GNSS_SDR_CHANNEL_FSM_H
 
-#include <mutex>
-#include <memory>
-#include <gnuradio/msg_queue.h>
 #include "acquisition_interface.h"
 #include "tracking_interface.h"
 #include "telemetry_decoder_interface.h"
+#include <gnuradio/msg_queue.h>
+#include <memory>
+#include <mutex>
+
 
 /*!
  * \brief This class implements a State Machine for channel
diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h
index 77a91379a..63997f25f 100644
--- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h
+++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h
@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H
 #define GNSS_SDR_CHANNEL_MSG_RECEIVER_CC_H
 
-#include <gnuradio/block.h>
 #include "channel_fsm.h"
+#include <gnuradio/block.h>
 
 class channel_msg_receiver_cc;
 
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h
index 815bf7cec..940bba0da 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.h
@@ -32,9 +32,8 @@
 #ifndef GNSS_SDR_SIGNAL_CONDITIONER_H_
 #define GNSS_SDR_SIGNAL_CONDITIONER_H_
 
-#include <string>
 #include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 class AcquisitionInterface;
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
index 75df4f1e3..edce62562 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.cc
@@ -29,8 +29,9 @@
  */
 
 #include "byte_to_short.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/byte_to_short.h b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
index 85870ba43..25420efc3 100644
--- a/src/algorithms/data_type_adapter/adapters/byte_to_short.h
+++ b/src/algorithms/data_type_adapter/adapters/byte_to_short.h
@@ -31,11 +31,10 @@
 #ifndef GNSS_SDR_BYTE_TO_SHORT_H_
 #define GNSS_SDR_BYTE_TO_SHORT_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/blocks/char_to_short.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
index e91455a23..542632542 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
@@ -30,9 +30,9 @@
  */
 
 #include "ibyte_to_cbyte.h"
-#include <volk/volk.h>
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <volk/volk.h>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
index c40d85286..c3d3866c3 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.h
@@ -32,12 +32,11 @@
 #ifndef GNSS_SDR_IBYTE_TO_CBYTE_H_
 #define GNSS_SDR_IBYTE_TO_CBYTE_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_ic.h"
 #include "gnss_block_interface.h"
 #include "interleaved_byte_to_complex_byte.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
index 83b6fd6c5..61023d212 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
@@ -29,8 +29,8 @@
  */
 
 #include "ibyte_to_complex.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
index 3c379d7ba..47edf5b3d 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_complex.h
@@ -31,13 +31,12 @@
 #ifndef GNSS_SDR_IBYTE_TO_COMPLEX_H_
 #define GNSS_SDR_IBYTE_TO_COMPLEX_H_
 
-#include <string>
-#include <gnuradio/blocks/interleaved_char_to_complex.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_cc.h"
 #include "gnss_block_interface.h"
 #include "gnss_synchro.h"
-
+#include <gnuradio/blocks/interleaved_char_to_complex.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
index 59ac82042..35755564f 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
@@ -30,9 +30,10 @@
  */
 
 #include "ibyte_to_cshort.h"
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
index 2de7089ac..33c861945 100644
--- a/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.h
@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_IBYTE_TO_CSHORT_H_
 #define GNSS_SDR_IBYTE_TO_CSHORT_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
 #include "conjugate_sc.h"
 #include "interleaved_byte_to_complex_short.h"
-
+#include "gnss_block_interface.h"
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
index cb9d3c6df..55cc24974 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
@@ -29,8 +29,8 @@
  */
 
 #include "ishort_to_complex.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
+#include <glog/logging.h>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
index 57cf7283e..3319163fb 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_complex.h
@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_ISHORT_TO_COMPLEX_H_
 #define GNSS_SDR_ISHORT_TO_COMPLEX_H_
 
-#include <string>
-#include <gnuradio/blocks/interleaved_short_to_complex.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_cc.h"
 #include "gnss_block_interface.h"
-
+#include <gnuradio/blocks/interleaved_short_to_complex.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
index 96a87abe2..740c4baf5 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
@@ -30,9 +30,9 @@
  */
 
 #include "ishort_to_cshort.h"
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
 
 using google::LogMessage;
 
diff --git a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
index 685373a6a..a996f7fd9 100644
--- a/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
+++ b/src/algorithms/data_type_adapter/adapters/ishort_to_cshort.h
@@ -31,12 +31,11 @@
 #ifndef GNSS_SDR_ISHORT_TO_CSHORT_H_
 #define GNSS_SDR_ISHORT_TO_CSHORT_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
 #include "conjugate_sc.h"
 #include "gnss_block_interface.h"
 #include "interleaved_short_to_complex_short.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc
index 8b1797f0e..b621310f3 100644
--- a/src/algorithms/input_filter/adapters/beamformer_filter.cc
+++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc
@@ -29,10 +29,10 @@
  */
 
 #include "beamformer_filter.h"
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "beamformer.h"
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h
index fce549ebf..1af6a13e5 100644
--- a/src/algorithms/input_filter/adapters/beamformer_filter.h
+++ b/src/algorithms/input_filter/adapters/beamformer_filter.h
@@ -32,9 +32,9 @@
 #ifndef GNSS_SDR_BEAMFORMER_FILTER_H_
 #define GNSS_SDR_BEAMFORMER_FILTER_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
 #include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc
index 8112251b4..3b1b613c1 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/fir_filter.cc
@@ -30,11 +30,12 @@
  */
 
 #include "fir_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/filter/pm_remez.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/input_filter/adapters/fir_filter.h b/src/algorithms/input_filter/adapters/fir_filter.h
index 9a5fdc8a1..0ea7faf39 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.h
+++ b/src/algorithms/input_filter/adapters/fir_filter.h
@@ -33,9 +33,11 @@
 #ifndef GNSS_SDR_FIR_FILTER_H_
 #define GNSS_SDR_FIR_FILTER_H_
 
-#include <cmath>
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
+#include "complex_byte_to_float_x2.h"
+#include "byte_x2_to_complex_byte.h"
+#include "short_x2_to_cshort.h"
+#include "cshort_to_float_x2.h"
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_char.h>
@@ -43,11 +45,9 @@
 #include <gnuradio/blocks/float_to_short.h>
 #include <gnuradio/filter/fir_filter_ccf.h>
 #include <gnuradio/filter/fir_filter_fff.h>
-#include "gnss_block_interface.h"
-#include "complex_byte_to_float_x2.h"
-#include "byte_x2_to_complex_byte.h"
-#include "short_x2_to_cshort.h"
-#include "cshort_to_float_x2.h"
+#include <cmath>
+#include <string>
+#include <vector>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
index a62d179f1..dfab552c5 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
@@ -30,13 +30,13 @@
  */
 
 #include "freq_xlating_fir_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/filter/pm_remez.h>
 #include <gnuradio/filter/firdes.h>
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
 
 using google::LogMessage;
 
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
index baaf47c10..c304c3226 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.h
@@ -33,8 +33,9 @@
 #ifndef GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 #define GNSS_SDR_FREQ_XLATING_FIR_FILTER_H_
 
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
+#include "short_x2_to_cshort.h"
+#include "complex_float_to_complex_byte.h"
 #include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
 #include <gnuradio/filter/freq_xlating_fir_filter_fcf.h>
 #include <gnuradio/filter/freq_xlating_fir_filter_scf.h>
@@ -42,9 +43,8 @@
 #include <gnuradio/blocks/complex_to_float.h>
 #include <gnuradio/blocks/char_to_short.h>
 #include <gnuradio/blocks/float_to_short.h>
-#include "gnss_block_interface.h"
-#include "short_x2_to_cshort.h"
-#include "complex_float_to_complex_byte.h"
+#include <string>
+#include <vector>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/adapters/notch_filter.cc b/src/algorithms/input_filter/adapters/notch_filter.cc
index ed13c84d4..ae209f3f2 100644
--- a/src/algorithms/input_filter/adapters/notch_filter.cc
+++ b/src/algorithms/input_filter/adapters/notch_filter.cc
@@ -30,10 +30,11 @@
  */
 
 #include "notch_filter.h"
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "notch_cc.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/input_filter/adapters/notch_filter.h b/src/algorithms/input_filter/adapters/notch_filter.h
index a8ab2136b..9e2a11f26 100644
--- a/src/algorithms/input_filter/adapters/notch_filter.h
+++ b/src/algorithms/input_filter/adapters/notch_filter.h
@@ -33,12 +33,11 @@
 #ifndef GNSS_SDR_NOTCH_FILTER_H_
 #define GNSS_SDR_NOTCH_FILTER_H_
 
+#include "notch_cc.h"
+#include "gnss_block_interface.h"
+#include <gnuradio/blocks/file_sink.h>
 #include <string>
 #include <vector>
-#include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-#include "notch_cc.h"
-
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.cc b/src/algorithms/input_filter/adapters/notch_filter_lite.cc
index 4273c65fa..86c11e114 100644
--- a/src/algorithms/input_filter/adapters/notch_filter_lite.cc
+++ b/src/algorithms/input_filter/adapters/notch_filter_lite.cc
@@ -30,11 +30,11 @@
  */
 
 #include "notch_filter_lite.h"
-#include <cmath>
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "notch_lite_cc.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+#include <cmath>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/input_filter/adapters/notch_filter_lite.h b/src/algorithms/input_filter/adapters/notch_filter_lite.h
index f9088db52..0333d76c1 100644
--- a/src/algorithms/input_filter/adapters/notch_filter_lite.h
+++ b/src/algorithms/input_filter/adapters/notch_filter_lite.h
@@ -33,12 +33,11 @@
 #ifndef GNSS_SDR_NOTCH_FILTER_LITE_H_
 #define GNSS_SDR_NOTCH_FILTER_LITE_H_
 
-#include <string>
-#include <vector>
-#include <gnuradio/blocks/file_sink.h>
 #include "gnss_block_interface.h"
 #include "notch_lite_cc.h"
-
+#include <gnuradio/blocks/file_sink.h>
+#include <string>
+#include <vector>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc
index 07c543a92..5f92ecf94 100644
--- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc
+++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.cc
@@ -28,13 +28,13 @@
  * -------------------------------------------------------------------------
  */
 
+#include "pulse_blanking_filter.h"
+#include "configuration_interface.h"
 #include <boost/lexical_cast.hpp>
-#include <vector>
-#include <cmath>
 #include <glog/logging.h>
 #include <gnuradio/filter/firdes.h>
-#include "configuration_interface.h"
-#include "pulse_blanking_filter.h"
+#include <vector>
+#include <cmath>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
index 8c5211c64..fb8f82515 100644
--- a/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
+++ b/src/algorithms/input_filter/adapters/pulse_blanking_filter.h
@@ -32,11 +32,11 @@
 #ifndef GNSS_SDR_PULSE_BLANKING_FILTER_H_
 #define GNSS_SDR_PULSE_BLANKING_FILTER_H_
 
-#include <string>
-#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
 #include "gnss_block_interface.h"
 #include "pulse_blanking_cc.h"
+#include <gnuradio/blocks/file_sink.h>
+#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc
index 697d33362..7fa3fc68a 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.cc
@@ -30,9 +30,9 @@
 
 
 #include "beamformer.h"
-#include <iostream>
-#include <sstream>
 #include <gnuradio/io_signature.h>
+#include <sstream>
+
 
 #define GNSS_SDR_BEAMFORMER_CHANNELS 8
 
@@ -53,7 +53,7 @@ beamformer::beamformer()
 
     for (int i = 0; i< GNSS_SDR_BEAMFORMER_CHANNELS; i++)
         {
-            weight_vector[i]=gr_complex(1,0);
+            weight_vector[i] = gr_complex(1,0);
         }
 }
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
index 03855f454..26dd1f1af 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
@@ -29,13 +29,12 @@
  */
 
 #include "notch_cc.h"
-#include <cstring>
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cstring>
+#include <cmath>
 
 using google::LogMessage;
 
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 178d0cb6b..091a67a7d 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
@@ -29,14 +29,12 @@
  */
 
 #include "notch_lite_cc.h"
-
-#include <cstring>
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cstring>
+#include <cmath>
 
 using google::LogMessage;
 
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 41bc815a9..badcd00d9 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
@@ -29,12 +29,11 @@
  */
 
 #include "pulse_blanking_cc.h"
-#include <cmath>
 #include <boost/math/distributions/chi_squared.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
-
+#include <cmath>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/libs/complex_float_to_complex_byte.cc b/src/algorithms/libs/complex_float_to_complex_byte.cc
index a6934d5b9..fc26ead1a 100644
--- a/src/algorithms/libs/complex_float_to_complex_byte.cc
+++ b/src/algorithms/libs/complex_float_to_complex_byte.cc
@@ -31,9 +31,7 @@
 
 #include "complex_float_to_complex_byte.h"
 #include <gnuradio/io_signature.h>
-#include <volk/volk.h>
-#include "volk_gnsssdr/volk_gnsssdr.h"
-
+#include <volk_gnsssdr/volk_gnsssdr.h>
 
 
 complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte()
@@ -47,7 +45,7 @@ complex_float_to_complex_byte::complex_float_to_complex_byte() : sync_block("com
                         gr::io_signature::make (1, 1, sizeof(gr_complex)),
                         gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
 {
-    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    const int alignment_multiple = volk_gnsssdr_get_alignment() / sizeof(lv_8sc_t);
     set_alignment(std::max(1, alignment_multiple));
 }
 
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc
index 2ea720ec8..49ce4d0f6 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -31,9 +31,9 @@
  */
 
 #include "galileo_e1_signal_processing.h"
-#include <string>
 #include "Galileo_E1.h"
 #include "gnss_signal_processing.h"
+#include <string>
 
 
 void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn)
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc
index ba2677aae..4f1f116bb 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -32,9 +32,9 @@
  */
 
 #include "galileo_e5_signal_processing.h"
-#include <gnuradio/math.h>
 #include "Galileo_E5a.h"
 #include "gnss_signal_processing.h"
+#include <gnuradio/gr_complex.h>
 
 
 
diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc
index 0aa8221b5..96ce9a705 100644
--- a/src/algorithms/libs/gnss_sdr_flags.cc
+++ b/src/algorithms/libs/gnss_sdr_flags.cc
@@ -29,7 +29,7 @@
  */
 
 
-#include <gnss_sdr_flags.h>
+#include "gnss_sdr_flags.h"
 #include <cstdint>
 #include <iostream>
 
diff --git a/src/algorithms/libs/gnss_sdr_valve.cc b/src/algorithms/libs/gnss_sdr_valve.cc
index 971284c88..d56edbbc8 100644
--- a/src/algorithms/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/libs/gnss_sdr_valve.cc
@@ -31,11 +31,11 @@
  */
 
 #include "gnss_sdr_valve.h"
-#include <algorithm> // for min
-#include <cstring>  // for memcpy
-#include <gnuradio/io_signature.h>
 #include "control_message_factory.h"
 #include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <algorithm> // for min
+#include <cstring>  // for memcpy
 
 gnss_sdr_valve::gnss_sdr_valve (size_t sizeof_stream_item,
         unsigned long long nitems,
diff --git a/src/algorithms/libs/gnss_signal_processing.cc b/src/algorithms/libs/gnss_signal_processing.cc
index 9666b1d0d..ba624ea9b 100644
--- a/src/algorithms/libs/gnss_signal_processing.cc
+++ b/src/algorithms/libs/gnss_signal_processing.cc
@@ -32,8 +32,8 @@
  */
 
 #include "gnss_signal_processing.h"
-#include <gnuradio/fxpt_nco.h>
 #include "GPS_L1_CA.h"
+#include <gnuradio/fxpt_nco.h>
 
 
 auto auxCeil2 = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };
diff --git a/src/algorithms/libs/gps_l2c_signal.cc b/src/algorithms/libs/gps_l2c_signal.cc
index 4bd44a994..590c5751c 100644
--- a/src/algorithms/libs/gps_l2c_signal.cc
+++ b/src/algorithms/libs/gps_l2c_signal.cc
@@ -30,10 +30,10 @@
  * -------------------------------------------------------------------------
  */
 
-#include <gps_l2c_signal.h>
+#include "gps_l2c_signal.h"
+#include "GPS_L2C.h"
 #include <cstdint>
 #include <cmath>
-#include "GPS_L2C.h"
 
 
 int32_t gps_l2c_m_shift(int32_t x)
diff --git a/src/algorithms/libs/gps_l5_signal.cc b/src/algorithms/libs/gps_l5_signal.cc
index 5aa15b96c..46b5d9430 100644
--- a/src/algorithms/libs/gps_l5_signal.cc
+++ b/src/algorithms/libs/gps_l5_signal.cc
@@ -30,12 +30,12 @@
  * -------------------------------------------------------------------------
  */
 
-#include <iostream>
-#include <deque>
-#include <cmath>
-#include <cinttypes>
-#include <complex>
+#include "gps_l5_signal.h"
 #include "GPS_L5.h"
+#include <cinttypes>
+#include <cmath>
+#include <complex>
+#include <deque>
 
 
 std::deque<bool> l5i_xa_shift(std::deque<bool> xa)
diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc
index 87f2b1be6..584d06886 100644
--- a/src/algorithms/libs/pass_through.cc
+++ b/src/algorithms/libs/pass_through.cc
@@ -31,11 +31,10 @@
  */
 
 #include "pass_through.h"
-#include <iostream>
-#include <complex>
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <volk/volk.h>
-#include "configuration_interface.h"
+#include <complex>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/libs/pass_through.h b/src/algorithms/libs/pass_through.h
index 39d4c5468..105ec9f78 100644
--- a/src/algorithms/libs/pass_through.h
+++ b/src/algorithms/libs/pass_through.h
@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_PASS_THROUGH_H_
 #define GNSS_SDR_PASS_THROUGH_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
-#include <gnuradio/blocks/copy.h>
-#include "gnss_block_interface.h"
 #include "conjugate_cc.h"
 #include "conjugate_sc.h"
 #include "conjugate_ic.h"
+#include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/blocks/copy.h>
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index 7aa7ddf5f..8d172b171 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -53,6 +53,9 @@
 #ifndef GNSS_SDR_RTKLIB_H_
 #define GNSS_SDR_RTKLIB_H_
 
+#include "MATH_CONSTANTS.h"
+#include "gnss_frequencies.h"
+#include "gnss_obs_codes.h"
 #include <pthread.h>
 #include <netinet/in.h>
 #include <cctype>
@@ -60,9 +63,6 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
-#include "gnss_obs_codes.h"
 
 
 /* macros --------------------------------------------------------------------*/
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
index 1d76658e4..3a2c7c39f 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr-config-info.cc
@@ -20,11 +20,11 @@
 #include <config.h>
 #endif
 
+#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
+#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 #include <volk_gnsssdr/constants.h>      // for volk_gnsssdr_available_machines, volk_gnsssdr_c_compiler ...
 #include <iostream>                      // for operator<<, endl, cout, ostream
 #include <string>                        // for string
-#include "volk_gnsssdr/volk_gnsssdr.h"   // for volk_gnsssdr_get_alignment, volk_gnsssdr_get_machine
-#include "volk_gnsssdr_option_helpers.h" // for option_list, option_t
 
 void print_alignment()
 {
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
index bf8a7ec77..5b9a1a653 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
@@ -16,23 +16,23 @@
  * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include "kernel_tests.h"                      // for init_test_list
+#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
+#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
+#include "volk_gnsssdr_profile.h"
+#include "volk_gnsssdr/volk_gnsssdr_prefs.h"   // for volk_gnsssdr_get_config_path
+#include <boost/filesystem/operations.hpp>     // for create_directories, exists
+#include <boost/filesystem/path.hpp>           // for path, operator<<
+#include <boost/filesystem/path_traits.hpp>    // for filesystem
 #include <sys/stat.h>                          // for stat
 #include <cstddef>                             // for size_t
 #include <iostream>                            // for operator<<, basic_ostream
 #include <fstream>                             // IWYU pragma: keep
 #include <map>                                 // for map, map<>::iterator
 #include <utility>                             // for pair
-#include <vector>                              // for vector, vector<>::const_...
-#include <boost/filesystem/operations.hpp>     // for create_directories, exists
-#include <boost/filesystem/path.hpp>           // for path, operator<<
-#include <boost/filesystem/path_traits.hpp>    // for filesystem
-#include <volk_gnsssdr/volk_gnsssdr_prefs.h>   // for volk_gnsssdr_get_config_path
-#include "kernel_tests.h"                      // for init_test_list
-#include "qa_utils.h"                          // for volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h" // for lv_32fc_t
-#include "volk_gnsssdr_option_helpers.h"       // for option_list, option_t
-#include "volk_gnsssdr_profile.h"
+#include <vector>                              // for vector, vector<>::const_..
+
 
 
 namespace fs = boost::filesystem;
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
index 35186fc1b..35e60b2f4 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.cc
@@ -17,6 +17,13 @@
  */
 
 #include "qa_utils.h"
+#include "volk_gnsssdr/volk_gnsssdr.h"              // for volk_gnsssdr_func_desc_t
+#include "volk_gnsssdr/volk_gnsssdr_malloc.h"       // for volk_gnsssdr_free, volk_gnsssdr_malloc
+#include <boost/foreach.hpp>                        // for auto_any_base
+#include <boost/lexical_cast.hpp>                   // for lexical_cast
+#include <boost/token_functions.hpp>                // for char_separator
+#include <boost/token_iterator.hpp>                 // for token_iterator
+#include <boost/tokenizer.hpp>                      // for tokenizer
 #include <cassert>                                  // for assert
 #include <chrono>                                   // for system_clock, duration,...
 #include <cmath>                                    // for sqrt, fabs, abs
@@ -28,13 +35,6 @@
 #include <map>                                      // for map
 #include <random>                                   // for random_device, default_random_engine, uniform_real_distribution
 #include <vector>                                   // for vector
-#include <boost/foreach.hpp>                        // for auto_any_base
-#include <boost/lexical_cast.hpp>                   // for lexical_cast
-#include <boost/token_functions.hpp>                // for char_separator
-#include <boost/token_iterator.hpp>                 // for token_iterator
-#include <boost/tokenizer.hpp>                      // for tokenizer
-#include <volk_gnsssdr/volk_gnsssdr.h>              // for volk_gnsssdr_func_desc_t
-#include <volk_gnsssdr/volk_gnsssdr_malloc.h>       // for volk_gnsssdr_free, volk_gnsssdr_malloc
 
 
 float uniform() {
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
index b7b16a63d..ad4d7e6b9 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/qa_utils.h
@@ -23,13 +23,13 @@
 #define _DARWIN_C_SOURCE
 #endif
 
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
+#include "volk_gnsssdr/volk_gnsssdr.h"          // for volk_gnsssdr_func_desc_t
 #include <cstdbool>       // for bool, false
 #include <cstdlib>        // for NULL
 #include <map>            // for map
 #include <string>         // for string, basic_string
 #include <vector>         // for vector
-#include <volk_gnsssdr/volk_gnsssdr.h>          // for volk_gnsssdr_func_desc_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 
 /************************************************
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
index bc9e526dc..6e1f0fb61 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/testqa.cc
@@ -18,6 +18,9 @@
  */
 
 
+#include "kernel_tests.h"       // for init_test_list
+#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
+#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 #include <cstdbool>             // for bool, false, true
 #include <iostream>             // for operator<<, basic_ostream, endl, char...
 #include <fstream>              // IWYU pragma: keep
@@ -25,9 +28,6 @@
 #include <string>               // for string, operator<<
 #include <utility>              // for pair
 #include <vector>               // for vector
-#include "kernel_tests.h"       // for init_test_list
-#include "qa_utils.h"           // for volk_gnsssdr_test_case_t, volk_gnsssdr_test_results_t
-#include "volk_gnsssdr/volk_gnsssdr_complex.h"  // for lv_32fc_t
 
 void print_qa_xml(std::vector<volk_gnsssdr_test_results_t> results, unsigned int nfails);
 
diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc
index a3a33d38a..62b7c37ae 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.cc
+++ b/src/algorithms/observables/adapters/hybrid_observables.cc
@@ -32,9 +32,10 @@
 
 #include "hybrid_observables.h"
 #include "configuration_interface.h"
-#include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
+#include "GPS_L1_CA.h"
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/observables/adapters/hybrid_observables.h b/src/algorithms/observables/adapters/hybrid_observables.h
index d986ebb14..567c7b5ba 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.h
+++ b/src/algorithms/observables/adapters/hybrid_observables.h
@@ -34,10 +34,9 @@
 #ifndef GNSS_SDR_HYBRID_OBSERVABLES_H_
 #define GNSS_SDR_HYBRID_OBSERVABLES_H_
 
-#include <string>
-#include "observables_interface.h"
 #include "hybrid_observables_cc.h"
-
+#include "observables_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index 66cd0fce0..658b25bbf 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -29,20 +29,21 @@
  */
 
 #include "hybrid_observables_cc.h"
+#include "Galileo_E1.h"
+#include "GPS_L1_CA.h"
+#include <armadillo>
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/block_detail.h>
+#include <gnuradio/buffer.h>
+#include <matio.h>
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <map>
 #include <vector>
 #include <utility>
-#include <armadillo>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/block_detail.h>
-#include <gnuradio/buffer.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include "Galileo_E1.h"
-#include "GPS_L1_CA.h"
+
 
 using google::LogMessage;
 
@@ -506,11 +507,13 @@ int hybrid_observables_cc::general_work (int noutput_items ,
                                     // two points linear interpolation using adjacent (adj) values: y=y1+(x-x1)*(y2-y1)/(x2-x1)
                                     // TOW at the selected receiver time T_rx_s
                                     int element_key = gnss_synchro_map_iter->second.Channel_ID;
-                                    try{
-                                        adj_obs = adjacent_gnss_synchro_map.at(element_key);
-                                    }catch(const std::exception & ex)
+                                    try
                                     {
-                                        continue;
+                                            adj_obs = adjacent_gnss_synchro_map.at(element_key);
+                                    }
+                                    catch(const std::exception & ex)
+                                    {
+                                            continue;
                                     }
 
                                     double adj_T_rx_s = static_cast<double>(adj_obs.Tracking_sample_counter) / channel_fs_hz + adj_obs.Code_phase_samples / channel_fs_hz;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index 494f84e75..e97922173 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_HYBRID_OBSERVABLES_CC_H
 #define GNSS_SDR_HYBRID_OBSERVABLES_CC_H
 
+#include "gnss_synchro.h"
+#include <gnuradio/block.h>
 #include <fstream>
 #include <string>
-#include <gnuradio/block.h>
-#include "gnss_synchro.h"
 
 
 class hybrid_observables_cc;
diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
index c69eeb43b..5c3071981 100644
--- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
+++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.cc
@@ -30,15 +30,15 @@
  */
 
 #include "direct_resampler_conditioner.h"
-#include <cmath>
-#include <limits>
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
-#include <volk/volk.h>
 #include "direct_resampler_conditioner_cc.h"
 #include "direct_resampler_conditioner_cs.h"
 #include "direct_resampler_conditioner_cb.h"
 #include "configuration_interface.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <volk/volk.h>
+#include <cmath>
+#include <limits>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
index 8a188d506..8ffa4d4b4 100644
--- a/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
+++ b/src/algorithms/resampler/adapters/direct_resampler_conditioner.h
@@ -33,9 +33,9 @@
 #ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_
 #define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_H_
 
-#include <string>
-#include <gnuradio/hier_block2.h>
 #include "gnss_block_interface.h"
+#include <gnuradio/hier_block2.h>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
index 340fc5cea..170215618 100644
--- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
+++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.cc
@@ -30,11 +30,11 @@
  */
 
 #include "mmse_resampler_conditioner.h"
-#include <cmath>
-#include <limits>
+#include "configuration_interface.h"
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "configuration_interface.h"
+#include <cmath>
+#include <limits>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h
index 57aae1906..c5ce652dc 100644
--- a/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h
+++ b/src/algorithms/resampler/adapters/mmse_resampler_conditioner.h
@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_
 #define GNSS_SDR_MMSE_RESAMPLER_CONDITIONER_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #ifdef GR_GREATER_38
 #include <gnuradio/filter/mmse_resampler_cc.h>
 #else
 #include <gnuradio/filter/fractional_resampler_cc.h>
 #endif
-#include "gnss_block_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
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 bfda13b4e..386968791 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
@@ -33,8 +33,6 @@
 
 
 #include "direct_resampler_conditioner_cb.h"
-#include <algorithm>
-#include <iostream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 
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 569f3fc14..e05f887d5 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
@@ -33,11 +33,10 @@
 
 
 #include "direct_resampler_conditioner_cc.h"
-#include <algorithm>
-#include <iostream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 
+
 using google::LogMessage;
 
 direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
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 e0e808e0c..e362a1dde 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
@@ -33,8 +33,6 @@
 
 
 #include "direct_resampler_conditioner_cs.h"
-#include <algorithm>
-#include <iostream>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc
index 57e3c0aa0..439e3c3ca 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.cc
+++ b/src/algorithms/signal_generator/adapters/signal_generator.cc
@@ -31,12 +31,12 @@
 
 
 #include "signal_generator.h"
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "Galileo_E1.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E5a.h"
 #include "GLONASS_L1_CA.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.h b/src/algorithms/signal_generator/adapters/signal_generator.h
index 97815b393..16104062d 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.h
+++ b/src/algorithms/signal_generator/adapters/signal_generator.h
@@ -33,15 +33,14 @@
 #ifndef GNSS_SDR_SIGNAL_GENERATOR_H_
 #define GNSS_SDR_SIGNAL_GENERATOR_H_
 
-
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
+#include "signal_generator_c.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/vector_to_stream.h>
-#include "gnss_block_interface.h"
-#include "signal_generator_c.h"
+#include <string>
+#include <vector>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 6d84c3084..8bc43795e 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -29,10 +29,6 @@
 */
 
 #include "signal_generator_c.h"
-#include <iostream>
-#include <fstream>
-#include <gnuradio/io_signature.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "gps_sdr_signal_processing.h"
 #include "glonass_l1_signal_processing.h"
 #include "galileo_e1_signal_processing.h"
@@ -41,6 +37,9 @@
 #include "Galileo_E5a.h"
 #include "GPS_L1_CA.h"
 #include "GLONASS_L1_CA.h"
+#include <gnuradio/io_signature.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <fstream>
 
 /*
 * Create a new instance of signal_generator_c and return
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
index 01357e08c..93a938347 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
@@ -31,13 +31,14 @@
 #ifndef GNSS_SDR_SIGNAL_GENERATOR_C_H
 #define GNSS_SDR_SIGNAL_GENERATOR_C_H
 
-#include <string>
-#include <vector>
-#include <random>
+#include "gnss_signal.h"
 #include <boost/scoped_array.hpp>
 #include <gnuradio/random.h>
 #include <gnuradio/block.h>
-#include "gnss_signal.h"
+#include <string>
+#include <vector>
+#include <random>
+
 
 class signal_generator_c;
 
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc
index aa2c18244..f05d5b1bd 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -31,14 +31,14 @@
  */
 
 #include "file_signal_source.h"
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <exception>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include "gnss_sdr_valve.h"
+#include <glog/logging.h>
+#include <iostream>  // for std::cerr
+#include <fstream>
+#include <iomanip>
+#include <exception>
 
 
 
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h
index 85c9104db..850c73e93 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -35,14 +35,13 @@
 #ifndef GNSS_SDR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index e21126506..ee5f7411a 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -29,11 +29,11 @@
  */
 
 #include "flexiband_signal_source.h"
+#include "configuration_interface.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
 #include <teleorbit/frontend.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index 5949f8cb0..b071a5b75 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -33,14 +33,14 @@
 #ifndef FLEXIBAND_SIGNAL_SOURCE_H_
 #define FLEXIBAND_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/char_to_float.h>
 #include <gnuradio/blocks/float_to_complex.h>
+#include <string>
 #include <vector>
-#include "gnss_block_interface.h"
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
index 52916a19e..14c3a1386 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
@@ -30,11 +30,12 @@
  */
 
 #include "fmcomms2_signal_source.h"
-#include <iostream>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <iostream>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
index 78f3ebb58..a359c8cfe 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@@ -33,12 +33,12 @@
 #ifndef GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_
 #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/iio/fmcomms2_source.h>
-#include "gnss_block_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.cc b/src/algorithms/signal_source/adapters/gen_signal_source.cc
index bede41061..f709e419d 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.cc
@@ -31,13 +31,12 @@
  */
 
 #include "gen_signal_source.h"
-#include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/io_signature.h>
 #include <gnuradio/message.h>
 #include <glog/logging.h>
+#include <sstream>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h
index 034155bf0..1fcbc15a7 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_GEN_SIGNAL_SOURCE_H_
 #define GNSS_SDR_GEN_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
 
+#include "gnss_block_interface.h"
+#include <gnuradio/msg_queue.h>
+#include <string>
 
 /*!
  * \brief This class wraps blocks that generates synthesized GNSS signal and
diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc
index 17ac8513c..438723ff9 100644
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc
@@ -29,11 +29,11 @@
  */
 
 #include "gn3s_signal_source.h"
+#include "configuration_interface.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
 #include <gn3s/gn3s_source_cc.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
index b8b61cbdb..146a5aaec 100644
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
@@ -32,11 +32,11 @@
 #ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
 #define GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
index ddd0805c2..3a5fb9175 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
@@ -29,9 +29,10 @@
  */
 
 #include "labsat_signal_source.h"
-#include <glog/logging.h>
-#include "labsat23_source.h"
 #include "configuration_interface.h"
+#include "labsat23_source.h"
+#include <glog/logging.h>
+
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h
index 43821e8e8..71942f90b 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.h
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h
@@ -32,12 +32,11 @@
 #ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
 #define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
index 00d374d55..2208d15e7 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
@@ -31,14 +31,14 @@
  */
 
 #include "nsr_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;
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 8ca419c91..7be4ea775 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -35,15 +35,14 @@
 #ifndef GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_byte_2bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "unpack_byte_2bit_samples.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc
index d4e314911..4bb665ffa 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.cc
@@ -30,13 +30,14 @@
  */
 
 #include "osmosdr_signal_source.h"
-#include <iostream>
-#include <boost/format.hpp>
-#include <glog/logging.h>
-#include <gnuradio/blocks/file_sink.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <boost/format.hpp>
+#include <glog/logging.h>
+#include <gnuradio/blocks/file_sink.h>
+#include <iostream>
+
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index bed05d358..7e69aec81 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -33,13 +33,13 @@
 #ifndef GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_
 #define GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_
 
-#include <stdexcept>
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <osmosdr/source.h>
-#include "gnss_block_interface.h"
+#include <stdexcept>
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
index 4e7e37b3e..3f3e6f171 100644
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
@@ -29,11 +29,11 @@
  */
 
 #include "plutosdr_signal_source.h"
-#include <iostream>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <iostream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
index 56c2334c8..535f50939 100644
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@@ -32,12 +32,13 @@
 #ifndef GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
 #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/iio/pluto_source.h>
-#include "gnss_block_interface.h"
+#include <string>
+
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
index d203901e8..ba96b0460 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
@@ -29,11 +29,11 @@
  */
 
 #include "raw_array_signal_source.h"
+#include "configuration_interface.h"
+#include <dbfcttc/raw_array.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <glog/logging.h>
-#include <dbfcttc/raw_array.h>
-#include "configuration_interface.h"
 
 
 using google::LogMessage;
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 fe813aa8f..eaabd84e2 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -32,12 +32,11 @@
 #ifndef RAW_ARRAY_SIGNAL_SOURCE_H_
 #define RAW_ARRAY_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
-#include "gnss_block_interface.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index 38da90196..1e2e86c3b 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -31,12 +31,13 @@
  */
 
 #include "rtl_tcp_signal_source.h"
-#include <glog/logging.h>
-#include <iostream>
-#include <boost/format.hpp>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <boost/format.hpp>
+#include <glog/logging.h>
+#include <iostream>
+
 
 using google::LogMessage;
 
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 283f84ae9..e8cf81393 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -32,15 +32,16 @@
 #ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
 #define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
 
-#include <stdexcept>
-#include <string>
+#include "rtl_tcp_signal_source_c.h"
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/deinterleave.h>
 #include <gnuradio/blocks/float_to_complex.h>
-#include "rtl_tcp_signal_source_c.h"
-#include "gnss_block_interface.h"
+#include <stdexcept>
+#include <string>
+
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
index 3446406bb..0293f5805 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
@@ -30,14 +30,14 @@
  */
 
 #include "spir_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "configuration_interface.h"
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;
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 f620a40c9..bb73cd013 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -32,15 +32,14 @@
 #ifndef GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_intspir_1bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "unpack_intspir_1bit_samples.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
index 75d30b9f5..512ec6678 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
@@ -30,13 +30,13 @@
  */
 
 #include "spir_gss6450_file_signal_source.h"
+#include "configuration_interface.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <cstdio>
-#include <glog/logging.h>
-#include "configuration_interface.h"
+
 
 using google::LogMessage;
 
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 05985b36c..cc07a9747 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
@@ -32,8 +32,9 @@
 #ifndef GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
+#include "gnss_sdr_valve.h"
+#include "unpack_spir_gss6450_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
@@ -42,9 +43,8 @@
 #include <gnuradio/blocks/endian_swap.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
-#include "gnss_sdr_valve.h"
-#include "unpack_spir_gss6450_samples.h"
+#include <string>
+#include <vector>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
index 4aa79fb12..ea5f715c7 100644
--- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
@@ -30,14 +30,14 @@
  */
 
 #include "two_bit_cpx_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
-#include "configuration_interface.h"
 
 
 using google::LogMessage;
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 674bb24de..405bd1a68 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
@@ -34,16 +34,15 @@
 #ifndef GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_byte_2bit_cpx_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/interleaved_short_to_complex.h>
-#include "gnss_block_interface.h"
-#include "unpack_byte_2bit_cpx_samples.h"
-
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
index 3e0712c8a..829c8941b 100644
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
@@ -31,16 +31,15 @@
  */
 
 #include "two_bit_packed_file_signal_source.h"
+#include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+#include <glog/logging.h>
+#include <gnuradio/blocks/char_to_float.h>
 #include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <glog/logging.h>
-#include <gnuradio/blocks/char_to_float.h>
-#include "gnss_sdr_flags.h"
-#include "gnss_sdr_valve.h"
-#include "configuration_interface.h"
-
 
 
 using google::LogMessage;
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 397010311..72af7696a 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
@@ -35,16 +35,15 @@
 #ifndef GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_
 #define GNSS_SDR_TWO_BIT_PACKED_FILE_SIGNAL_SOURCE_H_
 
-#include <string>
+#include "gnss_block_interface.h"
+#include "unpack_2bit_samples.h"
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
-#include "gnss_block_interface.h"
-#include "unpack_2bit_samples.h"
-
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
index 8a3658281..7d4057c8a 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@@ -29,14 +29,15 @@
  */
 
 #include "uhd_signal_source.h"
-#include <iostream>
-#include <uhd/types/device_addr.hpp>
-#include <uhd/exception.hpp>
-#include <volk/volk.h>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_sdr_valve.h"
 #include "GPS_L1_CA.h"
+#include <glog/logging.h>
+#include <uhd/types/device_addr.hpp>
+#include <uhd/exception.hpp>
+#include <volk/volk.h>
+#include <iostream>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index 94a622218..969a44819 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -31,14 +31,15 @@
 #ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H_
 #define GNSS_SDR_UHD_SIGNAL_SOURCE_H_
 
-#include <string>
-#include <vector>
+#include "gnss_block_interface.h"
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/uhd/usrp_source.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
-#include "gnss_block_interface.h"
+#include <string>
+#include <vector>
+
 
 class ConfigurationInterface;
 
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 d73a40509..7ad2e7827 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
@@ -40,12 +40,12 @@
 
 #include "rtl_tcp_dongle_info.h"
 #include <boost/asio.hpp>
-#include <gnuradio/sync_block.h>
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/array.hpp>
 #include <boost/circular_buffer.hpp>
+#include <gnuradio/sync_block.h>
+#include <string>
 
 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 0e8a73da3..dbb97e583 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -68,9 +68,8 @@
 #ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H
 #define GNSS_SDR_UNPACK_2BIT_SAMPLES_H
 
-#include <cstdint>
 #include <gnuradio/sync_interpolator.h>
-
+#include <cstdint>
 
 class unpack_2bit_samples;
 
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 ad736a0cc..1f28b0004 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
@@ -32,8 +32,8 @@
  */
 
 #include "rtl_tcp_dongle_info.h"
-#include <string>
 #include <boost/foreach.hpp>
+#include <string>
 
 using boost::asio::ip::tcp;
 
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 5de974a85..15d52e856 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.cc
@@ -32,14 +32,14 @@
 
 
 #include "galileo_e1b_telemetry_decoder.h"
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
 #include "configuration_interface.h"
-#include "concurrent_queue.h"
 #include "galileo_ephemeris.h"
 #include "galileo_almanac.h"
 #include "galileo_iono.h"
 #include "galileo_utc_model.h"
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
@@ -47,9 +47,9 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* c
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -58,7 +58,6 @@ GalileoE1BTelemetryDecoder::GalileoE1BTelemetryDecoder(ConfigurationInterface* c
     // make telemetry decoder object
     telemetry_decoder_ = galileo_e1b_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
index 571fd09b8..6f3d2837c 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h
@@ -34,11 +34,11 @@
 #ifndef GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_H_
 
-#include <string>
+
 #include "telemetry_decoder_interface.h"
 #include "galileo_e1b_telemetry_decoder_cc.h"
 #include "gnss_satellite.h"
-
+#include <string>
 
 
 class ConfigurationInterface;
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 24f72a4ac..8b862e7e3 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.cc
@@ -35,14 +35,14 @@
  */
 
 #include "galileo_e5a_telemetry_decoder.h"
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include "concurrent_queue.h"
+#include "configuration_interface.h"
 #include "galileo_ephemeris.h"
 #include "galileo_almanac.h"
 #include "galileo_iono.h"
 #include "galileo_utc_model.h"
-#include "configuration_interface.h"
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+
 
 
 using google::LogMessage;
@@ -51,9 +51,9 @@ GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* c
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -62,7 +62,6 @@ GalileoE5aTelemetryDecoder::GalileoE5aTelemetryDecoder(ConfigurationInterface* c
     // make telemetry decoder object
     telemetry_decoder_ = galileo_e5a_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-    DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")";
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
index 9b7bb7713..cf2d0aae6 100644
--- a/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/galileo_e5a_telemetry_decoder.h
@@ -37,10 +37,9 @@
 #ifndef GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_H_
 
-#include <string>
-#include "telemetry_decoder_interface.h"
 #include "galileo_e5a_telemetry_decoder_cc.h"
-
+#include "telemetry_decoder_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
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 5e4b5a4bc..0ff8facef 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
@@ -32,13 +32,13 @@
 
 
 #include "glonass_l1_ca_telemetry_decoder.h"
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include "concurrent_queue.h"
+#include "configuration_interface.h"
 #include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_almanac.h"
 #include "glonass_gnav_utc_model.h"
-#include "configuration_interface.h"
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
@@ -46,9 +46,9 @@ GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface*
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -57,8 +57,6 @@ GlonassL1CaTelemetryDecoder::GlonassL1CaTelemetryDecoder(ConfigurationInterface*
     // make telemetry decoder object
     telemetry_decoder_ = glonass_l1_ca_make_telemetry_decoder_cc(satellite_, dump_);
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-
-    DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")";
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h
index 6eef6e858..a2f413302 100644
--- a/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/glonass_l1_ca_telemetry_decoder.h
@@ -34,10 +34,9 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_H_
 
-#include <string>
 #include "telemetry_decoder_interface.h"
 #include "glonass_l1_ca_telemetry_decoder_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
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 72deeafd6..cb285e9b9 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
@@ -31,14 +31,14 @@
 
 
 #include "gps_l1_ca_telemetry_decoder.h"
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include "concurrent_queue.h"
+#include "configuration_interface.h"
 #include "gps_ephemeris.h"
 #include "gps_almanac.h"
 #include "gps_iono.h"
 #include "gps_utc_model.h"
-#include "configuration_interface.h"
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+
 
 using google::LogMessage;
 
@@ -46,9 +46,9 @@ GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configu
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -57,8 +57,6 @@ GpsL1CaTelemetryDecoder::GpsL1CaTelemetryDecoder(ConfigurationInterface* configu
     // make telemetry decoder object
     telemetry_decoder_ = gps_l1_ca_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-
-    DLOG(INFO) << "global navigation message queue assigned to telemetry_decoder ("<< telemetry_decoder_->unique_id() << ")";
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
index fdefb78d5..2d115fc5e 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h
@@ -33,10 +33,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_H_
 
-#include <string>
-#include "telemetry_decoder_interface.h"
 #include "gps_l1_ca_telemetry_decoder_cc.h"
-
+#include "telemetry_decoder_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
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 205b34395..d93569211 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.cc
@@ -31,14 +31,13 @@
 
 
 #include "gps_l2c_telemetry_decoder.h"
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include "concurrent_queue.h"
+#include "configuration_interface.h"
 #include "gps_cnav_ephemeris.h"
 #include "gps_almanac.h"
 #include "gps_cnav_iono.h"
 #include "gps_cnav_utc_model.h"
-#include "configuration_interface.h"
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
 
 
 using google::LogMessage;
@@ -47,9 +46,9 @@ GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configura
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -58,8 +57,6 @@ GpsL2CTelemetryDecoder::GpsL2CTelemetryDecoder(ConfigurationInterface* configura
     // make telemetry decoder object
     telemetry_decoder_ = gps_l2c_make_telemetry_decoder_cc(satellite_, dump_); // TODO fix me
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-
-    LOG(INFO) << "global navigation message queue assigned to telemetry_decoder (" << telemetry_decoder_->unique_id() << ")" << "role " << role;
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
index c98d724cf..753478bae 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l2c_telemetry_decoder.h
@@ -33,10 +33,9 @@
 #ifndef GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_H_
 
-#include <string>
-#include "telemetry_decoder_interface.h"
 #include "gps_l2c_telemetry_decoder_cc.h"
-
+#include "telemetry_decoder_interface.h"
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc
index fe4f356f1..8b57e81cf 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.cc
@@ -31,10 +31,9 @@
 
 
 #include "gps_l5_telemetry_decoder.h"
+#include "configuration_interface.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "concurrent_queue.h"
-#include "configuration_interface.h"
 
 
 using google::LogMessage;
@@ -43,9 +42,9 @@ GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configurati
         std::string role,
         unsigned int in_streams,
         unsigned int out_streams) :
-        role_(role),
-        in_streams_(in_streams),
-        out_streams_(out_streams)
+                role_(role),
+                in_streams_(in_streams),
+                out_streams_(out_streams)
 {
     std::string default_dump_filename = "./navigation.dat";
     DLOG(INFO) << "role " << role;
@@ -54,8 +53,6 @@ GpsL5TelemetryDecoder::GpsL5TelemetryDecoder(ConfigurationInterface* configurati
     // make telemetry decoder object
     telemetry_decoder_ = gps_l5_make_telemetry_decoder_cc(satellite_, dump_);
     DLOG(INFO) << "telemetry_decoder(" << telemetry_decoder_->unique_id() << ")";
-
-    LOG(INFO) << "global navigation message queue assigned to telemetry_decoder (" << telemetry_decoder_->unique_id() << ")" << "role " << role;
     channel_ = 0;
 }
 
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h
index 4041e253e..d25405cf3 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/gps_l5_telemetry_decoder.h
@@ -33,10 +33,11 @@
 #ifndef GNSS_SDR_GPS_L5_TELEMETRY_DECODER_H_
 #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_H_
 
-#include <string>
+
 #include "telemetry_decoder_interface.h"
 #include "gps_l5_telemetry_decoder_cc.h"
 #include "gnss_satellite.h"
+#include <string>
 
 
 class ConfigurationInterface;
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 bf9e45e74..755419bd7 100644
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.cc
@@ -31,12 +31,12 @@
 
 
 #include "sbas_l1_telemetry_decoder.h"
+#include "configuration_interface.h"
+#include "sbas_ephemeris.h"
+#include "sbas_l1_telemetry_decoder_cc.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "concurrent_queue.h"
-#include "sbas_ephemeris.h"
-#include "configuration_interface.h"
-#include "sbas_l1_telemetry_decoder_cc.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
index 47325cad7..eae3bf32f 100644
--- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
+++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h
@@ -33,10 +33,10 @@
 #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_
 #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_H_
 
-#include <string>
+
 #include "telemetry_decoder_interface.h"
 #include "sbas_l1_telemetry_decoder_cc.h"
-
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
index 97c4a9927..34b829252 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@@ -31,13 +31,13 @@
 
 
 #include "galileo_e1b_telemetry_decoder_cc.h"
-#include <iostream>
+#include "control_message_factory.h"
+#include "convolutional.h"
+#include "gnss_synchro.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
-#include "gnss_synchro.h"
-#include "convolutional.h"
+#include <iostream>
 
 
 #define CRC_ERROR_LIMIT 6
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
index 95a618c7a..7e6fb0374 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
@@ -32,19 +32,18 @@
 #ifndef GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_GALILEO_E1B_TELEMETRY_DECODER_CC_H
 
-#include <fstream>
-#include <string>
-#include <gnuradio/block.h>
+
 #include "Galileo_E1.h"
-#include "concurrent_queue.h"
-#include "gnss_satellite.h"
 #include "galileo_navigation_message.h"
 #include "galileo_ephemeris.h"
 #include "galileo_almanac.h"
 #include "galileo_iono.h"
 #include "galileo_utc_model.h"
+#include "gnss_satellite.h"
 #include "gnss_synchro.h"
-
+#include <gnuradio/block.h>
+#include <fstream>
+#include <string>
 
 
 class galileo_e1b_telemetry_decoder_cc;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
index 4f76a6d99..6ae735b57 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.cc
@@ -35,13 +35,13 @@
  */
 
 #include "galileo_e5a_telemetry_decoder_cc.h"
-#include <iostream>
+#include "control_message_factory.h"
+#include "convolutional.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <cmath>
-#include "control_message_factory.h"
-#include "convolutional.h"
+#include <iostream>
 
 
 #define GALILEO_E5a_CRC_ERROR_LIMIT 6
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
index 4390b3181..af1d3f15d 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e5a_telemetry_decoder_cc.h
@@ -37,12 +37,7 @@
 #ifndef GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_CC_H_
 #define GNSS_SDR_GALILEO_E5A_TELEMETRY_DECODER_CC_H_
 
-#include <fstream>
-#include <string>
-#include <deque>
-#include <gnuradio/block.h>
 #include "Galileo_E5a.h"
-#include "concurrent_queue.h"
 #include "gnss_satellite.h"
 #include "galileo_fnav_message.h"
 #include "galileo_ephemeris.h"
@@ -50,6 +45,11 @@
 #include "galileo_iono.h"
 #include "galileo_utc_model.h"
 #include "gnss_synchro.h"
+#include <gnuradio/block.h>
+#include <deque>
+#include <fstream>
+#include <string>
+
 
 class galileo_e5a_telemetry_decoder_cc;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
index 8973d7d95..5acf0aa22 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
@@ -33,18 +33,17 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_GLONASS_L1_CA_TELEMETRY_DECODER_CC_H
 
-#include <fstream>
-#include <string>
-#include <gnuradio/block.h>
+
 #include "GLONASS_L1_CA.h"
-#include "concurrent_queue.h"
-#include "gnss_satellite.h"
 #include "glonass_gnav_navigation_message.h"
 #include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_almanac.h"
 #include "glonass_gnav_utc_model.h"
+#include "gnss_satellite.h"
 #include "gnss_synchro.h"
-
+#include <gnuradio/block.h>
+#include <fstream>
+#include <string>
 
 
 class glonass_l1_ca_telemetry_decoder_cc;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index c47d448e7..92cedda70 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -30,11 +30,11 @@
  */
 
 #include "gps_l1_ca_telemetry_decoder_cc.h"
-#include <iostream>
+#include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
+
 
 #ifndef _rotl
 #define _rotl(X,N)  ((X << N) ^ (X >> (32-N)))  // Used in the parity check algorithm
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
index 49ae8e1d0..28c006adf 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
@@ -31,16 +31,14 @@
 #ifndef GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_GPS_L1_CA_TELEMETRY_DECODER_CC_H
 
-#include <fstream>
-#include <string>
-#include <gnuradio/block.h>
-#include <deque>
 #include "GPS_L1_CA.h"
 #include "gps_l1_ca_subframe_fsm.h"
-#include "concurrent_queue.h"
 #include "gnss_satellite.h"
 #include "gnss_synchro.h"
-
+#include <gnuradio/block.h>
+#include <deque>
+#include <fstream>
+#include <string>
 
 class gps_l1_ca_telemetry_decoder_cc;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
index 7b1334836..c65db4178 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.cc
@@ -29,14 +29,16 @@
  * -------------------------------------------------------------------------
  */
 
+
+#include "gps_l2c_telemetry_decoder_cc.h"
+#include "gnss_synchro.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
 #include <bitset>
 #include <iostream>
 #include <sstream>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <boost/lexical_cast.hpp>
-#include "gnss_synchro.h"
-#include "gps_l2c_telemetry_decoder_cc.h"
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
index 240eac538..d5613fd73 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
@@ -31,18 +31,19 @@
 #ifndef GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_GPS_L2C_TELEMETRY_DECODER_CC_H
 
+
+#include "gnss_satellite.h"
+#include "gps_cnav_navigation_message.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
+#include <gnuradio/block.h>
 #include <algorithm> // for copy
 #include <deque>
 #include <fstream>
 #include <string>
 #include <utility> // for pair
 #include <vector>
-#include <gnuradio/block.h>
-#include "gnss_satellite.h"
-#include "gps_cnav_navigation_message.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "concurrent_queue.h"
+
 
 extern "C" {
     #include "cnav_msg.h"
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
index 2d604b221..44ebc407b 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
@@ -29,16 +29,18 @@
  * -------------------------------------------------------------------------
  */
 
-#include <bitset>
-#include <iostream>
-#include <sstream>
+
+#include "gps_l5_telemetry_decoder_cc.h"
+#include "gnss_synchro.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
 #include <boost/lexical_cast.hpp>
-#include "gnss_synchro.h"
-#include "gps_l5_telemetry_decoder_cc.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
+#include <bitset>
+#include <iostream>
+#include <sstream>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
index 3d60b95ce..f3452b78f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
@@ -31,16 +31,16 @@
 #ifndef GNSS_SDR_GPS_L5_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_GPS_L5_TELEMETRY_DECODER_CC_H
 
+
+#include "gnss_satellite.h"
+#include "gps_cnav_navigation_message.h"
+#include <gnuradio/block.h>
 #include <algorithm>
 #include <deque>
 #include <fstream>
 #include <string>
 #include <utility>
 #include <vector>
-#include <gnuradio/block.h>
-#include "gnss_satellite.h"
-#include "gps_cnav_navigation_message.h"
-#include "concurrent_queue.h"
 
 extern "C" {
     #include "cnav_msg.h"
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index f06cf16fd..dab50ea9f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -28,14 +28,14 @@
  * -------------------------------------------------------------------------
  */
 
-#include <iostream>
-#include <sstream>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <boost/lexical_cast.hpp>
+#include "sbas_l1_telemetry_decoder_cc.h"
 #include "control_message_factory.h"
 #include "gnss_synchro.h"
-#include "sbas_l1_telemetry_decoder_cc.h"
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+#include <gnuradio/io_signature.h>
+#include <sstream>
+
 
 using google::LogMessage;
 
@@ -46,7 +46,6 @@ using google::LogMessage;
 #define LMORE 5     //
 
 
-
 sbas_l1_telemetry_decoder_cc_sptr
 sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite & satellite, bool dump)
 {
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
index ee0b2f732..8f31cf4e5 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
@@ -31,16 +31,17 @@
 #ifndef GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H
 #define GNSS_SDR_SBAS_L1_TELEMETRY_DECODER_CC_H
 
+#include "gnss_satellite.h"
+#include "viterbi_decoder.h"
+#include <boost/crc.hpp>
+#include <gnuradio/block.h>
 #include <algorithm> // for copy
 #include <deque>
 #include <fstream>
 #include <string>
 #include <utility> // for pair
 #include <vector>
-#include <boost/crc.hpp>
-#include <gnuradio/block.h>
-#include "gnss_satellite.h"
-#include "viterbi_decoder.h"
+
 
 class sbas_l1_telemetry_decoder_cc;
 
diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
index 68d286822..5a464f6d3 100644
--- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
+++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.cc
@@ -29,13 +29,13 @@
  */
 
 #include "gps_l1_ca_subframe_fsm.h"
-#include <string>
+#include "gnss_satellite.h"
 #include <boost/statechart/simple_state.hpp>
 #include <boost/statechart/state.hpp>
 #include <boost/statechart/transition.hpp>
 #include <boost/statechart/custom_reaction.hpp>
 #include <boost/mpl/list.hpp>
-#include "gnss_satellite.h"
+#include <string>
 
 
 //************ GPS WORD TO SUBFRAME DECODER STATE MACHINE **********
diff --git a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
index 34e40043f..84a388eda 100644
--- a/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
+++ b/src/algorithms/telemetry_decoder/libs/gps_l1_ca_subframe_fsm.h
@@ -32,14 +32,13 @@
 #ifndef GNSS_SDR_GPS_L1_CA_SUBFRAME_FSM_H_
 #define GNSS_SDR_GPS_L1_CA_SUBFRAME_FSM_H_
 
-#include <boost/statechart/state_machine.hpp>
-#include "concurrent_queue.h"
 #include "GPS_L1_CA.h"
 #include "gps_navigation_message.h"
 #include "gps_ephemeris.h"
 #include "gps_iono.h"
 #include "gps_almanac.h"
 #include "gps_utc_model.h"
+#include <boost/statechart/state_machine.hpp>
 
 namespace sc = boost::statechart;
 namespace mpl = boost::mpl;
diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
index 1fbcb558b..f7509b1dd 100644
--- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
+++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
@@ -30,7 +30,6 @@
  */
 
 #include "viterbi_decoder.h"
-#include <iostream>
 #include <glog/logging.h>
 
 // logging
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index 5f4248f96..838bd75a8 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -35,10 +35,10 @@
  */
 
 #include "galileo_e1_dll_pll_veml_tracking.h"
-#include <glog/logging.h>
-#include "Galileo_E1.h"
 #include "configuration_interface.h"
+#include "Galileo_E1.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
index 4b478f666..22c94322f 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
@@ -37,10 +37,9 @@
 #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
 #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
 
-
-#include <string>
 #include "tracking_interface.h"
 #include "galileo_e1_dll_pll_veml_tracking_cc.h"
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index 6ede1ca91..bdafc43a1 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -37,11 +37,10 @@
  */
 
 #include "galileo_e5a_dll_pll_tracking.h"
-#include <glog/logging.h>
-#include "Galileo_E5a.h"
 #include "configuration_interface.h"
+#include "Galileo_E5a.h"
 #include "gnss_sdr_flags.h"
-
+#include <glog/logging.h>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
index a49aab785..bedab2a21 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
@@ -39,10 +39,9 @@
 #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "galileo_e5a_dll_pll_tracking_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
index 5c76267ce..0d5a00433 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
@@ -38,10 +38,10 @@
  */
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking.h"
-#include <glog/logging.h>
-#include "GLONASS_L1_CA.h"
 #include "configuration_interface.h"
+#include "GLONASS_L1_CA.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
index b62729a5f..3d6f390e0 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
@@ -40,11 +40,10 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
index 6f824144d..7e2047862 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
@@ -37,10 +37,10 @@
  */
 
 #include "glonass_l1_ca_dll_pll_tracking.h"
-#include <glog/logging.h>
-#include "GLONASS_L1_CA.h"
 #include "configuration_interface.h"
+#include "GLONASS_L1_CA.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h
index ba476948a..2268cfaae 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.h
@@ -39,10 +39,9 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
index ae01c924e..38144e43c 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
@@ -37,10 +37,10 @@
 
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking.h"
-#include <glog/logging.h>
 #include "GPS_L1_CA.h"
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
index d3b01a87c..ac3a1e745 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
@@ -38,10 +38,10 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
+#include <string>
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
index 3c810ed3d..a9d4d2f3f 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
@@ -37,11 +37,10 @@
 
 
 #include "gps_l1_ca_dll_pll_tracking.h"
-#include <glog/logging.h>
-#include "GPS_L1_CA.h"
 #include "configuration_interface.h"
+#include "GPS_L1_CA.h"
 #include "gnss_sdr_flags.h"
-
+#include <glog/logging.h>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
index 495594a1f..c3be7a8d4 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
@@ -38,10 +38,9 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "gps_l1_ca_dll_pll_tracking_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
index c3e84030a..70f6f9410 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
@@ -36,10 +36,10 @@
 
 
 #include "gps_l2_m_dll_pll_tracking.h"
-#include <glog/logging.h>
-#include "GPS_L2C.h"
 #include "configuration_interface.h"
+#include "GPS_L2C.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
index 80b214811..b065185ee 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
@@ -38,10 +38,9 @@
 #ifndef GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
 #define GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "gps_l2_m_dll_pll_tracking_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc
index 0869c39b7..bf379716d 100644
--- a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.cc
@@ -36,10 +36,10 @@
 
 
 #include "gps_l5i_dll_pll_tracking.h"
-#include <glog/logging.h>
-#include "GPS_L5.h"
 #include "configuration_interface.h"
+#include "GPS_L5.h"
 #include "gnss_sdr_flags.h"
+#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h
index 681ddca42..b3be3cdbc 100644
--- a/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l5i_dll_pll_tracking.h
@@ -37,10 +37,9 @@
 #ifndef GNSS_SDR_gps_l5i_dll_pll_tracking_H_
 #define GNSS_SDR_gps_l5i_dll_pll_tracking_H_
 
-#include <string>
 #include "tracking_interface.h"
 #include "gps_l5i_dll_pll_tracking_cc.h"
-
+#include <string>
 
 class ConfigurationInterface;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
index c39938588..925ac457d 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
@@ -35,21 +35,21 @@
  */
 
 #include "galileo_e1_dll_pll_veml_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "galileo_e1_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "Galileo_E1.h"
 #include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
index f02c51b8e..66be54e89 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
@@ -32,14 +32,15 @@
 #ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H
 #define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_CC_H
 
-#include <fstream>
-#include <string>
-#include <map>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator_real_codes.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <string>
+#include <map>
+
 
 class galileo_e1_dll_pll_veml_tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
index 8504824f9..c91d59a68 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
@@ -35,14 +35,6 @@
  */
 
 #include "galileo_e5a_dll_pll_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "galileo_e5_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
@@ -50,6 +42,14 @@
 #include "Galileo_E1.h"
 #include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+#include <iostream>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
index 0894b79ef..2e1fcfed8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
@@ -37,14 +37,14 @@
 #ifndef GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_
 #define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_CC_H_
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class Galileo_E5a_Dll_Pll_Tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 4067f5cb6..8b8a707ea 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -37,10 +37,12 @@
  */
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
+#include "glonass_l1_signal_processing.h"
+#include "tracking_discriminators.h"
+#include "lock_detectors.h"
+#include "GLONASS_L1_CA.h"
+#include "gnss_sdr_flags.h"
+#include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
 #include <gnuradio/io_signature.h>
@@ -48,12 +50,10 @@
 #include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
-#include "glonass_l1_signal_processing.h"
-#include "tracking_discriminators.h"
-#include "lock_detectors.h"
-#include "GLONASS_L1_CA.h"
-#include "gnss_sdr_flags.h"
-#include "control_message_factory.h"
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index d928beb29..50b936eff 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -39,17 +39,17 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <deque>
-#include <string>
-#include <gnuradio/block.h>
-#include <pmt/pmt.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
 //#include "tracking_loop_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <pmt/pmt.h>
+#include <fstream>
+#include <map>
+#include <deque>
+#include <string>
 
 class glonass_l1_ca_dll_pll_c_aid_tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index b379b0630..6d0534737 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -37,17 +37,6 @@
  */
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <matio.h>
-#include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <glog/logging.h>
 #include "gnss_synchro.h"
 #include "glonass_l1_signal_processing.h"
 #include "tracking_discriminators.h"
@@ -55,6 +44,17 @@
 #include "GLONASS_L1_CA.h"
 #include "gnss_sdr_flags.h"
 #include "control_message_factory.h"
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <matio.h>
+#include <pmt/pmt.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <glog/logging.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
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 e9424f9c7..8bc0a1c5e 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
@@ -39,18 +39,18 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <gnuradio/block.h>
-#include <volk/volk.h>
 #include "glonass_l1_signal_processing.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
 #include "cpu_multicorrelator_16sc.h"
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <gnuradio/block.h>
+#include <volk/volk.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class glonass_l1_ca_dll_pll_c_aid_tracking_sc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 13d16ee46..0989d3e5c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -37,21 +37,21 @@
  */
 
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "glonass_l1_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "GLONASS_L1_CA.h"
 #include "gnss_sdr_flags.h"
 #include "control_message_factory.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index 641c6f04e..eeec2309c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -39,14 +39,14 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_CC_H
 #define GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class Glonass_L1_Ca_Dll_Pll_Tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 97176b088..b895ee48f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -29,10 +29,12 @@
  */
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
+#include "gps_sdr_signal_processing.h"
+#include "tracking_discriminators.h"
+#include "lock_detectors.h"
+#include "gnss_sdr_flags.h"
+#include "GPS_L1_CA.h"
+#include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
 #include <gnuradio/io_signature.h>
@@ -40,12 +42,10 @@
 #include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
-#include "gps_sdr_signal_processing.h"
-#include "tracking_discriminators.h"
-#include "lock_detectors.h"
-#include "gnss_sdr_flags.h"
-#include "GPS_L1_CA.h"
-#include "control_message_factory.h"
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index cf6f31b5f..5be897069 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -37,17 +37,17 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <deque>
-#include <string>
-#include <gnuradio/block.h>
-#include <pmt/pmt.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
 //#include "tracking_loop_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <pmt/pmt.h>
+#include <fstream>
+#include <map>
+#include <deque>
+#include <string>
 
 class gps_l1_ca_dll_pll_c_aid_tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc
index 1391d1c44..a8e0d0428 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc
@@ -30,17 +30,6 @@
  */
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <matio.h>
-#include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <glog/logging.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"
@@ -48,6 +37,17 @@
 #include "GPS_L1_CA.h"
 #include "gnss_sdr_flags.h"
 #include "control_message_factory.h"
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <matio.h>
+#include <pmt/pmt.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <glog/logging.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h
index 9dded8939..d1a3db6d5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h
@@ -38,18 +38,18 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_FPGA_SC_H
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_FPGA_SC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <gnuradio/block.h>
-#include <volk/volk.h>
 #include "gps_sdr_signal_processing.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
 #include "fpga_multicorrelator_8sc.h"
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <gnuradio/block.h>
+#include <volk/volk.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
index cd2890bab..e2d57bbf6 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -29,17 +29,6 @@
  */
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <glog/logging.h>
-#include <matio.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"
@@ -47,6 +36,17 @@
 #include "GPS_L1_CA.h"
 #include "gnss_sdr_flags.h"
 #include "control_message_factory.h"
+#include <boost/bind.hpp>
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <pmt/pmt.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
index cd9753b6d..6a8a9bdf4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -37,18 +37,18 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <gnuradio/block.h>
-#include <volk/volk.h>
 #include "gps_sdr_signal_processing.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_FLL_PLL_filter.h"
 #include "cpu_multicorrelator_16sc.h"
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <gnuradio/block.h>
+#include <volk/volk.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class gps_l1_ca_dll_pll_c_aid_tracking_sc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
index 979d378d6..cfd4c69bd 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
@@ -35,21 +35,21 @@
  */
 
 #include "gps_l1_ca_dll_pll_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
-#include <matio.h>
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "gnss_sdr_flags.h"
 #include "GPS_L1_CA.h"
 #include "control_message_factory.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <matio.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
index 346f7076a..8eca5317f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.h
@@ -38,14 +38,14 @@
 #ifndef GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H
 #define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator_real_codes.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class Gps_L1_Ca_Dll_Pll_Tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
index 30834c337..bf1f1513b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
@@ -35,21 +35,21 @@
  */
 
 #include "gps_l2_m_dll_pll_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "gps_l2c_signal.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "GPS_L2C.h"
 #include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
 
 using google::LogMessage;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
index cf46636e2..3edd12ab4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
@@ -36,14 +36,14 @@
 #ifndef GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_CC_H
 #define GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class gps_l2_m_dll_pll_tracking_cc;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc
index 6010c0d3f..f0b56afa6 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.cc
@@ -35,21 +35,22 @@
  */
 
 #include "gps_l5i_dll_pll_tracking_cc.h"
-#include <cmath>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <gnuradio/io_signature.h>
-#include <glog/logging.h>
-#include <matio.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "gps_l5_signal.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "GPS_L5.h"
 #include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
+#include <boost/lexical_cast.hpp>
+#include <gnuradio/io_signature.h>
+#include <glog/logging.h>
+#include <matio.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+#include <iostream>
+#include <memory>
+#include <sstream>
+
 
 using google::LogMessage;
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h
index 39da5fd1b..388d04c57 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l5i_dll_pll_tracking_cc.h
@@ -36,14 +36,14 @@
 #ifndef GNSS_SDR_GPS_L5i_DLL_PLL_TRACKING_CC_H
 #define GNSS_SDR_GPS_L5i_DLL_PLL_TRACKING_CC_H
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <gnuradio/block.h>
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "cpu_multicorrelator.h"
+#include <gnuradio/block.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 class gps_l5i_dll_pll_tracking_cc;
 
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
index 3a76c8440..279dab5aa 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
@@ -33,9 +33,8 @@
  */
 
 #include "cpu_multicorrelator.h"
-#include <cmath>
-#include <iostream>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
 
 
 cpu_multicorrelator::cpu_multicorrelator()
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
index cc0df391c..42fa8f226 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
@@ -34,9 +34,9 @@
  */
 
 #include "cpu_multicorrelator_real_codes.h"
-#include <cmath>
-#include <iostream>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <cmath>
+
 
 
 cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes()
diff --git a/src/core/interfaces/gnss_block_interface.h b/src/core/interfaces/gnss_block_interface.h
index dd7f1558e..35a5427cc 100644
--- a/src/core/interfaces/gnss_block_interface.h
+++ b/src/core/interfaces/gnss_block_interface.h
@@ -37,9 +37,10 @@
 #ifndef GNSS_SDR_GNSS_BLOCK_INTERFACE_H_
 #define GNSS_SDR_GNSS_BLOCK_INTERFACE_H_
 
+#include <gnuradio/top_block.h>
 #include <cassert>
 #include <string>
-#include <gnuradio/top_block.h>
+
 
 /*!
  * \brief This abstract class represents an interface to GNSS blocks.
diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc
index e5c7e6645..001a249ed 100644
--- a/src/core/libs/INIReader.cc
+++ b/src/core/libs/INIReader.cc
@@ -46,9 +46,9 @@
  */
 
 #include "INIReader.h"
+#include "ini.h"
 #include <cctype> // for tolower
 #include <cstdlib> // for strol
-#include "ini.h"
 
 
 INIReader::INIReader(std::string filename)
diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h
index ddb484e8d..e81b08787 100644
--- a/src/core/libs/gnss_sdr_supl_client.h
+++ b/src/core/libs/gnss_sdr_supl_client.h
@@ -34,13 +34,6 @@
 #ifndef GNSS_SDR_SUPL_CLIENT_H_
 #define GNSS_SDR_SUPL_CLIENT_H_
 
-#include <fstream>
-#include <map>
-#include <string>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#include <boost/serialization/map.hpp>
-#include <glog/logging.h>
 extern "C" {
 #include "supl.h"
 }
@@ -52,6 +45,13 @@ extern "C" {
 #include "gps_acq_assist.h"
 #include "gps_ref_time.h"
 #include "gps_ref_location.h"
+#include <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/xml_iarchive.hpp>
+#include <boost/serialization/map.hpp>
+#include <glog/logging.h>
+#include <fstream>
+#include <map>
+#include <string>
 
 /*!
  * \brief class that implements a C++ interface to external Secure User Location Protocol (SUPL) client library..
diff --git a/src/core/libs/string_converter.cc b/src/core/libs/string_converter.cc
index a43f73e63..1b6e38489 100644
--- a/src/core/libs/string_converter.cc
+++ b/src/core/libs/string_converter.cc
@@ -32,7 +32,7 @@
 
 #include "string_converter.h"
 #include <sstream>
-#include <iostream>
+
 
 StringConverter::StringConverter()
 {}
diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h
index fff578c1e..27ead329d 100644
--- a/src/core/receiver/concurrent_map.h
+++ b/src/core/receiver/concurrent_map.h
@@ -31,9 +31,10 @@
 #ifndef GNSS_SDR_CONCURRENT_MAP_H
 #define GNSS_SDR_CONCURRENT_MAP_H
 
+#include <boost/thread/mutex.hpp>
 #include <map>
 #include <utility>
-#include <boost/thread/mutex.hpp>
+
 
 template<typename Data>
 
diff --git a/src/core/receiver/concurrent_queue.h b/src/core/receiver/concurrent_queue.h
index 8c700e220..d279c5ad0 100644
--- a/src/core/receiver/concurrent_queue.h
+++ b/src/core/receiver/concurrent_queue.h
@@ -31,8 +31,8 @@
 #ifndef GNSS_SDR_CONCURRENT_QUEUE_H
 #define GNSS_SDR_CONCURRENT_QUEUE_H
 
-#include <queue>
 #include <boost/thread.hpp>
+#include <queue>
 
 template<typename Data>
 
diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h
index 9bdd49d32..a7bba38d2 100644
--- a/src/core/receiver/control_message_factory.h
+++ b/src/core/receiver/control_message_factory.h
@@ -31,9 +31,9 @@
 #ifndef GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_
 #define GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_
 
+#include <gnuradio/message.h>
 #include <memory>
 #include <vector>
-#include <gnuradio/message.h>
 
 //! Message described by who sent it and what it says
 typedef struct ControlMessage_
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 72b91e956..073807b43 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -33,33 +33,33 @@
  */
 
 #include "control_thread.h"
+#include "concurrent_queue.h"
+#include "concurrent_map.h"
+#include "control_message_factory.h"
+#include "file_configuration.h"
+#include "gnss_flowgraph.h"
+#include "gnss_sdr_flags.h"
+#include "galileo_ephemeris.h"
+#include "galileo_iono.h"
+#include "galileo_utc_model.h"
+#include "galileo_almanac.h"
+#include "gps_ephemeris.h"
+#include "gps_iono.h"
+#include "gps_utc_model.h"
+#include "gps_almanac.h"
+#include <boost/lexical_cast.hpp>
+#include <boost/chrono.hpp>
+#include <glog/logging.h>
+#include <gnuradio/message.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
 #include <cmath>
 #include <iostream>
 #include <limits>
 #include <map>
 #include <string>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <boost/lexical_cast.hpp>
-#include <boost/chrono.hpp>
-#include <gnuradio/message.h>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include "gps_ephemeris.h"
-#include "gps_iono.h"
-#include "gps_utc_model.h"
-#include "gps_almanac.h"
-#include "galileo_ephemeris.h"
-#include "galileo_iono.h"
-#include "galileo_utc_model.h"
-#include "galileo_almanac.h"
-#include "concurrent_queue.h"
-#include "concurrent_map.h"
-#include "gnss_flowgraph.h"
-#include "gnss_sdr_flags.h"
-#include "file_configuration.h"
-#include "control_message_factory.h"
+
 
 extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
 extern concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index ea0decec8..f84b2f24d 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -35,12 +35,12 @@
 #ifndef GNSS_SDR_CONTROL_THREAD_H_
 #define GNSS_SDR_CONTROL_THREAD_H_
 
-#include <memory>
-#include <vector>
-#include <boost/thread.hpp>
-#include <gnuradio/msg_queue.h>
 #include "control_message_factory.h"
 #include "gnss_sdr_supl_client.h"
+#include <boost/thread.hpp>
+#include <gnuradio/msg_queue.h>
+#include <memory>
+#include <vector>
 
 class GNSSFlowgraph;
 class ConfigurationInterface;
diff --git a/src/core/receiver/file_configuration.cc b/src/core/receiver/file_configuration.cc
index 4285d04f1..1e52e819f 100644
--- a/src/core/receiver/file_configuration.cc
+++ b/src/core/receiver/file_configuration.cc
@@ -34,11 +34,12 @@
  */
 
 #include "file_configuration.h"
-#include <string>
-#include <glog/logging.h>
+#include "in_memory_configuration.h"
 #include "INIReader.h"
 #include "string_converter.h"
-#include "in_memory_configuration.h"
+#include <glog/logging.h>
+#include <string>
+
 
 using google::LogMessage;
 
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 02aeffeb0..1ebab2595 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -35,11 +35,6 @@
 
 
 #include "gnss_block_factory.h"
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "in_memory_configuration.h"
 #include "gnss_block_interface.h"
@@ -145,6 +140,12 @@
 #include "gps_l1_ca_dll_pll_tracking_gpu.h"
 #endif
 
+#include <boost/lexical_cast.hpp>
+#include <glog/logging.h>
+#include <string>
+#include <sstream>
+#include <iostream>
+
 
 using google::LogMessage;
 
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index 4aa852d74..be57433d1 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -37,10 +37,11 @@
 #ifndef GNSS_SDR_BLOCK_FACTORY_H_
 #define GNSS_SDR_BLOCK_FACTORY_H_
 
+#include <gnuradio/msg_queue.h>
 #include <memory>
 #include <string>
 #include <vector>
-#include <gnuradio/msg_queue.h>
+
 
 class ConfigurationInterface;
 class GNSSBlockInterface;
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 1b4438cea..a82ab54c1 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -33,17 +33,17 @@
  */
 
 #include "gnss_flowgraph.h"
-#include <algorithm>
-#include <exception>
-#include <iostream>
-#include <set>
-#include <boost/lexical_cast.hpp>
-#include <boost/tokenizer.hpp>
-#include <glog/logging.h>
 #include "configuration_interface.h"
 #include "gnss_block_interface.h"
 #include "channel_interface.h"
 #include "gnss_block_factory.h"
+#include <boost/lexical_cast.hpp>
+#include <boost/tokenizer.hpp>
+#include <glog/logging.h>
+#include <algorithm>
+#include <exception>
+#include <iostream>
+#include <set>
 
 
 #define GNSS_SDR_ARRAY_SIGNAL_CONDITIONER_CHANNELS 8
diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h
index abb4a6ef5..e3986fd6c 100644
--- a/src/core/receiver/gnss_flowgraph.h
+++ b/src/core/receiver/gnss_flowgraph.h
@@ -36,16 +36,17 @@
 #ifndef GNSS_SDR_GNSS_FLOWGRAPH_H_
 #define GNSS_SDR_GNSS_FLOWGRAPH_H_
 
+#include "GPS_L1_CA.h"
+#include "gnss_signal.h"
+#include "gnss_sdr_sample_counter.h"
+#include <gnuradio/top_block.h>
+#include <gnuradio/msg_queue.h>
 #include <list>
 #include <memory>
 #include <queue>
 #include <string>
 #include <vector>
-#include <gnuradio/top_block.h>
-#include <gnuradio/msg_queue.h>
-#include "GPS_L1_CA.h"
-#include "gnss_signal.h"
-#include "gnss_sdr_sample_counter.h"
+
 
 class GNSSBlockInterface;
 class ChannelInterface;
diff --git a/src/core/receiver/in_memory_configuration.cc b/src/core/receiver/in_memory_configuration.cc
index e1983e617..377d30174 100644
--- a/src/core/receiver/in_memory_configuration.cc
+++ b/src/core/receiver/in_memory_configuration.cc
@@ -31,9 +31,10 @@
 
 
 #include "in_memory_configuration.h"
+#include "string_converter.h"
 #include <memory>
 #include <utility>
-#include "string_converter.h"
+
 
 InMemoryConfiguration::InMemoryConfiguration()
 {
diff --git a/src/core/receiver/in_memory_configuration.h b/src/core/receiver/in_memory_configuration.h
index 22ff97ffe..de6e1913a 100644
--- a/src/core/receiver/in_memory_configuration.h
+++ b/src/core/receiver/in_memory_configuration.h
@@ -36,10 +36,11 @@
 #ifndef GNSS_SDR_IN_MEMORY_CONFIGURATION_H_
 #define GNSS_SDR_IN_MEMORY_CONFIGURATION_H_
 
+#include "configuration_interface.h"
 #include <map>
 #include <memory>
 #include <string>
-#include "configuration_interface.h"
+
 
 class StringConverter;
 
diff --git a/src/core/system_parameters/GLONASS_L1_CA.h b/src/core/system_parameters/GLONASS_L1_CA.h
index af0bd0227..e2558e114 100644
--- a/src/core/system_parameters/GLONASS_L1_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_CA.h
@@ -32,11 +32,12 @@
 #ifndef GNSS_SDR_GLONASS_L1_CA_H_
 #define GNSS_SDR_GLONASS_L1_CA_H_
 
+#include "gnss_frequencies.h"
+#include "MATH_CONSTANTS.h"
 #include <map>
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
+
 
 // Physical constants
 const double GLONASS_C_m_s                  = SPEED_OF_LIGHT;       //!< The speed of light, [m/s]
diff --git a/src/core/system_parameters/GPS_CNAV.h b/src/core/system_parameters/GPS_CNAV.h
index d3f953f2b..fc2239ab6 100644
--- a/src/core/system_parameters/GPS_CNAV.h
+++ b/src/core/system_parameters/GPS_CNAV.h
@@ -32,10 +32,11 @@
 #ifndef GNSS_SDR_GPS_CNAV_H_
 #define GNSS_SDR_GPS_CNAV_H_
 
+#include "MATH_CONSTANTS.h"
 #include <cstdint>
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
+
 
 // CNAV GPS NAVIGATION MESSAGE STRUCTURE
 // NAVIGATION MESSAGE FIELDS POSITIONS (from IS-GPS-200E Appendix III)
diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h
index 319d918e1..ea1c1f9eb 100644
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@@ -32,10 +32,11 @@
 #ifndef GNSS_SDR_GPS_L1_CA_H_
 #define GNSS_SDR_GPS_L1_CA_H_
 
+#include "gnss_frequencies.h"
+#include "MATH_CONSTANTS.h"
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
+
 
 // Physical constants
 const double GPS_C_m_s       = SPEED_OF_LIGHT;   //!< The speed of light, [m/s]
diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h
index 3e269ecf5..625aafe01 100644
--- a/src/core/system_parameters/GPS_L2C.h
+++ b/src/core/system_parameters/GPS_L2C.h
@@ -32,15 +32,13 @@
 #ifndef GNSS_SDR_GPS_L2C_H_
 #define GNSS_SDR_GPS_L2C_H_
 
+
+#include "gnss_frequencies.h"
+#include "GPS_CNAV.h"
+#include "MATH_CONSTANTS.h"
 #include <cstdint>
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
-#include "GPS_CNAV.h"
-
-
-
 
 
 // Physical constants
diff --git a/src/core/system_parameters/GPS_L5.h b/src/core/system_parameters/GPS_L5.h
index 702e3ebd6..9c3236124 100644
--- a/src/core/system_parameters/GPS_L5.h
+++ b/src/core/system_parameters/GPS_L5.h
@@ -32,10 +32,10 @@
 #ifndef GNSS_SDR_GPS_L5_H_
 #define GNSS_SDR_GPS_L5_H_
 
-#include <cstdint>
-#include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 #include "GPS_CNAV.h"
+#include "MATH_CONSTANTS.h"
+#include <cstdint>
 
 
 // Physical constants
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 24794a244..33ace50ae 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -33,11 +33,11 @@
 #ifndef GNSS_SDR_GALILEO_E1_H_
 #define GNSS_SDR_GALILEO_E1_H_
 
+#include "gnss_frequencies.h"
+#include "MATH_CONSTANTS.h"
 #include <string>
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
 
 
 // Physical constants
@@ -65,7 +65,7 @@ const double GALILEO_STARTOFFSET_ms = 68.802; //[ms] Initial sign. travel time (
 
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
-const int GALILEO_E1_HISTORY_DEEP=100;
+const int GALILEO_E1_HISTORY_DEEP = 100;
 
 // Galileo INAV Telemetry structure
 
diff --git a/src/core/system_parameters/Galileo_E5a.h b/src/core/system_parameters/Galileo_E5a.h
index 2a2f5a816..cedd414fb 100644
--- a/src/core/system_parameters/Galileo_E5a.h
+++ b/src/core/system_parameters/Galileo_E5a.h
@@ -31,11 +31,11 @@
 #ifndef GNSS_SDR_GALILEO_E5A_H_
 #define GNSS_SDR_GALILEO_E5A_H_
 
+#include "gnss_frequencies.h"
+#include "MATH_CONSTANTS.h"
 #include <string>
 #include <vector>
 #include <utility> // std::pair
-#include "MATH_CONSTANTS.h"
-#include "gnss_frequencies.h"
 
 
 // Carrier and code frequencies
diff --git a/src/core/system_parameters/galileo_ephemeris.cc b/src/core/system_parameters/galileo_ephemeris.cc
index d118bd392..9403e7968 100644
--- a/src/core/system_parameters/galileo_ephemeris.cc
+++ b/src/core/system_parameters/galileo_ephemeris.cc
@@ -29,8 +29,8 @@
  */
 
 #include "galileo_ephemeris.h"
-#include <cmath>
 #include "Galileo_E1.h"
+#include <cmath>
 
 
 Galileo_Ephemeris::Galileo_Ephemeris()
diff --git a/src/core/system_parameters/galileo_fnav_message.h b/src/core/system_parameters/galileo_fnav_message.h
index 3f3ba1048..2684782c4 100644
--- a/src/core/system_parameters/galileo_fnav_message.h
+++ b/src/core/system_parameters/galileo_fnav_message.h
@@ -38,16 +38,16 @@
 #define GNSS_SDR_GALILEO_FNAV_MESSAGE_H_
 
 
-#include <bitset>
-#include <string>
-#include <vector>
-#include <utility>
-#include <boost/cstdint.hpp>  // for boost::uint16_t
 #include "galileo_ephemeris.h"
 #include "galileo_iono.h"
 #include "galileo_almanac.h"
 #include "galileo_utc_model.h"
 #include "Galileo_E5a.h"
+#include <boost/cstdint.hpp>  // for boost::uint16_t
+#include <bitset>
+#include <string>
+#include <vector>
+#include <utility>
 
 /*!
  * \brief This class handles the Galileo F/NAV Data message, as described in the
diff --git a/src/core/system_parameters/galileo_navigation_message.h b/src/core/system_parameters/galileo_navigation_message.h
index e83b67cf3..d78a37d31 100644
--- a/src/core/system_parameters/galileo_navigation_message.h
+++ b/src/core/system_parameters/galileo_navigation_message.h
@@ -33,17 +33,18 @@
 #ifndef GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_
 #define GNSS_SDR_GALILEO_NAVIGATION_MESSAGE_H_
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-#include <boost/cstdint.hpp>  // for boost::uint32_t
 #include "galileo_ephemeris.h"
 #include "galileo_iono.h"
 #include "galileo_almanac.h"
 #include "galileo_utc_model.h"
 #include "Galileo_E1.h"
+#include <boost/cstdint.hpp>  // for boost::uint32_t
+#include <bitset>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 
 /*!
  * \brief This class handles the Galileo I/NAV Data message, as described in the
diff --git a/src/core/system_parameters/glonass_gnav_ephemeris.cc b/src/core/system_parameters/glonass_gnav_ephemeris.cc
index e899db773..8986cf52e 100644
--- a/src/core/system_parameters/glonass_gnav_ephemeris.cc
+++ b/src/core/system_parameters/glonass_gnav_ephemeris.cc
@@ -31,9 +31,9 @@
  */
 
 #include "glonass_gnav_ephemeris.h"
-#include <cmath>
 #include "GLONASS_L1_CA.h"
 #include "gnss_satellite.h"
+#include <cmath>
 
 Glonass_Gnav_Ephemeris::Glonass_Gnav_Ephemeris()
 {
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc
index 40301ea09..ef58d7f3a 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.cc
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc
@@ -31,7 +31,7 @@
  */
 
 #include "glonass_gnav_navigation_message.h"
-#include <gnss_satellite.h>
+#include "gnss_satellite.h"
 #include <glog/logging.h>
 
 
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.h b/src/core/system_parameters/glonass_gnav_navigation_message.h
index 6aef9ad51..dda433983 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.h
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.h
@@ -35,12 +35,11 @@
 #define GNSS_SDR_GLONASS_GNAV_NAVIGATION_MESSAGE_H_
 
 
-#include <bitset>
 #include "GLONASS_L1_CA.h"
 #include "glonass_gnav_ephemeris.h"
 #include "glonass_gnav_almanac.h"
 #include "glonass_gnav_utc_model.h"
-
+#include <bitset>
 
 
 /*!
diff --git a/src/core/system_parameters/glonass_gnav_utc_model.h b/src/core/system_parameters/glonass_gnav_utc_model.h
index 7d981d44c..9712299a9 100644
--- a/src/core/system_parameters/glonass_gnav_utc_model.h
+++ b/src/core/system_parameters/glonass_gnav_utc_model.h
@@ -34,7 +34,7 @@
 #ifndef GNSS_SDR_GLONASS_GNAV_UTC_MODEL_H_
 #define GNSS_SDR_GLONASS_GNAV_UTC_MODEL_H_
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 /*!
diff --git a/src/core/system_parameters/gps_cnav_ephemeris.h b/src/core/system_parameters/gps_cnav_ephemeris.h
index b8f304951..a5678d7cd 100644
--- a/src/core/system_parameters/gps_cnav_ephemeris.h
+++ b/src/core/system_parameters/gps_cnav_ephemeris.h
@@ -33,7 +33,7 @@
 #define GNSS_SDR_GPS_CNAV_EPHEMERIS_H_
 
 #include "GPS_CNAV.h"
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_cnav_iono.h b/src/core/system_parameters/gps_cnav_iono.h
index 426f199cb..6f7332c0b 100644
--- a/src/core/system_parameters/gps_cnav_iono.h
+++ b/src/core/system_parameters/gps_cnav_iono.h
@@ -33,7 +33,7 @@
 #define GNSS_SDR_GPS_CNAV_IONO_H_
 
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_cnav_navigation_message.cc b/src/core/system_parameters/gps_cnav_navigation_message.cc
index a78ade0c7..1bdc48360 100644
--- a/src/core/system_parameters/gps_cnav_navigation_message.cc
+++ b/src/core/system_parameters/gps_cnav_navigation_message.cc
@@ -31,7 +31,6 @@
  */
 
 #include "gps_cnav_navigation_message.h"
-#include <iostream>
 #include "gnss_satellite.h"
 
 
diff --git a/src/core/system_parameters/gps_cnav_navigation_message.h b/src/core/system_parameters/gps_cnav_navigation_message.h
index 3fd1fa913..8439f61a2 100644
--- a/src/core/system_parameters/gps_cnav_navigation_message.h
+++ b/src/core/system_parameters/gps_cnav_navigation_message.h
@@ -33,15 +33,16 @@
 #define GNSS_SDR_GPS_CNAV_NAVIGATION_MESSAGE_H_
 
 
+#include "GPS_CNAV.h"
+#include "gps_cnav_ephemeris.h"
+#include "gps_cnav_iono.h"
+#include "gps_cnav_utc_model.h"
 #include <bitset>
 #include <map>
 #include <string>
 #include <vector>
 #include <utility>
-#include "GPS_CNAV.h"
-#include "gps_cnav_ephemeris.h"
-#include "gps_cnav_iono.h"
-#include "gps_cnav_utc_model.h"
+
 //TODO: Create GPS CNAV almanac
 //#include "gps_almanac.h"
 
diff --git a/src/core/system_parameters/gps_cnav_utc_model.h b/src/core/system_parameters/gps_cnav_utc_model.h
index 9705945a2..62e6fd0c0 100644
--- a/src/core/system_parameters/gps_cnav_utc_model.h
+++ b/src/core/system_parameters/gps_cnav_utc_model.h
@@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_CNAV_UTC_MODEL_H_
 #define GNSS_SDR_GPS_CNAV_UTC_MODEL_H_
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc
index ac09ef955..d876f477e 100644
--- a/src/core/system_parameters/gps_ephemeris.cc
+++ b/src/core/system_parameters/gps_ephemeris.cc
@@ -31,9 +31,9 @@
  */
 
 #include "gps_ephemeris.h"
-#include <cmath>
-#include "GPS_L1_CA.h"
 #include "gnss_satellite.h"
+#include "GPS_L1_CA.h"
+#include <cmath>
 
 Gps_Ephemeris::Gps_Ephemeris()
 {
diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h
index a08f34400..eec5779ce 100644
--- a/src/core/system_parameters/gps_ephemeris.h
+++ b/src/core/system_parameters/gps_ephemeris.h
@@ -33,12 +33,11 @@
 #define GNSS_SDR_GPS_EPHEMERIS_H_
 
 
-#include <map>
-#include <string>
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-
+#include <map>
+#include <string>
 
 
 /*!
diff --git a/src/core/system_parameters/gps_iono.h b/src/core/system_parameters/gps_iono.h
index a7e59c02b..d13120617 100644
--- a/src/core/system_parameters/gps_iono.h
+++ b/src/core/system_parameters/gps_iono.h
@@ -33,7 +33,7 @@
 #define GNSS_SDR_GPS_IONO_H_
 
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc
index 7a13109c1..27a4e26c7 100644
--- a/src/core/system_parameters/gps_navigation_message.cc
+++ b/src/core/system_parameters/gps_navigation_message.cc
@@ -31,9 +31,9 @@ m * \file gps_navigation_message.cc
  */
 
 #include "gps_navigation_message.h"
+#include "gnss_satellite.h"
 #include <cmath>
 #include <iostream>
-#include <gnss_satellite.h>
 
 
 void Gps_Navigation_Message::reset()
diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h
index 53482c905..3f9e2866f 100644
--- a/src/core/system_parameters/gps_navigation_message.h
+++ b/src/core/system_parameters/gps_navigation_message.h
@@ -33,17 +33,16 @@
 #define GNSS_SDR_GPS_NAVIGATION_MESSAGE_H_
 
 
-#include <bitset>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
 #include "GPS_L1_CA.h"
 #include "gps_ephemeris.h"
 #include "gps_iono.h"
 #include "gps_almanac.h"
 #include "gps_utc_model.h"
-
+#include <bitset>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 
 /*!
diff --git a/src/core/system_parameters/gps_ref_location.h b/src/core/system_parameters/gps_ref_location.h
index 1aa734088..9491ccbf9 100644
--- a/src/core/system_parameters/gps_ref_location.h
+++ b/src/core/system_parameters/gps_ref_location.h
@@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_REF_LOCATION_H_
 #define GNSS_SDR_GPS_REF_LOCATION_H_
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_ref_time.h b/src/core/system_parameters/gps_ref_time.h
index fbb246ad3..b65a18edd 100644
--- a/src/core/system_parameters/gps_ref_time.h
+++ b/src/core/system_parameters/gps_ref_time.h
@@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_REF_TIME_H_
 #define GNSS_SDR_GPS_REF_TIME_H_
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/gps_utc_model.cc b/src/core/system_parameters/gps_utc_model.cc
index 59a385c1a..f52428bf4 100644
--- a/src/core/system_parameters/gps_utc_model.cc
+++ b/src/core/system_parameters/gps_utc_model.cc
@@ -29,9 +29,9 @@
  */
 
 #include "gps_utc_model.h"
-#include <iostream>
 #include <cmath>
 
+
 Gps_Utc_Model::Gps_Utc_Model()
 {
     valid = false;
@@ -51,11 +51,6 @@ double Gps_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week)
     double t_utc_daytime;
     double Delta_t_UTC =  d_DeltaT_LS + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T));
 
-    //std::cout<<"d_DeltaT_LS="<<d_DeltaT_LS
-    //        <<"d_A0="<<d_A0
-    //        <<"d_A1="<<d_A1
-    //        <<"d_t_OT="<<d_t_OT
-    //        <<"i_WN_T="<<i_WN_T<<std::endl;
     // Determine if the effectivity time of the leap second event is in the past
     int  weeksToLeapSecondEvent = i_WN_LSF - i_GPS_week;
 
@@ -104,7 +99,7 @@ double Gps_Utc_Model::utc_time(double gpstime_corrected, int i_GPS_week)
             /* 20.3.3.5.2.4c
              * Whenever the effectivity time of the leap second event, as indicated by the
              * WNLSF and DN values, is in the "past" (relative to the user's current time),
-             * and the user�s current time does not fall in the time span as given above
+             * and the user's current time does not fall in the time span as given above
              * in 20.3.3.5.2.4b,*/
             Delta_t_UTC = d_DeltaT_LSF + d_A0 + d_A1 * (gpstime_corrected - d_t_OT + 604800 * static_cast<double>(i_GPS_week - i_WN_T));
             t_utc_daytime = fmod(gpstime_corrected - Delta_t_UTC, 86400);
diff --git a/src/core/system_parameters/gps_utc_model.h b/src/core/system_parameters/gps_utc_model.h
index 0d1c48285..1a8938828 100644
--- a/src/core/system_parameters/gps_utc_model.h
+++ b/src/core/system_parameters/gps_utc_model.h
@@ -32,7 +32,7 @@
 #ifndef GNSS_SDR_GPS_UTC_MODEL_H_
 #define GNSS_SDR_GPS_UTC_MODEL_H_
 
-#include "boost/assign.hpp"
+#include <boost/assign.hpp>
 #include <boost/serialization/nvp.hpp>
 
 
diff --git a/src/core/system_parameters/rtcm.cc b/src/core/system_parameters/rtcm.cc
index 32c8fec5b..f87223ae3 100644
--- a/src/core/system_parameters/rtcm.cc
+++ b/src/core/system_parameters/rtcm.cc
@@ -29,19 +29,19 @@
  */
 
 #include "rtcm.h"
+#include "Galileo_E1.h"
+#include "GPS_L2C.h"
+#include <boost/algorithm/string.hpp>  // for to_upper_copy
+#include <boost/crc.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/dynamic_bitset.hpp>
+#include <glog/logging.h>
 #include <algorithm>  // for std::reverse
 #include <chrono>     // std::chrono::seconds
 #include <cmath>      // for std::fmod
 #include <cstdlib>    // for strtol
 #include <sstream>    // for std::stringstream
 #include <thread>
-#include <boost/algorithm/string.hpp>  // for to_upper_copy
-#include <boost/crc.hpp>
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/dynamic_bitset.hpp>
-#include <glog/logging.h>
-#include "Galileo_E1.h"
-#include "GPS_L2C.h"
 
 using google::LogMessage;
 
diff --git a/src/core/system_parameters/rtcm.h b/src/core/system_parameters/rtcm.h
index f19b71add..6ec935228 100644
--- a/src/core/system_parameters/rtcm.h
+++ b/src/core/system_parameters/rtcm.h
@@ -33,6 +33,14 @@
 #define GNSS_SDR_RTCM_H_
 
 
+#include "concurrent_queue.h"
+#include "gnss_synchro.h"
+#include "galileo_fnav_message.h"
+#include "gps_navigation_message.h"
+#include "gps_cnav_navigation_message.h"
+#include "glonass_gnav_navigation_message.h"
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <bitset>
 #include <deque>
 #include <map>
@@ -42,14 +50,6 @@
 #include <thread>
 #include <utility>
 #include <vector>
-#include <boost/asio.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include "concurrent_queue.h"
-#include "gnss_synchro.h"
-#include "galileo_fnav_message.h"
-#include "gps_navigation_message.h"
-#include "gps_cnav_navigation_message.h"
-#include "glonass_gnav_navigation_message.h"
 
 
 /*!
diff --git a/src/core/system_parameters/sbas_ephemeris.cc b/src/core/system_parameters/sbas_ephemeris.cc
index 3e3dea64e..b093ea3c7 100644
--- a/src/core/system_parameters/sbas_ephemeris.cc
+++ b/src/core/system_parameters/sbas_ephemeris.cc
@@ -30,7 +30,6 @@
  */
 
 
-#include <iostream>
 #include "sbas_ephemeris.h"
 
 void Sbas_Ephemeris::print(std::ostream &out)
diff --git a/src/core/system_parameters/sbas_ephemeris.h b/src/core/system_parameters/sbas_ephemeris.h
index a0e9e91c7..62c63b38e 100644
--- a/src/core/system_parameters/sbas_ephemeris.h
+++ b/src/core/system_parameters/sbas_ephemeris.h
@@ -32,6 +32,8 @@
 #ifndef GNSS_SDR_SBAS_EPHEMERIS_H_
 #define GNSS_SDR_SBAS_EPHEMERIS_H_
 
+#include <ostream>
+
 /*!
  * \brief This class stores SBAS SV ephemeris data
  *
diff --git a/src/main/main.cc b/src/main/main.cc
index 493332ec3..89634a6ec 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -39,19 +39,20 @@
 #define GOOGLE_STRIP_LOG 0
 #endif
 
-#include <chrono>
-#include <iostream>
-#include <memory>
+#include "concurrent_map.h"
+#include "concurrent_queue.h"
+#include "control_thread.h"
+#include "gnss_sdr_flags.h"
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/filesystem/operations.hpp>     // for create_directories, exists
 #include <boost/filesystem/path.hpp>           // for path, operator<<
 #include <boost/filesystem/path_traits.hpp>    // for filesystem
 #include <glog/logging.h>
-#include "control_thread.h"
-#include "concurrent_queue.h"
-#include "concurrent_map.h"
-#include "gnss_sdr_flags.h"
+#include <chrono>
+#include <iostream>
+#include <memory>
+
 
 #if CUDA_GPU_ACCEL
     // For the CUDA runtime routines (prefixed with "cuda_")
diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 73e5f8251..1f4a5cafb 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -56,6 +56,7 @@
 #include <stdexcept>
 #include <cstdio>
 #include <cstdlib>              // for getenv()
+#include <cmath>
 #include <list>                 // for std::list
 
 
@@ -1887,7 +1888,7 @@ bool Gnuplot::get_program_path()
     // Retrieves a C string containing the value of environment variable PATH
     path = std::getenv("PATH");
 
-    if (path == NULL)
+    if (path == NULL || std::char_traits<char>::length(path) > 4096 * sizeof(char))
         {
             throw GnuplotException("Path is not set");
         }
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 9877e61f2..fe9b1007b 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -29,15 +29,6 @@
  * -------------------------------------------------------------------------
  */
 
-#include <cmath>
-#include <iostream>
-#include <queue>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-#include <gnuradio/msg_queue.h>
 #include "concurrent_queue.h"
 #include "concurrent_map.h"
 #include "gps_navigation_message.h"
@@ -48,10 +39,18 @@
 #include "gps_ref_location.h"
 #include "gps_ref_time.h"
 #include "galileo_navigation_message.h"
-//#include "sbas_ionospheric_correction.h"
-//#include "sbas_telemetry_data.h"
-//#include "sbas_ephemeris.h"
-//#include "sbas_satellite_correction.h"
+#include <boost/thread.hpp>
+#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/system-tests/obs_gps_l1_system_test.cc b/src/tests/system-tests/obs_gps_l1_system_test.cc
index 353c494ae..8594913d6 100644
--- a/src/tests/system-tests/obs_gps_l1_system_test.cc
+++ b/src/tests/system-tests/obs_gps_l1_system_test.cc
@@ -29,6 +29,19 @@
  * -------------------------------------------------------------------------
  */
 
+#include "concurrent_map.h"
+#include "concurrent_queue.h"
+#include "control_thread.h"
+#include "in_memory_configuration.h"
+#include "signal_generator_flags.h"
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+#include <gpstk/RinexUtilities.hpp>
+#include <gpstk/Rinex3ObsBase.hpp>
+#include <gpstk/Rinex3ObsData.hpp>
+#include <gpstk/Rinex3ObsHeader.hpp>
+#include <gpstk/Rinex3ObsStream.hpp>
 #include <algorithm>
 #include <chrono>
 #include <cstdlib>
@@ -38,19 +51,6 @@
 #include <string>
 #include <thread>
 #include <unistd.h>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-#include <gpstk/RinexUtilities.hpp>
-#include <gpstk/Rinex3ObsBase.hpp>
-#include <gpstk/Rinex3ObsData.hpp>
-#include <gpstk/Rinex3ObsHeader.hpp>
-#include <gpstk/Rinex3ObsStream.hpp>
-#include "concurrent_map.h"
-#include "concurrent_queue.h"
-#include "control_thread.h"
-#include "in_memory_configuration.h"
-#include "signal_generator_flags.h"
 
 
 // For GPS NAVIGATION (L1)
diff --git a/src/tests/system-tests/obs_system_test.cc b/src/tests/system-tests/obs_system_test.cc
index fad78a813..afef8fcbb 100644
--- a/src/tests/system-tests/obs_system_test.cc
+++ b/src/tests/system-tests/obs_system_test.cc
@@ -30,6 +30,20 @@
  * -------------------------------------------------------------------------
  */
 
+#include "gnuplot_i.h"
+#include "test_flags.h"
+#include "concurrent_map.h"
+#include "concurrent_queue.h"
+#include "control_thread.h"
+#include "file_configuration.h"
+#include <armadillo>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+#include <gpstk/RinexUtilities.hpp>
+#include <gpstk/Rinex3ObsBase.hpp>
+#include <gpstk/Rinex3ObsData.hpp>
+#include <gpstk/Rinex3ObsHeader.hpp>
+#include <gpstk/Rinex3ObsStream.hpp>
 #include <algorithm>
 #include <chrono>
 #include <boost/filesystem.hpp>
@@ -40,21 +54,7 @@
 #include <string>
 #include <thread>
 #include <unistd.h>
-#include <armadillo>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-#include <gpstk/RinexUtilities.hpp>
-#include <gpstk/Rinex3ObsBase.hpp>
-#include <gpstk/Rinex3ObsData.hpp>
-#include <gpstk/Rinex3ObsHeader.hpp>
-#include <gpstk/Rinex3ObsStream.hpp>
-#include "gnuplot_i.h"
-#include "test_flags.h"
-#include "concurrent_map.h"
-#include "concurrent_queue.h"
-#include "control_thread.h"
-#include "file_configuration.h"
+
 
 // For GPS NAVIGATION (L1)
 concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index 0b3cd098d..5b1a9cb4f 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -29,16 +29,6 @@
  * -------------------------------------------------------------------------
  */
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <fstream>
-#include <numeric>
-#include <thread>
-#include <boost/filesystem.hpp>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
 #include "concurrent_map.h"
 #include "concurrent_queue.h"
 #include "control_thread.h"
@@ -48,6 +38,15 @@
 #include "gnuplot_i.h"
 #include "test_flags.h"
 #include "signal_generator_flags.h"
+#include <boost/filesystem.hpp>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <fstream>
+#include <numeric>
+#include <thread>
 
 
 DEFINE_string(config_file_ptest, std::string(""), "File containing the configuration parameters for the position test.");
diff --git a/src/tests/system-tests/ttff_gps_l1.cc b/src/tests/system-tests/ttff_gps_l1.cc
index fb6eabcf1..931e20ea7 100644
--- a/src/tests/system-tests/ttff_gps_l1.cc
+++ b/src/tests/system-tests/ttff_gps_l1.cc
@@ -30,6 +30,17 @@
  * -------------------------------------------------------------------------
  */
 
+#include "concurrent_map.h"
+#include "concurrent_queue.h"
+#include "control_thread.h"
+#include "file_configuration.h"
+#include "in_memory_configuration.h"
+#include "gnss_flowgraph.h"
+#include "gps_acq_assist.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
 #include <cerrno>
 #include <chrono>
 #include <cmath>
@@ -41,17 +52,6 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <thread>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-#include "concurrent_map.h"
-#include "concurrent_queue.h"
-#include "control_thread.h"
-#include "file_configuration.h"
-#include "in_memory_configuration.h"
-#include "gnss_flowgraph.h"
-#include "gps_acq_assist.h"
 
 
 DEFINE_int32(fs_in, 4000000, "Sampling rate, in Samples/s");
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index 3d012e543..344f0d694 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -29,17 +29,6 @@
 * -------------------------------------------------------------------------
 */
 
-#include <cmath>
-#include <iostream>
-#include <queue>
-#include <memory>
-#include <boost/thread.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/filesystem.hpp>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
-#include <gtest/gtest.h>
 #include "concurrent_queue.h"
 #include "concurrent_map.h"
 #include "control_thread.h"
@@ -63,6 +52,19 @@
 #include "glonass_gnav_almanac.h"
 #include "glonass_gnav_utc_model.h"
 
+#include <boost/thread.hpp>
+#include <boost/make_shared.hpp>
+#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>
+#include <memory>
+
+
 using google::LogMessage;
 
 DECLARE_string(log_dir);