diff --git a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
index 6e0aa6364..5bddfc147 100644
--- a/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ion_gsms_signal_source.h
@@ -21,7 +21,7 @@
 #include "configuration_interface.h"
 #include "file_source_base.h"
 #include "gnss_sdr_timestamp.h"
-#include "ion_gsms.h"
+#include "ion_gsms_metadata_handler.h"
 #include <cstdint>
 #include <string>
 #include <vector>
diff --git a/src/algorithms/signal_source/libs/ion_gsms.cc b/src/algorithms/signal_source/libs/ion_gsms.cc
index ca46c7c53..515bb1cf5 100644
--- a/src/algorithms/signal_source/libs/ion_gsms.cc
+++ b/src/algorithms/signal_source/libs/ion_gsms.cc
@@ -66,11 +66,8 @@ int IONGSMSFileSource::work(
     io_buffer_offset_ = 0;
     file_stream_.read(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type) * io_buffer_.size());
 
+    items_produced_.clear();
     items_produced_.resize(output_items.size());
-    for (int& i : items_produced_)
-        {
-            i = 0;
-        }
 
     while (io_buffer_offset_ < io_buffer_.size())
         {
diff --git a/src/algorithms/signal_source/libs/ion_gsms.h b/src/algorithms/signal_source/libs/ion_gsms.h
index c9bc8efd2..a4f7e2625 100644
--- a/src/algorithms/signal_source/libs/ion_gsms.h
+++ b/src/algorithms/signal_source/libs/ion_gsms.h
@@ -67,8 +67,6 @@ private:
     std::size_t chunk_cycle_length_;
 };
 
-#include "ion_gsms_metadata_handler.h"
-
 /** \} */
 /** \} */
 #endif  // GNSS_SDR_ION_GNSS_SDR_METADATA_STANDARD_H
diff --git a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc
index 7d4c96fa5..154ad6904 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc
+++ b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc
@@ -14,7 +14,7 @@
  * -----------------------------------------------------------------------------
  */
 
-#include "ion_gsms.h"
+#include "ion_gsms_metadata_handler.h"
 #include <cstdlib>
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
diff --git a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
index 969a3f4be..4b6f5be81 100644
--- a/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
+++ b/src/algorithms/signal_source/libs/ion_gsms_metadata_handler.h
@@ -17,7 +17,7 @@
 #ifndef ION_GSMS_METADATA_HANDLER_H
 #define ION_GSMS_METADATA_HANDLER_H
 
-#include "configuration_interface.h"
+#include "ion_gsms.h"
 #include <gnuradio/block.h>
 #include <GnssMetadata.h>
 #include <string>