diff --git a/components/spellcheck/common/BUILD.gn b/components/spellcheck/common/BUILD.gn
index cf40a7397..38a16f7 100644
--- a/components/spellcheck/common/BUILD.gn
+++ b/components/spellcheck/common/BUILD.gn
@@ -11,16 +11,13 @@
     "spellcheck_common.h",
     "spellcheck_features.cc",
     "spellcheck_features.h",
-    "spellcheck_result.cc",
-    "spellcheck_result.h",
-    "spellcheck_struct_traits.cc",
-    "spellcheck_struct_traits.h",
     "spellcheck_switches.cc",
     "spellcheck_switches.h",
   ]
 
   public_deps = [
     ":interfaces",
+    ":spellcheck_result",
     "//components/spellcheck:buildflags",
   ]
 
@@ -31,6 +28,19 @@
   ]
 }
 
+# This is separated out because it is used by both the mojo interfaces below
+# (see spellcheck.typemap) and by "common" above.
+source_set("spellcheck_result") {
+  sources = [
+    "spellcheck_result.cc",
+    "spellcheck_result.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}
+
 mojom("interfaces") {
   sources = [
     "spellcheck.mojom",
diff --git a/components/spellcheck/common/spellcheck.typemap b/components/spellcheck/common/spellcheck.typemap
index 42e0739..fa84bd42 100644
--- a/components/spellcheck/common/spellcheck.typemap
+++ b/components/spellcheck/common/spellcheck.typemap
@@ -12,6 +12,15 @@
   "//components/spellcheck:buildflags",
 ]
 
+public_deps = [
+  ":spellcheck_result",
+]
+
+sources = [
+  "spellcheck_struct_traits.cc",
+  "spellcheck_struct_traits.h",
+]
+
 type_mappings = [
   "spellcheck.mojom.Decoration=::SpellCheckResult::Decoration",
   "spellcheck.mojom.SpellCheckResult=::SpellCheckResult",