diff --git a/src/composer/composer.cc b/src/composer/composer.cc
index 32c5d8eb5..3ea8ea9b8 100644
--- a/src/composer/composer.cc
+++ b/src/composer/composer.cc
@@ -375,8 +375,8 @@ std::pair<std::string, absl::btree_set<std::string>> GetQueriesForPrediction(
   switch (input_mode) {
     case transliteration::HALF_ASCII:
     case transliteration::FULL_ASCII: {
-      return std::make_tuple(GetQueryForPrediction(composition, input_mode),
-                             absl::btree_set<std::string>());
+      return std::make_pair(GetQueryForPrediction(composition, input_mode),
+                            absl::btree_set<std::string>());
     }
     default: {
     }
@@ -393,7 +393,7 @@ std::pair<std::string, absl::btree_set<std::string>> GetQueriesForPrediction(
   const std::string asis = composition.GetStringWithTrimMode(ASIS);
   RemoveExpandedCharsForModifier(asis, base_query, &expanded);
 
-  return std::make_tuple(
+  return std::make_pair(
     japanese_util::FullWidthAsciiToHalfWidthAscii(base_query), expanded);
 }
 
diff --git a/src/composer/internal/composition.cc b/src/composer/internal/composition.cc
index f51f5626d..06fee8373 100644
--- a/src/composer/internal/composition.cc
+++ b/src/composer/internal/composition.cc
@@ -274,7 +274,7 @@ Composition::GetExpandedStrings() const {
   Transliterators::Transliterator transliterator = Transliterators::LOCAL;
   if (chunks_.empty()) {
     MOZC_VLOG(1) << "The composition size is zero.";
-    return std::make_tuple(std::string(), absl::btree_set<std::string>());
+    return std::make_pair(std::string(), absl::btree_set<std::string>());
   }
 
   std::string base;
@@ -287,7 +287,7 @@ Composition::GetExpandedStrings() const {
   // Get expanded from the last chunk
   const absl::btree_set<std::string> expanded =
       chunks_.back().GetExpandedResults();
-  return std::make_tuple(base, expanded);
+  return std::make_pair(base, expanded);
 }
 
 std::string Composition::GetString() const {