diff --git a/src/cpp/converted/eccodes/accessor/CMakeLists.txt b/src/cpp/converted/eccodes/accessor/CMakeLists.txt
index d4f00cedd..352434297 100644
--- a/src/cpp/converted/eccodes/accessor/CMakeLists.txt
+++ b/src/cpp/converted/eccodes/accessor/CMakeLists.txt
@@ -15,8 +15,8 @@ set(converted_accessor_data_dir	${CMAKE_CURRENT_LIST_DIR})
 # Note the PARENT_SCOPE option sets the variable in the calling CMakeLists.txt
 # file - it remains undefined in this file: https://cmake.org/cmake/help/latest/command/set.html
 set(converted_accessor_data_src_files
-    ${converted_accessor_data_dir}/CodeflagData.cc
-    ${converted_accessor_data_dir}/CodeflagData.h
+    #${converted_accessor_data_dir}/CodeflagData.cc
+    #${converted_accessor_data_dir}/CodeflagData.h
     ${converted_accessor_data_dir}/UnsignedData.cc
     ${converted_accessor_data_dir}/UnsignedData.h
     ${converted_accessor_data_dir}/LongData.cc
diff --git a/src/cpp/eccodes/accessor/GribCpp/GribStatus.h b/src/cpp/eccodes/accessor/GribCpp/GribStatus.h
index 7b480e5f7..72d68b425 100644
--- a/src/cpp/eccodes/accessor/GribCpp/GribStatus.h
+++ b/src/cpp/eccodes/accessor/GribCpp/GribStatus.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#undef UNDERFLOW
+
 namespace eccodes::accessor {
 
 enum class GribStatus{
diff --git a/src/cpp/eccodes/accessor/Test/GribFileTests.cc b/src/cpp/eccodes/accessor/Test/GribFileTests.cc
index 1e404bdf1..fb5902e57 100644
--- a/src/cpp/eccodes/accessor/Test/GribFileTests.cc
+++ b/src/cpp/eccodes/accessor/Test/GribFileTests.cc
@@ -9,6 +9,7 @@
 
 #include <iostream>
 #include <vector>
+#include <sstream>
 
 namespace eccodes::accessor {