diff --git a/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.cc b/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.cc
index 19378bd9f..66eee397b 100644
--- a/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.cc
+++ b/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.cc
@@ -20,6 +20,7 @@
 #include <glog/logging.h>
 #include <iomanip>   // for std::setw()
 #include <iostream>  // for cerr, cout
+#include <utility>   // for atd::move
 
 
 Tlm_CRC_Stats::Tlm_CRC_Stats()
@@ -27,6 +28,7 @@ Tlm_CRC_Stats::Tlm_CRC_Stats()
     enable_crc_stats = false;
 }
 
+
 void Tlm_CRC_Stats::initialize(std::string dump_crc_stats_filename_)
 {
     d_dump_crc_stats_filename = std::move(dump_crc_stats_filename_);
@@ -36,6 +38,7 @@ void Tlm_CRC_Stats::initialize(std::string dump_crc_stats_filename_)
     num_crc_not_ok = 0;
 }
 
+
 bool Tlm_CRC_Stats::set_channel(int32_t channel_)
 {
     std::string dump_path;
@@ -84,6 +87,7 @@ bool Tlm_CRC_Stats::set_channel(int32_t channel_)
     return true;
 }
 
+
 void Tlm_CRC_Stats::update_CRC_stats(bool CRC)
 {
     if (CRC)
@@ -96,6 +100,7 @@ void Tlm_CRC_Stats::update_CRC_stats(bool CRC)
         }
 }
 
+
 Tlm_CRC_Stats::~Tlm_CRC_Stats()
 {
     uint32_t num_crc_tests = num_crc_ok + num_crc_not_ok;
@@ -126,7 +131,6 @@ Tlm_CRC_Stats::~Tlm_CRC_Stats()
                     DLOG(INFO) << "Telemetry CRC stats cannot write on the output file " << d_dump_crc_stats_filename.c_str();
                 }
 
-
             const auto pos = d_dump_file.tellp();
             try
                 {
diff --git a/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.h b/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.h
index 1753ab7fa..a15f9c610 100644
--- a/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.h
+++ b/src/algorithms/telemetry_decoder/libs/tlm_crc_stats.h
@@ -17,6 +17,7 @@
 #ifndef GNSS_SDR_CRC_STATS_H
 #define GNSS_SDR_CRC_STATS_H
 
+#include <cstdint>
 #include <fstream>  // for std::ofstream
 #include <string>   // for std::string