Review fixes.

2 files changed, 6 insertions, 5 deletions

diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp
index fa14841629..2f12cf48bc 100644
--- a/platform/country_defines.cpp
+++ b/platform/country_defines.cpp
@@ -23,7 +23,7 @@ MapOptions LeastSignificantOption(MapOptions mask)
   return static_cast<MapOptions>(static_cast<uint8_t>(mask) & -static_cast<uint8_t>(mask));
 }
 
-string DebugPrint(MapOptions options)
+std::string DebugPrint(MapOptions options)
 {
   switch (options)
   {
diff --git a/platform/country_defines.hpp b/platform/country_defines.hpp
index 1bb4a916e7..f87f37fae3 100644
--- a/platform/country_defines.hpp
+++ b/platform/country_defines.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "std/string.hpp"
-#include "std/utility.hpp"
+#include <cstdint>
+#include <string>
+#include <utility>
 
 enum class MapOptions : uint8_t
 {
@@ -14,7 +15,7 @@ enum class MapOptions : uint8_t
 
 using MwmCounter = uint32_t;
 using MwmSize = uint64_t;
-using TLocalAndRemoteSize = pair<MwmSize, MwmSize>;
+using LocalAndRemoteSize = std::pair<MwmSize, MwmSize>;
 
 bool HasOptions(MapOptions mask, MapOptions options);
 
@@ -24,4 +25,4 @@ MapOptions UnsetOptions(MapOptions mask, MapOptions options);
 
 MapOptions LeastSignificantOption(MapOptions mask);
 
-string DebugPrint(MapOptions options);
+std::string DebugPrint(MapOptions options);