diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 5090c00..84fc8df 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2363
+BUILD=2364
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/prediction/dictionary_predictor.cc b/src/prediction/dictionary_predictor.cc
index b92f1f5..e45afb7 100644
--- a/src/prediction/dictionary_predictor.cc
+++ b/src/prediction/dictionary_predictor.cc
@@ -1744,12 +1744,12 @@
   for (size_t i = 0; i < result_rule->entries_size; ++i) {
     const ZeroQueryEntry &entry = result_rule->entries[i];
     if (entry.type != ZERO_QUERY_EMOJI) {
-      results->push_back(make_pair(entry.value, entry.type));
+      results->push_back(std::make_pair(entry.value, entry.type));
       continue;
     }
     if (available_emoji_carrier & Request::UNICODE_EMOJI &&
         entry.emoji_type & EMOJI_UNICODE) {
-      results->push_back(make_pair(entry.value, entry.type));
+      results->push_back(std::make_pair(entry.value, entry.type));
       continue;
     }
 
@@ -1761,7 +1761,7 @@
          entry.emoji_type & EMOJI_KDDI)) {
       string android_pua;
       Util::UCS4ToUTF8(entry.emoji_android_pua, &android_pua);
-      results->push_back(make_pair(android_pua, entry.type));
+      results->push_back(std::make_pair(android_pua, entry.type));
     }
   }
   return !results->empty();
diff --git a/src/session/internal/keymap.cc b/src/session/internal/keymap.cc
index 6508455..be0de66 100644
--- a/src/session/internal/keymap.cc
+++ b/src/session/internal/keymap.cc
@@ -123,8 +123,8 @@
   const string filename = ConfigFileStream::GetFileName(keymap_file);
   OutputFileStream ofs(filename.c_str());
   if (ofs) {
-    ofs << "# This is a copy of keymap table for debugging." << endl;
-    ofs << "# Nothing happens when you edit this file manually." << endl;
+    ofs << "# This is a copy of keymap table for debugging." << std::endl;
+    ofs << "# Nothing happens when you edit this file manually." << std::endl;
     ofs << custom_keymap_table;
   }
 #endif
diff --git a/src/session/internal/keymap_factory.cc b/src/session/internal/keymap_factory.cc
index c2fdfc1..1be08b8 100644
--- a/src/session/internal/keymap_factory.cc
+++ b/src/session/internal/keymap_factory.cc
@@ -55,7 +55,7 @@
 
   // create new instance
   KeyMapManager *manager = pool_.Alloc();
-  keymaps_.insert(make_pair(keymap, manager));
+  keymaps_.insert(std::make_pair(keymap, manager));
   manager->Initialize(keymap);
   return manager;
 }