Cleaning includes

src/algorithms/libs/galileo_e1_signal_processing.cc

@@ -32,6 +32,8 @@
 
 #include "galileo_e1_signal_processing.h"
 #include <string>
+#include "Galileo_E1.h"
+#include "gnss_signal_processing.h"
 
 
 void galileo_e1_code_gen_int(int* _dest, char _Signal[3], signed int _prn, unsigned int _chip_shift)

src/algorithms/libs/galileo_e1_signal_processing.h

@@ -33,10 +33,7 @@
 #define GNSS_SDR_GALILEO_E1_SIGNAL_PROCESSING_H_
 
 #include <complex>
-#include <iostream>
-#include <gnuradio/math.h>
-#include "Galileo_E1.h"
-#include "gnss_signal_processing.h"
+
 
 /*!
  * \brief This function generates Galileo E1 code (one sample per chip).

src/algorithms/libs/galileo_e5_signal_processing.cc

@@ -32,6 +32,11 @@
  */
 
 #include "galileo_e5_signal_processing.h"
+#include <gnuradio/math.h>
+#include "Galileo_E5a.h"
+#include "gnss_signal_processing.h"
+
+
 
 void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, signed int _prn, char _Signal[3])
 {

src/algorithms/libs/galileo_e5_signal_processing.h

@@ -35,10 +35,7 @@
 #define GNSS_SDR_GALILEO_E5_SIGNAL_PROCESSING_H_
 
 #include <complex>
-#include <iostream>
-#include <gnuradio/math.h>
-#include "Galileo_E5a.h"
-#include "gnss_signal_processing.h"
+
 
 /*!
  * \brief Generates Galileo E5a code at 1 sample/chip

src/algorithms/libs/gnss_signal_processing.cc

@@ -33,6 +33,7 @@
 
 #include "gnss_signal_processing.h"
 #include <gnuradio/fxpt_nco.h>
+#include "GPS_L1_CA.h"
 
 
 auto auxCeil2 = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };

src/algorithms/libs/gnss_signal_processing.h

@@ -36,8 +36,7 @@
 #define GNSS_SDR_GNSS_SIGNAL_PROCESSING_H_
 
 #include <complex>
-#include <iostream>
-#include "GPS_L1_CA.h"
+
 
 /*!
  * \brief This function generates a complex exponential in _dest.

src/algorithms/libs/gps_l2c_signal.cc

@@ -33,23 +33,24 @@
 #include <gps_l2c_signal.h>
 #include <cstdint>
 #include <cmath>
+#include "GPS_L2C.h"
 
 
 int32_t gps_l2c_m_shift(int32_t x)
 {
-	return static_cast<int32_t>((x >> 1)^((x & 1) * 0445112474));
+    return static_cast<int32_t>((x >> 1)^((x & 1) * 0445112474));
 }
 
 
 void gps_l2c_m_code(int32_t * _dest, unsigned int _prn)
 {
-	int32_t x;
-	x = GPS_L2C_M_INIT_REG[ _prn - 1];
-	for (int n = 0; n < GPS_L2_M_CODE_LENGTH_CHIPS; n++)
-	{
-		_dest[n] = (int8_t)(x&1);
-		x = gps_l2c_m_shift(x);
-	}
+    int32_t x;
+    x = GPS_L2C_M_INIT_REG[ _prn - 1];
+    for (int n = 0; n < GPS_L2_M_CODE_LENGTH_CHIPS; n++)
+        {
+            _dest[n] = (int8_t)(x&1);
+            x = gps_l2c_m_shift(x);
+        }
 }
 
 
@@ -100,7 +101,7 @@ void gps_l2c_m_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int
             //=== Digitizing =======================================================
 
             //--- Make index array to read L2C code values -------------------------
-    	    //TODO: Check this formula! Seems to start with an extra sample
+            //TODO: Check this formula! Seems to start with an extra sample
             _codeValueIndex = ceil((_ts * ((float)i + 1)) / _tc) - 1;
             //aux = (_ts * (i + 1)) / _tc;
             //_codeValueIndex = static_cast<int>(static_cast<long>(aux)) - 1;
@@ -110,7 +111,6 @@ void gps_l2c_m_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int
                 {
                     //--- Correct the last index (due to number rounding issues) -----------
                     _dest[i] = std::complex<float>(1.0 - 2.0 * _code[_codeLength - 1], 0);
-
                 }
             else
                 {

src/algorithms/libs/gps_l2c_signal.h

@@ -34,7 +34,6 @@
 #define GNSS_GPS_L2C_SIGNAL_H_
 
 #include <complex>
-#include "GPS_L2C.h"
 
 
 //!Generates complex GPS L2C M code for the desired SV ID

src/algorithms/libs/gps_sdr_signal_processing.cc

@@ -31,8 +31,6 @@
  */
 
 #include "gps_sdr_signal_processing.h"
-#include <stdlib.h>
-#include <cmath>
 
 auto auxCeil = [](float x){ return static_cast<int>(static_cast<long>((x)+1)); };
 

src/algorithms/libs/gps_sdr_signal_processing.h

@@ -34,8 +34,6 @@
 #define GNSS_SDR_GPS_SDR_SIGNAL_PROCESSING_H_
 
 #include <complex>
-#include <iostream>
-#include "GPS_L1_CA.h"
 
 //!Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
 void gps_l1_ca_code_gen_complex(std::complex<float>* _dest, signed int _prn, unsigned int _chip_shift);

src/algorithms/libs/nco_lib.cc

@@ -33,7 +33,7 @@
  */
 
 #include "nco_lib.h"
-
+#include <cmath>
 
 
 void fxp_nco(std::complex<float> *dest, int n_samples, float start_phase_rad, float phase_step_rad)

src/algorithms/libs/nco_lib.h

@@ -37,10 +37,7 @@
 #ifndef GNSS_SDR_NCO_LIB_CC_H_
 #define	GNSS_SDR_NCO_LIB_CC_H_
 
-#include <cmath>
 #include <gnuradio/fxpt.h>
-//#include <xmmintrin.h>
-//#include <sse_mathfun.h>
 
 
 /*!