diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp
index 4791164750..5b54310205 100644
--- a/base/base_tests/bits_test.cpp
+++ b/base/base_tests/bits_test.cpp
@@ -3,20 +3,24 @@
 #include "base/bits.hpp"
 #include "base/checked_cast.hpp"
 
+#include <cstdint>
 #include <cstdlib>
 #include <vector>
 
 namespace
 {
-  template <typename T> uint32_t PopCountSimple(T x)
+template <typename T>
+uint32_t PopCountSimple(T x)
+{
+  uint32_t res = 0;
+  for (; x != 0; x >>= 1)
   {
-    uint32_t res = 0;
-    for (; x != 0; x >>= 1)
-      if (x & 1)
-        ++res;
-    return res;
+    if (x & 1)
+      ++res;
   }
+  return res;
 }
+}  // namespace
 
 UNIT_TEST(Popcount32)
 {
diff --git a/indexer/cell_id.hpp b/indexer/cell_id.hpp
index 108e08ee7f..8d25e23edc 100644
--- a/indexer/cell_id.hpp
+++ b/indexer/cell_id.hpp
@@ -6,6 +6,7 @@
 
 #include "base/assert.hpp"
 
+#include <cstdint>
 #include <utility>
 
 using RectId = m2::CellId<19>;