From 85efc65a65fc32b3989d8a3f8ad804459356909f Mon Sep 17 00:00:00 2001
From: Balthasar Reuter <balthasar.reuter@ecmwf.int>
Date: Thu, 19 Feb 2026 16:07:06 +0200
Subject: [PATCH 1/2] multiom/encoders-base: exclude grib2 sources to avoid
 duplicate compilation

---
 src/multiom/encoders-base/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/multiom/encoders-base/CMakeLists.txt b/src/multiom/encoders-base/CMakeLists.txt
index 5582cee87..29bb027f7 100644
--- a/src/multiom/encoders-base/CMakeLists.txt
+++ b/src/multiom/encoders-base/CMakeLists.txt
@@ -20,7 +20,6 @@ set( MULTIOM_ENCODERS_BASE_MAIN_SOURCES
 # Collect source files in module2
 set( MULTIOM_ENCODERS_BASE_SOURCES
   ${MULTIOM_ENCODERS_BASE_MAIN_SOURCES}
-  ${MULTIOM_ENCODER_GRIB2_SOURCES}
   CACHE INTERNAL "List of all sources in operations directory"
 )
 
@@ -32,4 +31,4 @@ foreach(source_file IN LISTS MULTIOM_ENCODERS_BASE_MAIN_SOURCES)
 
     # Print the filename
     message("${OFFSET}    - ${filename}")
-endforeach()
\ No newline at end of file
+endforeach()

From 76c68bf4135cb3a8d732b4378cfbe340917d1dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domokos=20S=C3=A1rm=C3=A1ny?= <domokos.sarmany@ecmwf.int>
Date: Thu, 26 Mar 2026 16:55:37 +0000
Subject: [PATCH 2/2] Add missing <algorithm> includes

---
 src/multio/datamod/ContainerInterop.h         | 1 +
 src/multio/datamod/types/TypeOfLevel.cc       | 2 +-
 src/multio/mars2grib/sections/SectionTypes.cc | 2 +-
 src/multiom/api/api_encode_c.cc               | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/multio/datamod/ContainerInterop.h b/src/multio/datamod/ContainerInterop.h
index c05e06fc4..faeb6ae0e 100644
--- a/src/multio/datamod/ContainerInterop.h
+++ b/src/multio/datamod/ContainerInterop.h
@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <algorithm>
 #include <type_traits>
 #include "eckit/config/LocalConfiguration.h"
 #include "metkit/codes/CodesDecoder.h"
diff --git a/src/multio/datamod/types/TypeOfLevel.cc b/src/multio/datamod/types/TypeOfLevel.cc
index 4ab1357e6..abf218759 100644
--- a/src/multio/datamod/types/TypeOfLevel.cc
+++ b/src/multio/datamod/types/TypeOfLevel.cc
@@ -8,6 +8,7 @@
  * does it submit to any jurisdiction.
  */
 
+#include <algorithm>
 #include "TypeOfLevel.h"
 #include "multio/datamod/core/DataModellingException.h"
 
@@ -335,4 +336,3 @@ void util::Print<datamod::TypeOfLevel>::print(PrintStream& ps, const datamod::Ty
 }
 
 }  // namespace multio
-
diff --git a/src/multio/mars2grib/sections/SectionTypes.cc b/src/multio/mars2grib/sections/SectionTypes.cc
index b9aee9cd4..b5c6eb3ef 100644
--- a/src/multio/mars2grib/sections/SectionTypes.cc
+++ b/src/multio/mars2grib/sections/SectionTypes.cc
@@ -8,6 +8,7 @@
  * does it submit to any jurisdiction.
  */
 
+#include <algorithm>
 #include "multio/mars2grib/sections/SectionTypes.h"
 #include "multio/mars2grib/Mars2GribException.h"
 
@@ -55,4 +56,3 @@ std::ostream& operator<<(std::ostream& os, const TimeRangeType& t) {
     return os;
 }
 }  // namespace multio::mars2grib::sections
-
diff --git a/src/multiom/api/api_encode_c.cc b/src/multiom/api/api_encode_c.cc
index d1b83d290..972f5a357 100644
--- a/src/multiom/api/api_encode_c.cc
+++ b/src/multiom/api/api_encode_c.cc
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <algorithm>
 #include <functional>
 #include <iomanip>
 #include <iostream>