diff --git a/lib_vector_search/include/bucket_finder.h b/lib_vector_search/include/bucket_finder.h
index 15b7dbe..4b2dddf 100644
--- a/lib_vector_search/include/bucket_finder.h
+++ b/lib_vector_search/include/bucket_finder.h
@@ -3,11 +3,11 @@
 #include "finder.h"
 #include "word_list.h"
 
-#include <map>
+#include <unordered_map>
 
 class Bucket {
 private:
-  std::map<char, WordRefList> directory_;
+  std::unordered_map<char, WordRefList> directory_;
 
 public:
   void insert(const WordList &word_list, size_t first_index, size_t last_index);
diff --git a/lib_vector_search/include/grouped_finder.h b/lib_vector_search/include/grouped_finder.h
index 8e9251d..1b1010e 100644
--- a/lib_vector_search/include/grouped_finder.h
+++ b/lib_vector_search/include/grouped_finder.h
@@ -3,11 +3,11 @@
 #include "finder.h"
 #include "word_list.h"
 
-#include <map>
+#include <unordered_map>
 
 class GroupedFinder : public Finder {
 private:
-  std::map<char, WordRefList> groups_;
+  std::unordered_map<char, WordRefList> groups_;
 
 public:
   GroupedFinder(const WordList &word_list);
diff --git a/lib_vector_search/include/tree_finder.h b/lib_vector_search/include/tree_finder.h
index e1eea3d..6d74580 100644
--- a/lib_vector_search/include/tree_finder.h
+++ b/lib_vector_search/include/tree_finder.h
@@ -3,12 +3,12 @@
 #include "finder.h"
 #include "word_list.h"
 
-#include <map>
+#include <unordered_map>
 
 class SearchTreeNode {
 private:
   WordRefList words_;
-  std::map<const char, SearchTreeNode> children_;
+  std::unordered_map<char, SearchTreeNode> children_;
 
 public:
   void insert(std::string_view partial_word, const std::string *original_word);
diff --git a/lib_vector_search/src/grouped_finder.cpp b/lib_vector_search/src/grouped_finder.cpp
index 9bf732f..990b95c 100644
--- a/lib_vector_search/src/grouped_finder.cpp
+++ b/lib_vector_search/src/grouped_finder.cpp
@@ -1,6 +1,5 @@
 #include "grouped_finder.h"
 
-#include <forward_list>
 #include <mutex>
 #include <thread>
 #include <vector>