diff --git a/src/accessor/grib_accessor_class_bufr_data_array.cc b/src/accessor/grib_accessor_class_bufr_data_array.cc
index e0c998950..0bd2c2c0f 100644
--- a/src/accessor/grib_accessor_class_bufr_data_array.cc
+++ b/src/accessor/grib_accessor_class_bufr_data_array.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -56,7 +55,7 @@ static int is_bitmap_start_defined(grib_accessor_bufr_data_array_t* self)
     return self->bitmapStart == -1 ? 0 : 1;
 }
 
-size_t get_length(grib_accessor* a)
+static size_t get_length(grib_accessor* a)
 {
     grib_accessor_bufr_data_array_t* self = (grib_accessor_bufr_data_array_t*)a;
     size_t len = 0;
@@ -101,7 +100,7 @@ static int tableB_override_get_ref_val(grib_accessor_bufr_data_array_t* self, in
 }
 
 /* Operator 203YYY: Clear and free linked list */
-void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array_t* self)
+static void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array_t* self)
 {
     bufr_tableb_override* tb = self->tableb_override;
     while (tb) {
@@ -113,7 +112,7 @@ void tableB_override_clear(grib_context* c, grib_accessor_bufr_data_array_t* sel
 }
 
 /* Operator 203YYY: Copy contents of linked list to the transient array key */
-int tableB_override_set_key(grib_handle* h, grib_accessor_bufr_data_array_t* self)
+static int tableB_override_set_key(grib_handle* h, grib_accessor_bufr_data_array_t* self)
 {
     int err                  = GRIB_SUCCESS;
     size_t size              = 0;
@@ -2202,7 +2201,7 @@ static grib_accessor* accessor_or_attribute_with_same_name(grib_accessor* a, con
 //     return *r;
 // }
 
-int grib_data_accessors_trie_push(grib_trie_with_rank* accessorsTrie, grib_accessor* a)
+static int grib_data_accessors_trie_push(grib_trie_with_rank* accessorsTrie, grib_accessor* a)
 {
     return grib_trie_with_rank_insert(accessorsTrie, a->name, a);
 }
diff --git a/src/accessor/grib_accessor_class_bufr_elements_table.cc b/src/accessor/grib_accessor_class_bufr_elements_table.cc
index b9a0d0c58..04a61d02b 100644
--- a/src/accessor/grib_accessor_class_bufr_elements_table.cc
+++ b/src/accessor/grib_accessor_class_bufr_elements_table.cc
@@ -212,14 +212,14 @@ static int convert_type(const char* stype)
     return ret;
 }
 
-long atol_fast(const char* input)
+static long atol_fast(const char* input)
 {
     if (strcmp(input, "0") == 0)
         return 0;
     return atol(input);
 }
 
-int bufr_get_from_table(grib_accessor* a, bufr_descriptor* v)
+static int bufr_get_from_table(grib_accessor* a, bufr_descriptor* v)
 {
     int ret              = 0;
     char** list          = 0;
diff --git a/src/accessor/grib_accessor_class_g1forecastmonth.cc b/src/accessor/grib_accessor_class_g1forecastmonth.cc
index 7ec448cf6..c7745cfa7 100644
--- a/src/accessor/grib_accessor_class_g1forecastmonth.cc
+++ b/src/accessor/grib_accessor_class_g1forecastmonth.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -106,7 +105,7 @@ static int unpack_long_edition2(grib_accessor* a, long* val, size_t* len)
     return GRIB_SUCCESS;
 }
 
-int unpack_long_edition1(grib_accessor* a, long* val, size_t* len)
+static int unpack_long_edition1(grib_accessor* a, long* val, size_t* len)
 {
     int err = 0;
     grib_accessor_g1forecastmonth_t* self = (grib_accessor_g1forecastmonth_t*)a;
diff --git a/src/accessor/grib_accessor_class_number_of_points_gaussian.cc b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
index 39324fbd3..7959a6360 100644
--- a/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
+++ b/src/accessor/grib_accessor_class_number_of_points_gaussian.cc
@@ -112,8 +112,8 @@ static int get_number_of_data_values(grib_handle* h, size_t* numDataValues)
     return err;
 }
 
-int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len);
-int unpack_long_new(grib_accessor* a, long* val, size_t* len);
+static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len);
+static int unpack_long_new(grib_accessor* a, long* val, size_t* len);
 
 int grib_accessor_class_number_of_points_gaussian_t::unpack_long(grib_accessor* a, long* val, size_t* len)
 {
@@ -132,7 +132,7 @@ int grib_accessor_class_number_of_points_gaussian_t::unpack_long(grib_accessor*
 }
 
 /* New algorithm */
-int unpack_long_new(grib_accessor* a, long* val, size_t* len)
+static int unpack_long_new(grib_accessor* a, long* val, size_t* len)
 {
     int err       = GRIB_SUCCESS;
     int is_global = 0;
@@ -241,7 +241,7 @@ int unpack_long_new(grib_accessor* a, long* val, size_t* len)
 }
 
 /* With Legacy support */
-int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len)
+static int unpack_long_with_legacy_support(grib_accessor* a, long* val, size_t* len)
 {
     int err       = GRIB_SUCCESS;
     int is_global = 0;