diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
index 6d98f3054..d518810b5 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_gs.h
@@ -22,8 +22,8 @@
 
 #include "beidou_dnav_navigation_message.h"
 #include "gnss_block_interface.h"
-#include "nav_message_packet.h"
 #include "gnss_satellite.h"
+#include "nav_message_packet.h"
 #include "tlm_conf.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>  // for block
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
index 4b09bc9e5..6f6fb9f74 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
@@ -24,8 +24,8 @@
 #include "galileo_fnav_message.h"
 #include "galileo_inav_message.h"
 #include "gnss_block_interface.h"
-#include "nav_message_packet.h"
 #include "gnss_satellite.h"
+#include "nav_message_packet.h"
 #include "tlm_conf.h"
 #include "tlm_crc_stats.h"
 #include <boost/circular_buffer.hpp>
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
index aeee5bf38..46d2effac 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.h
@@ -2,7 +2,7 @@
  * \file glonass_l1_ca_telemetry_decoder_gs.h
  * \brief Implementation of a GLONASS L1 C/A NAV data decoder block
  * \note Code added as part of GSoC 2017 program
- * \author Damian Miralles, 2017. dmiralles2009(at)gmail.com
+ * \author Damian Miralles, 2017. dmiralles2009(at)gmail.comK
  *
  * -----------------------------------------------------------------------------
  *
@@ -24,8 +24,8 @@
 #include "gnss_block_interface.h"
 #include "gnss_satellite.h"
 #include "gnss_synchro.h"
-#include "tlm_conf.h"
 #include "nav_message_packet.h"
+#include "tlm_conf.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>  // for block
 #include <gnuradio/types.h>  // for gr_vector_const_void_star
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
index 2a941bb04..d21b47e47 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.h
@@ -23,8 +23,8 @@
 #include "gnss_block_interface.h"
 #include "gnss_satellite.h"
 #include "gnss_synchro.h"
-#include "tlm_conf.h"
 #include "nav_message_packet.h"
+#include "tlm_conf.h"
 #include <boost/circular_buffer.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/types.h>  // for gr_vector_const_void_star
diff --git a/src/core/libs/nav_message_monitor.h b/src/core/libs/nav_message_monitor.h
index de7b1daaa..f29831043 100644
--- a/src/core/libs/nav_message_monitor.h
+++ b/src/core/libs/nav_message_monitor.h
@@ -18,8 +18,8 @@
 #ifndef GNSS_SDR_NAV_MESSAGE_MONITOR_H
 #define GNSS_SDR_NAV_MESSAGE_MONITOR_H
 
-#include "nav_message_udp_sink.h"
 #include "gnss_block_interface.h"
+#include "nav_message_udp_sink.h"
 #include <gnuradio/block.h>
 #include <pmt/pmt.h>
 #include <cstdint>
diff --git a/src/utils/nav-listener/CMakeLists.txt b/src/utils/nav-listener/CMakeLists.txt
index 618866b82..cedb4707e 100644
--- a/src/utils/nav-listener/CMakeLists.txt
+++ b/src/utils/nav-listener/CMakeLists.txt
@@ -4,8 +4,8 @@
 # SPDX-FileCopyrightText: 2021 C. Fernandez-Prades cfernandez(at)cttc.es
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.9...3.21)
-project (nav-msg-listener CXX)
+cmake_minimum_required(VERSION 3.9...3.21)
+project(nav-msg-listener CXX)
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -14,7 +14,7 @@ find_package(Boost COMPONENTS system REQUIRED)
 
 find_package(Protobuf REQUIRED)
 if(${Protobuf_VERSION} VERSION_LESS "3.0.0")
-     message(FATAL_ERROR "Fatal error: Protocol Buffers >= v3.0.0 required.")
+    message(FATAL_ERROR "Fatal error: Protocol Buffers >= v3.0.0 required.")
 endif()
 
 protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${CMAKE_SOURCE_DIR}/nav_message.proto)