diff --git a/slimt/Search.cc b/slimt/Search.cc
index e49ad28..3820d0b 100644
--- a/slimt/Search.cc
+++ b/slimt/Search.cc
@@ -252,9 +252,7 @@ NBest BeamSearch::generate(const Input &input, size_t beam_size) {
   }
 
   Histories histories = step.finish();
-
-  NBest nbest;
-  return nbest;
+  return histories;
 }
 
 }  // namespace slimt
diff --git a/slimt/Transliterator.cc b/slimt/Transliterator.cc
index 8499ed6..d2fffe6 100644
--- a/slimt/Transliterator.cc
+++ b/slimt/Transliterator.cc
@@ -3,6 +3,7 @@
 
 #include <cstddef>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "slimt/Input.hh"