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 2ac1f42ed..d1770530f 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
@@ -27,6 +27,7 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
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 af2d80538..90cd7b0fa 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
@@ -27,6 +27,7 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
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 ece68286e..efe8f32fa 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
@@ -27,6 +27,7 @@
 
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 15404fa41..b839030e7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -25,6 +25,7 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index 5fcca1352..860cd767b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -25,6 +25,7 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index e1ea50f40..0aa3502a5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -27,6 +27,7 @@
 
 #include "glonass_l2_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
+#include "MATH_CONSTANTS.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_satellite.h"
 #include "gnss_sdr_flags.h"
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index 978877e30..4a016ce75 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -22,7 +22,6 @@
 #ifndef GNSS_SDR_GLONASS_L1_L2_CA_H
 #define GNSS_SDR_GLONASS_L1_L2_CA_H
 
-#include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 #include <cstdint>
 #include <map>
diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h
index e244ccd70..44789758d 100644
--- a/src/core/system_parameters/GPS_L2C.h
+++ b/src/core/system_parameters/GPS_L2C.h
@@ -23,7 +23,6 @@
 
 
 #include "GPS_CNAV.h"
-#include "MATH_CONSTANTS.h"
 #include "gnss_frequencies.h"
 #include <cstdint>
 #include <utility>  // std::pair
diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc
index 874176d32..fd884cb73 100644
--- a/src/core/system_parameters/gps_navigation_message.cc
+++ b/src/core/system_parameters/gps_navigation_message.cc
@@ -45,9 +45,7 @@ Gps_Navigation_Message::Gps_Navigation_Message()
 
 void Gps_Navigation_Message::print_gps_word_bytes(uint32_t GPS_word) const
 {
-    std::cout << " Word =";
-    std::cout << std::bitset<32>(GPS_word);
-    std::cout << std::endl;
+    std::cout << " Word =" << std::bitset<32>(GPS_word) << std::endl;
 }