From 24872c02dc7174b512a71a3ec3213bf48aa0853a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 7 Sep 2019 16:42:22 +0200
Subject: [PATCH] Uniformize header guards

---
 .../signal_source/adapters/ad9361_fpga_signal_source.h      | 2 +-
 .../signal_source/adapters/custom_udp_signal_source.h       | 6 +++---
 src/algorithms/signal_source/adapters/file_signal_source.h  | 2 +-
 .../signal_source/adapters/fmcomms2_signal_source.h         | 2 +-
 src/algorithms/signal_source/adapters/gen_signal_source.h   | 2 +-
 src/algorithms/signal_source/adapters/gn3s_signal_source.h  | 2 +-
 .../signal_source/adapters/labsat_signal_source.h           | 2 +-
 .../adapters/multichannel_file_signal_source.h              | 2 +-
 .../signal_source/adapters/nsr_file_signal_source.h         | 2 +-
 .../signal_source/adapters/osmosdr_signal_source.h          | 2 +-
 .../signal_source/adapters/plutosdr_signal_source.h         | 2 +-
 .../signal_source/adapters/raw_array_signal_source.h        | 2 +-
 .../signal_source/adapters/rtl_tcp_signal_source.h          | 6 +++---
 .../signal_source/adapters/spir_file_signal_source.h        | 2 +-
 .../adapters/spir_gss6450_file_signal_source.h              | 2 +-
 .../signal_source/adapters/two_bit_cpx_file_signal_source.h | 2 +-
 .../adapters/two_bit_packed_file_signal_source.h            | 2 +-
 src/algorithms/signal_source/adapters/uhd_signal_source.h   | 2 +-
 .../gnuradio_blocks/gr_complex_ip_packet_source.h           | 6 +++---
 .../signal_source/gnuradio_blocks/labsat23_source.h         | 6 +++---
 .../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h | 6 +++---
 .../signal_source/gnuradio_blocks/unpack_2bit_samples.h     | 6 +++---
 .../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h          | 6 +++---
 .../gnuradio_blocks/unpack_byte_2bit_samples.h              | 6 +++---
 .../gnuradio_blocks/unpack_byte_4bit_samples.h              | 6 +++---
 .../gnuradio_blocks/unpack_intspir_1bit_samples.h           | 6 +++---
 .../gnuradio_blocks/unpack_spir_gss6450_samples.h           | 6 +++---
 src/algorithms/signal_source/libs/ad9361_manager.h          | 6 +++---
 src/algorithms/signal_source/libs/fpga_switch.h             | 2 +-
 src/algorithms/signal_source/libs/gnss_sdr_valve.h          | 2 +-
 src/algorithms/signal_source/libs/rtl_tcp_commands.h        | 6 +++---
 src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h     | 6 +++---
 32 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
index a025cda37..afc496224 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -119,4 +119,4 @@ private:
     std::shared_ptr<Fpga_Switch> switch_fpga;
 };
 
-#endif /*GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
index ef3dad169..1d747e0d3 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H
-#define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H
+#ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_
+#define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_
 
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
@@ -103,4 +103,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H */
+#endif  // GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h
index 293ce8c3d..c167a0c1e 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -130,4 +130,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /*GNSS_SDR_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_FILE_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
index 66a445dd2..a2f008df0 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@@ -127,4 +127,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /* GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_ */
+#endif  // GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/gen_signal_source.h b/src/algorithms/signal_source/adapters/gen_signal_source.h
index a83c64301..d5edf6c5c 100644
--- a/src/algorithms/signal_source/adapters/gen_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gen_signal_source.h
@@ -74,4 +74,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_GEN_SIGNAL_SOURCE_H*/
+#endif  // GNSS_SDR_GEN_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
index 8b1656694..6101b5537 100644
--- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h
+++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h
@@ -92,4 +92,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_GN3S_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_GN3S_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h
index 6b36e4deb..fe21a0469 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.h
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h
@@ -91,4 +91,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_LABSAT_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
index 5c2f44864..82936177b 100644
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
@@ -130,4 +130,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /* GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_ */
+#endif  // GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
index d54f262d3..53e8063b8 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -130,4 +130,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /*GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index 5225aada0..2a291ceed 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -115,4 +115,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
index 52ed97acf..de89a0a08 100644
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@@ -114,4 +114,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H_
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 e76944e54..c4ba04e3e 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -92,4 +92,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
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 6c0a101fc..a69c29e9e 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -29,8 +29,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
-#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
+#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_
+#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_
 
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
@@ -118,4 +118,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H */
+#endif  // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H_
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 47a383e1e..b94b81591 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -128,4 +128,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /*GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_SPIR_FILE_SIGNAL_SOURCE_H_
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 a6b6ab764..a4b0c750d 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
@@ -137,4 +137,4 @@ private:
     size_t item_size_;
 };
 
-#endif /*GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H_
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 f548079ff..41f524be3 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
@@ -135,4 +135,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
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 d017afeef..5726e2dc5 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
@@ -159,4 +159,4 @@ private:
     bool enable_throttle_control_;
 };
 
-#endif /*GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_TWO_BIT_CPX_FILE_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index a6dc3c081..23b1422c4 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -112,4 +112,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
 
-#endif /*GNSS_SDR_UHD_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_UHD_SIGNAL_SOURCE_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index 579bdd1dd..851a2ff4f 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
-#define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
+#ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_
+#define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_
 
 #include <boost/thread.hpp>
 #include <gnuradio/sync_block.h>
@@ -109,4 +109,4 @@ private:
     bool open();
 };
 
-#endif /* GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H */
+#endif  //  GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
index 2be976ec1..605eca678 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_LABSAT23_SOURCE_H
-#define GNSS_SDR_LABSAT23_SOURCE_H
+#ifndef GNSS_SDR_LABSAT23_SOURCE_H_
+#define GNSS_SDR_LABSAT23_SOURCE_H_
 
 #include "concurrent_queue.h"
 #include <gnuradio/block.h>
@@ -87,4 +87,4 @@ private:
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> d_queue;
 };
 
-#endif
+#endif  // GNSS_SDR_LABSAT23_SOURCE_H_
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 78cab6c39..dff5ad5d8 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
@@ -35,8 +35,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H
-#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H
+#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_
+#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_
 
 #include "rtl_tcp_dongle_info.h"
 #include <boost/array.hpp>
@@ -128,4 +128,4 @@ private:
     }
 };
 
-#endif  // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H
+#endif  // GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_C_H_
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 236cb6842..ed72c9e72 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -65,8 +65,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H
-#define GNSS_SDR_UNPACK_2BIT_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_2BIT_SAMPLES_H_
+#define GNSS_SDR_UNPACK_2BIT_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 #include <cstdint>
@@ -117,4 +117,4 @@ private:
     std::vector<int8_t> work_buffer_;
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_2BIT_SAMPLES_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
index 317744e96..2900fa850 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
@@ -32,8 +32,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H
-#define GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_
+#define GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -60,4 +60,4 @@ private:
     friend unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples_sptr();
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_BYTE_2BIT_CPX_SAMPLES_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
index ea153fc5c..b084d9886 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H
-#define GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_
+#define GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -56,4 +56,4 @@ private:
     friend unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples_sptr();
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_BYTE_2BIT_SAMPLES_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
index ad404c115..7385881f5 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
-#define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_
+#define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -58,4 +58,4 @@ private:
     friend unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples_sptr();
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
index 5ae94f36c..1b7c6b34f 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H
-#define GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_
+#define GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -56,4 +56,4 @@ private:
     friend unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples_sptr();
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_INTSPIR_1BIT_SAMPLES_H_
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
index e1bc2f0ac..3c95e5d9a 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
@@ -29,8 +29,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H
-#define GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H
+#ifndef GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_
+#define GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_
 
 #include <gnuradio/sync_interpolator.h>
 
@@ -56,4 +56,4 @@ private:
     unsigned int samples_per_int;
 };
 
-#endif
+#endif  // GNSS_SDR_UNPACK_SPIR_GSS6450_SAMPLES_H_
diff --git a/src/algorithms/signal_source/libs/ad9361_manager.h b/src/algorithms/signal_source/libs/ad9361_manager.h
index d11fcd312..f716fd287 100644
--- a/src/algorithms/signal_source/libs/ad9361_manager.h
+++ b/src/algorithms/signal_source/libs/ad9361_manager.h
@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_AD9361_MANAGER_H
-#define GNSS_SDR_AD9361_MANAGER_H
+#ifndef GNSS_SDR_AD9361_MANAGER_H_
+#define GNSS_SDR_AD9361_MANAGER_H_
 
 #include <cstdint>
 #include <string>
@@ -128,4 +128,4 @@ bool ad9361_disable_lo_remote(const std::string &remote_host);
 
 bool ad9361_disable_lo_local();
 
-#endif
+#endif  // GNSS_SDR_AD9361_MANAGER_H_
diff --git a/src/algorithms/signal_source/libs/fpga_switch.h b/src/algorithms/signal_source/libs/fpga_switch.h
index c18de1520..e929c187f 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.h
+++ b/src/algorithms/signal_source/libs/fpga_switch.h
@@ -74,4 +74,4 @@ private:
     void close_device(void);
 };
 
-#endif /* GNSS_SDR_FPGA_SWITCH_H_ */
+#endif  // GNSS_SDR_FPGA_SWITCH_H_
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
index 32f4219ff..b95a4bfc2 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
@@ -92,4 +92,4 @@ private:
     bool d_open_valve;
 };
 
-#endif /*GNSS_SDR_GNSS_SDR_VALVE_H_*/
+#endif  // GNSS_SDR_GNSS_SDR_VALVE_H_
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_commands.h b/src/algorithms/signal_source/libs/rtl_tcp_commands.h
index 72a78921e..bbf1b9fd7 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_commands.h
+++ b/src/algorithms/signal_source/libs/rtl_tcp_commands.h
@@ -29,8 +29,8 @@
  *
  * -------------------------------------------------------------------------
  */
-#ifndef GNSS_SDR_RTL_TCP_COMMANDS_H
-#define GNSS_SDR_RTL_TCP_COMMANDS_H
+#ifndef GNSS_SDR_RTL_TCP_COMMANDS_H_
+#define GNSS_SDR_RTL_TCP_COMMANDS_H_
 
 #include <boost/asio/ip/tcp.hpp>        // for tcp, tcp::socket
 #include <boost/system/error_code.hpp>  // for error_code
@@ -53,4 +53,4 @@ enum RTL_TCP_COMMAND
 boost::system::error_code rtl_tcp_command(RTL_TCP_COMMAND id, unsigned param,
     boost::asio::ip::tcp::socket &socket);
 
-#endif  // GNSS_SDR_RTL_TCP_COMMANDS_H
+#endif  // GNSS_SDR_RTL_TCP_COMMANDS_H_
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
index 6a72739c3..acd45a19e 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_RTL_TCP_DONGLE_INFO_H
-#define GNSS_SDR_RTL_TCP_DONGLE_INFO_H
+#ifndef GNSS_SDR_RTL_TCP_DONGLE_INFO_H_
+#define GNSS_SDR_RTL_TCP_DONGLE_INFO_H_
 
 #include <boost/asio/ip/tcp.hpp>
 
@@ -80,4 +80,4 @@ private:
 };
 
 
-#endif  // GNSS_SDR_RTL_TCP_DONGLE_INFO_H
+#endif  // GNSS_SDR_RTL_TCP_DONGLE_INFO_H_