diff --git a/meson.build b/meson.build
index f85681c7cc..876d885a2a 100644
--- a/meson.build
+++ b/meson.build
@@ -91,6 +91,7 @@ foreach cf: dev_cflags_try
   endif
 endforeach
 add_global_arguments(dev_cflags, language: 'c')
+add_global_arguments(dev_cflags, language: 'cpp')
 
 
 foreach lang : ['c', 'objc', 'cpp']
diff --git a/src/benchmarks/eina/city.cc b/src/benchmarks/eina/city.cc
index 36ff93b4e5..831adc1194 100644
--- a/src/benchmarks/eina/city.cc
+++ b/src/benchmarks/eina/city.cc
@@ -27,6 +27,8 @@
 // possible hash functions, by using SIMD instructions, or by
 // compromising on hash quality.
 
+#pragma GCC visibility push(default)
+
 #include "city.h"
 
 #include <algorithm>
@@ -305,3 +307,5 @@ uint128 CityHash128(const char *s, size_t len) {
     return CityHash128WithSeed(s, len, uint128(k0, k1));
   }
 }
+
+#pragma GCC visibility pop