diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp
index 98e782eb9d..ab4396f905 100644
--- a/base/base_tests/string_utils_test.cpp
+++ b/base/base_tests/string_utils_test.cpp
@@ -83,11 +83,13 @@ UNIT_TEST(LowerUniChar)
       break;
     }
     default:
+    {
       m[uc] = us;
       ++fCount;
       TEST_EQUAL(type, " F", ());
       break;
     }
+    }
   }
   LOG(LINFO, ("Loaded", cCount, "common foldings and", fCount, "full foldings"));
 
diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index 0607b4a978..39eef9e4b1 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -1,5 +1,5 @@
-#include "base/string_utils.hpp"
 #include "base/assert.hpp"
+#include "base/string_utils.hpp"
 
 #include "std/target_os.hpp"
 
diff --git a/generator/key_value_storage.cpp b/generator/key_value_storage.cpp
index 323ff78b21..81d892df77 100644
--- a/generator/key_value_storage.cpp
+++ b/generator/key_value_storage.cpp
@@ -9,7 +9,7 @@
 #include <cstring>
 #include <iomanip>
 
-#include <boost/algorithm/string.hpp>
+
 namespace generator
 {
 KeyValueStorage::KeyValueStorage(std::string const & path, size_t cacheValuesCountLimit,
@@ -113,9 +113,8 @@ std::shared_ptr<JsonValue> KeyValueStorage::Find(uint64_t key) const
 std::string KeyValueStorage::SerializeDref(uint64_t number)
 {
   std::stringstream stream;
-  stream << std::setw(16) << std::setfill('0') << std::hex << number;
+  stream << std::setw(16) << std::setfill('0') << std::hex << std::uppercase << number;
   std::string result = stream.str();
-  boost::to_upper(result);
   return result;
 }