diff --git a/Android.bp b/Android.bp
index 5d95ca4..d2eb412 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5620,14 +5620,6 @@
   ],
 }
 
-// GN: //src/trace_processor:common
-filegroup {
-  name: "perfetto_src_trace_processor_common",
-  srcs: [
-    "src/trace_processor/string_pool.cc",
-  ],
-}
-
 // GN: //src/trace_processor/containers:containers
 filegroup {
   name: "perfetto_src_trace_processor_containers_containers",
@@ -5635,6 +5627,7 @@
     "src/trace_processor/containers/bit_vector.cc",
     "src/trace_processor/containers/bit_vector_iterators.cc",
     "src/trace_processor/containers/row_map.cc",
+    "src/trace_processor/containers/string_pool.cc",
   ],
 }
 
@@ -5643,8 +5636,10 @@
   name: "perfetto_src_trace_processor_containers_unittests",
   srcs: [
     "src/trace_processor/containers/bit_vector_unittest.cc",
+    "src/trace_processor/containers/null_term_string_view_unittest.cc",
     "src/trace_processor/containers/row_map_unittest.cc",
     "src/trace_processor/containers/sparse_vector_unittest.cc",
+    "src/trace_processor/containers/string_pool_unittest.cc",
   ],
 }
 
@@ -5844,14 +5839,12 @@
     "src/trace_processor/importers/proto/proto_trace_parser_unittest.cc",
     "src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
     "src/trace_processor/metadata_table_unittest.cc",
-    "src/trace_processor/null_term_string_view_unittest.cc",
     "src/trace_processor/process_table_unittest.cc",
     "src/trace_processor/process_tracker_unittest.cc",
     "src/trace_processor/protozero_to_text_unittests.cc",
     "src/trace_processor/sched_slice_table_unittest.cc",
     "src/trace_processor/slice_tracker_unittest.cc",
     "src/trace_processor/span_join_operator_table_unittest.cc",
-    "src/trace_processor/string_pool_unittest.cc",
     "src/trace_processor/syscall_tracker_unittest.cc",
     "src/trace_processor/thread_table_unittest.cc",
     "src/trace_processor/trace_sorter_unittest.cc",
@@ -6603,7 +6596,6 @@
     ":perfetto_src_protozero_testing_messages_lite_gen",
     ":perfetto_src_protozero_testing_messages_zero_gen",
     ":perfetto_src_protozero_unittests",
-    ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_containers_containers",
     ":perfetto_src_trace_processor_containers_unittests",
     ":perfetto_src_trace_processor_db_lib",
@@ -6819,7 +6811,6 @@
     ":perfetto_protos_perfetto_trace_track_event_zero_gen",
     ":perfetto_src_base_base",
     ":perfetto_src_protozero_protozero",
-    ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_containers_containers",
     ":perfetto_src_trace_processor_db_lib",
     ":perfetto_src_trace_processor_descriptors",
@@ -6927,7 +6918,6 @@
     ":perfetto_src_base_base",
     ":perfetto_src_profiling_deobfuscator",
     ":perfetto_src_protozero_protozero",
-    ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_containers_containers",
     ":perfetto_src_trace_processor_db_lib",
     ":perfetto_src_trace_processor_descriptors",
diff --git a/BUILD b/BUILD
index 2435b10..a791d1b 100644
--- a/BUILD
+++ b/BUILD
@@ -580,9 +580,12 @@
         "src/trace_processor/containers/bit_vector.h",
         "src/trace_processor/containers/bit_vector_iterators.cc",
         "src/trace_processor/containers/bit_vector_iterators.h",
+        "src/trace_processor/containers/null_term_string_view.h",
         "src/trace_processor/containers/row_map.cc",
         "src/trace_processor/containers/row_map.h",
         "src/trace_processor/containers/sparse_vector.h",
+        "src/trace_processor/containers/string_pool.cc",
+        "src/trace_processor/containers/string_pool.h",
     ],
 )
 
@@ -695,16 +698,6 @@
     ],
 )
 
-# GN target: //src/trace_processor:common
-filegroup(
-    name = "src_trace_processor_common",
-    srcs = [
-        "src/trace_processor/null_term_string_view.h",
-        "src/trace_processor/string_pool.cc",
-        "src/trace_processor/string_pool.h",
-    ],
-)
-
 # GN target: //src/trace_processor:descriptors
 filegroup(
     name = "src_trace_processor_descriptors",
@@ -2527,7 +2520,6 @@
     srcs = [
         ":src_base_base",
         ":src_protozero_protozero",
-        ":src_trace_processor_common",
         ":src_trace_processor_containers_containers",
         ":src_trace_processor_db_lib",
         ":src_trace_processor_descriptors",
@@ -2606,7 +2598,6 @@
         ":src_base_base",
         ":src_base_unix_socket",
         ":src_protozero_protozero",
-        ":src_trace_processor_common",
         ":src_trace_processor_containers_containers",
         ":src_trace_processor_db_lib",
         ":src_trace_processor_descriptors",
@@ -2760,7 +2751,6 @@
         ":src_base_base",
         ":src_profiling_deobfuscator",
         ":src_protozero_protozero",
-        ":src_trace_processor_common",
         ":src_trace_processor_containers_containers",
         ":src_trace_processor_db_lib",
         ":src_trace_processor_descriptors",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 9d34b96..ef1be20 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -151,12 +151,12 @@
   ]
 
   deps = [
-    ":common",
     ":descriptors",
     "../../gn:default_deps",
     "../../gn:zlib",
     "../base",
     "../protozero",
+    "containers",
     "tables",
   ]
   public_deps = [
@@ -351,7 +351,6 @@
     ]
 
     deps = [
-      ":common",
       ":storage_full",
       "../../gn:default_deps",
       "../../gn:sqlite",
@@ -380,21 +379,6 @@
   }
 }
 
-# TODO(lalitm): we need to find a better home for the classes here.
-source_set("common") {
-  sources = [
-    "null_term_string_view.h",
-    "string_pool.cc",
-    "string_pool.h",
-  ]
-
-  deps = [
-    "../../gn:default_deps",
-    "../base",
-    "../protozero",
-  ]
-}
-
 if (enable_perfetto_trace_processor_metrics) {  # shell requires metrics.
   perfetto_host_executable("trace_processor_shell") {
     deps = [
@@ -431,15 +415,12 @@
     "importers/proto/args_table_utils_unittest.cc",
     "importers/proto/proto_trace_parser_unittest.cc",
     "importers/systrace/systrace_parser_unittest.cc",
-    "null_term_string_view_unittest.cc",
     "process_tracker_unittest.cc",
     "protozero_to_text_unittests.cc",
     "slice_tracker_unittest.cc",
-    "string_pool_unittest.cc",
     "trace_sorter_unittest.cc",
   ]
   deps = [
-    ":common",
     ":descriptors",
     ":protozero_to_text",
     ":storage_full",
diff --git a/src/trace_processor/containers/BUILD.gn b/src/trace_processor/containers/BUILD.gn
index c6c5d73..32e0d28 100644
--- a/src/trace_processor/containers/BUILD.gn
+++ b/src/trace_processor/containers/BUILD.gn
@@ -20,15 +20,18 @@
     "bit_vector.h",
     "bit_vector_iterators.cc",
     "bit_vector_iterators.h",
+    "null_term_string_view.h",
     "row_map.cc",
     "row_map.h",
     "sparse_vector.h",
+    "string_pool.cc",
+    "string_pool.h",
   ]
   deps = [
-    "../:common",
     "../../../gn:default_deps",
     "../../../include/perfetto/base",
     "../../../include/perfetto/ext/base",
+    "../../../include/perfetto/protozero",
   ]
 }
 
@@ -36,8 +39,10 @@
   testonly = true
   sources = [
     "bit_vector_unittest.cc",
+    "null_term_string_view_unittest.cc",
     "row_map_unittest.cc",
     "sparse_vector_unittest.cc",
+    "string_pool_unittest.cc",
   ]
   deps = [
     ":containers",
diff --git a/src/trace_processor/null_term_string_view.h b/src/trace_processor/containers/null_term_string_view.h
similarity index 91%
rename from src/trace_processor/null_term_string_view.h
rename to src/trace_processor/containers/null_term_string_view.h
index f576006..5ae5a29 100644
--- a/src/trace_processor/null_term_string_view.h
+++ b/src/trace_processor/containers/null_term_string_view.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef SRC_TRACE_PROCESSOR_NULL_TERM_STRING_VIEW_H_
-#define SRC_TRACE_PROCESSOR_NULL_TERM_STRING_VIEW_H_
+#ifndef SRC_TRACE_PROCESSOR_CONTAINERS_NULL_TERM_STRING_VIEW_H_
+#define SRC_TRACE_PROCESSOR_CONTAINERS_NULL_TERM_STRING_VIEW_H_
 
 #include "perfetto/ext/base/string_view.h"
 
@@ -57,4 +57,4 @@
 }  // namespace trace_processor
 }  // namespace perfetto
 
-#endif  // SRC_TRACE_PROCESSOR_NULL_TERM_STRING_VIEW_H_
+#endif  // SRC_TRACE_PROCESSOR_CONTAINERS_NULL_TERM_STRING_VIEW_H_
diff --git a/src/trace_processor/null_term_string_view_unittest.cc b/src/trace_processor/containers/null_term_string_view_unittest.cc
similarity index 97%
rename from src/trace_processor/null_term_string_view_unittest.cc
rename to src/trace_processor/containers/null_term_string_view_unittest.cc
index c8cc29e..eb4d23f 100644
--- a/src/trace_processor/null_term_string_view_unittest.cc
+++ b/src/trace_processor/containers/null_term_string_view_unittest.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "src/trace_processor/null_term_string_view.h"
+#include "src/trace_processor/containers/null_term_string_view.h"
 
 #include "test/gtest_and_gmock.h"
 
diff --git a/src/trace_processor/string_pool.cc b/src/trace_processor/containers/string_pool.cc
similarity index 98%
rename from src/trace_processor/string_pool.cc
rename to src/trace_processor/containers/string_pool.cc
index 1a45e27..020de1c 100644
--- a/src/trace_processor/string_pool.cc
+++ b/src/trace_processor/containers/string_pool.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "src/trace_processor/string_pool.h"
+#include "src/trace_processor/containers/string_pool.h"
 
 #include <limits>
 
diff --git a/src/trace_processor/string_pool.h b/src/trace_processor/containers/string_pool.h
similarity index 96%
rename from src/trace_processor/string_pool.h
rename to src/trace_processor/containers/string_pool.h
index d632764..bdfc39f 100644
--- a/src/trace_processor/string_pool.h
+++ b/src/trace_processor/containers/string_pool.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef SRC_TRACE_PROCESSOR_STRING_POOL_H_
-#define SRC_TRACE_PROCESSOR_STRING_POOL_H_
+#ifndef SRC_TRACE_PROCESSOR_CONTAINERS_STRING_POOL_H_
+#define SRC_TRACE_PROCESSOR_CONTAINERS_STRING_POOL_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -26,7 +26,7 @@
 #include "perfetto/ext/base/optional.h"
 #include "perfetto/ext/base/paged_memory.h"
 #include "perfetto/protozero/proto_utils.h"
-#include "src/trace_processor/null_term_string_view.h"
+#include "src/trace_processor/containers/null_term_string_view.h"
 
 namespace perfetto {
 namespace trace_processor {
@@ -250,4 +250,4 @@
 
 }  // namespace std
 
-#endif  // SRC_TRACE_PROCESSOR_STRING_POOL_H_
+#endif  // SRC_TRACE_PROCESSOR_CONTAINERS_STRING_POOL_H_
diff --git a/src/trace_processor/string_pool_unittest.cc b/src/trace_processor/containers/string_pool_unittest.cc
similarity index 98%
rename from src/trace_processor/string_pool_unittest.cc
rename to src/trace_processor/containers/string_pool_unittest.cc
index 9021f01..0144d7c 100644
--- a/src/trace_processor/string_pool_unittest.cc
+++ b/src/trace_processor/containers/string_pool_unittest.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "src/trace_processor/string_pool.h"
+#include "src/trace_processor/containers/string_pool.h"
 
 #include <random>
 
diff --git a/src/trace_processor/db/BUILD.gn b/src/trace_processor/db/BUILD.gn
index 73373e8..be92403 100644
--- a/src/trace_processor/db/BUILD.gn
+++ b/src/trace_processor/db/BUILD.gn
@@ -24,7 +24,6 @@
     "typed_column.h",
   ]
   deps = [
-    "../:common",
     "../../../gn:default_deps",
     "../../../include/perfetto/base",
     "../../../include/perfetto/ext/base",
diff --git a/src/trace_processor/db/column.h b/src/trace_processor/db/column.h
index d4e600a..0c411dd 100644
--- a/src/trace_processor/db/column.h
+++ b/src/trace_processor/db/column.h
@@ -24,8 +24,8 @@
 #include "perfetto/trace_processor/basic_types.h"
 #include "src/trace_processor/containers/row_map.h"
 #include "src/trace_processor/containers/sparse_vector.h"
+#include "src/trace_processor/containers/string_pool.h"
 #include "src/trace_processor/db/compare.h"
-#include "src/trace_processor/string_pool.h"
 
 namespace perfetto {
 namespace trace_processor {
diff --git a/src/trace_processor/db/table.h b/src/trace_processor/db/table.h
index cc3a3d8..1b85a26 100644
--- a/src/trace_processor/db/table.h
+++ b/src/trace_processor/db/table.h
@@ -25,8 +25,8 @@
 
 #include "perfetto/base/logging.h"
 #include "perfetto/ext/base/optional.h"
+#include "src/trace_processor/containers/string_pool.h"
 #include "src/trace_processor/db/column.h"
-#include "src/trace_processor/string_pool.h"
 
 namespace perfetto {
 namespace trace_processor {
diff --git a/src/trace_processor/metadata.h b/src/trace_processor/metadata.h
index 8965052..aad028f 100644
--- a/src/trace_processor/metadata.h
+++ b/src/trace_processor/metadata.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 
-#include "src/trace_processor/string_pool.h"
+#include "src/trace_processor/containers/string_pool.h"
 #include "src/trace_processor/variadic.h"
 
 namespace perfetto {
diff --git a/src/trace_processor/tables/BUILD.gn b/src/trace_processor/tables/BUILD.gn
index 3b9fa44..b87d011 100644
--- a/src/trace_processor/tables/BUILD.gn
+++ b/src/trace_processor/tables/BUILD.gn
@@ -24,7 +24,6 @@
     "track_tables.h",
   ]
   deps = [
-    "..:common",
     "../../../gn:default_deps",
     "../db:lib",
   ]
diff --git a/src/trace_processor/tables/track_tables.h b/src/trace_processor/tables/track_tables.h
index 9048d66..29c3041 100644
--- a/src/trace_processor/tables/track_tables.h
+++ b/src/trace_processor/tables/track_tables.h
@@ -17,7 +17,6 @@
 #ifndef SRC_TRACE_PROCESSOR_TABLES_TRACK_TABLES_H_
 #define SRC_TRACE_PROCESSOR_TABLES_TRACK_TABLES_H_
 
-#include "src/trace_processor/string_pool.h"
 #include "src/trace_processor/tables/macros.h"
 
 namespace perfetto {
diff --git a/src/trace_processor/trace_storage.h b/src/trace_processor/trace_storage.h
index 56c92a0..a006864 100644
--- a/src/trace_processor/trace_storage.h
+++ b/src/trace_processor/trace_storage.h
@@ -32,10 +32,10 @@
 #include "perfetto/ext/base/string_view.h"
 #include "perfetto/ext/base/utils.h"
 #include "perfetto/trace_processor/basic_types.h"
+#include "src/trace_processor/containers/string_pool.h"
 #include "src/trace_processor/ftrace_utils.h"
 #include "src/trace_processor/metadata.h"
 #include "src/trace_processor/stats.h"
-#include "src/trace_processor/string_pool.h"
 #include "src/trace_processor/tables/counter_tables.h"
 #include "src/trace_processor/tables/profiler_tables.h"
 #include "src/trace_processor/tables/slice_tables.h"
diff --git a/src/trace_processor/variadic.h b/src/trace_processor/variadic.h
index 6df011e..0444721 100644
--- a/src/trace_processor/variadic.h
+++ b/src/trace_processor/variadic.h
@@ -17,7 +17,7 @@
 #ifndef SRC_TRACE_PROCESSOR_VARIADIC_H_
 #define SRC_TRACE_PROCESSOR_VARIADIC_H_
 
-#include "src/trace_processor/string_pool.h"
+#include "src/trace_processor/containers/string_pool.h"
 
 namespace perfetto {
 namespace trace_processor {