diff --git a/components/style/binding_tools/regen_atoms.py b/components/style/binding_tools/regen_atoms.py
index d5aff8ecb38..e41ec98b39c 100755
--- a/components/style/binding_tools/regen_atoms.py
+++ b/components/style/binding_tools/regen_atoms.py
@@ -258,7 +258,7 @@ def write_pseudo_element_helper(atoms, target_filename):
 def generate_atoms(dist):
     style_path = os.path.dirname(os.path.dirname(__file__))
     atoms = collect_atoms(dist)
-    write_atom_macro(atoms, os.path.join(style_path, "gecko_string_cache/atom_macro.rs"))
+    write_atom_macro(atoms, os.path.join(style_path, "gecko/generated/atom_macro.rs"))
     write_pseudo_element_helper(atoms, os.path.join(style_path, "gecko/generated/pseudo_element_helper.rs"))
 
 
diff --git a/components/style/gecko_string_cache/atom_macro.rs b/components/style/gecko/generated/atom_macro.rs
similarity index 100%
rename from components/style/gecko_string_cache/atom_macro.rs
rename to components/style/gecko/generated/atom_macro.rs
diff --git a/components/style/gecko_string_cache/mod.rs b/components/style/gecko_string_cache/mod.rs
index 741a4a3e534..45186a30c85 100644
--- a/components/style/gecko_string_cache/mod.rs
+++ b/components/style/gecko_string_cache/mod.rs
@@ -25,7 +25,10 @@ use std::slice;
 
 #[macro_use]
 #[allow(improper_ctypes, non_camel_case_types, missing_docs)]
-pub mod atom_macro;
+pub mod atom_macro {
+    include!("../gecko/generated/atom_macro.rs");
+}
+
 #[macro_use]
 pub mod namespace;
 
diff --git a/servo-tidy.toml b/servo-tidy.toml
index df227bb3afe..18debdc9a49 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -40,7 +40,7 @@ files = [
   "./components/style/gecko/generated/bindings.rs",
   "./components/style/gecko/generated/structs_debug.rs",
   "./components/style/gecko/generated/structs_release.rs",
-  "./components/style/gecko_string_cache/atom_macro.rs",
+  "./components/style/gecko/generated/atom_macro.rs",
   "./resources/hsts_preload.json",
   "./tests/wpt/metadata/MANIFEST.json",
   "./tests/wpt/metadata-css/MANIFEST.json",