diff --git a/cranelift/codegen/meta/src/isa/arm32/mod.rs b/cranelift/codegen/meta/src/isa/arm32.rs
similarity index 100%
rename from cranelift/codegen/meta/src/isa/arm32/mod.rs
rename to cranelift/codegen/meta/src/isa/arm32.rs
diff --git a/cranelift/codegen/meta/src/isa/arm64/mod.rs b/cranelift/codegen/meta/src/isa/arm64.rs
similarity index 100%
rename from cranelift/codegen/meta/src/isa/arm64/mod.rs
rename to cranelift/codegen/meta/src/isa/arm64.rs
diff --git a/cranelift/codegen/meta/src/isa/s390x/mod.rs b/cranelift/codegen/meta/src/isa/s390x.rs
similarity index 100%
rename from cranelift/codegen/meta/src/isa/s390x/mod.rs
rename to cranelift/codegen/meta/src/isa/s390x.rs
diff --git a/cranelift/codegen/meta/src/isa/x86/settings.rs b/cranelift/codegen/meta/src/isa/x86.rs
similarity index 95%
rename from cranelift/codegen/meta/src/isa/x86/settings.rs
rename to cranelift/codegen/meta/src/isa/x86.rs
index 824683bbf6..2a63ef147d 100644
--- a/cranelift/codegen/meta/src/isa/x86/settings.rs
+++ b/cranelift/codegen/meta/src/isa/x86.rs
@@ -1,6 +1,15 @@
+use crate::cdsl::isa::TargetIsa;
 use crate::cdsl::settings::{PredicateNode, SettingGroup, SettingGroupBuilder};
 
-pub(crate) fn define(shared: &SettingGroup) -> SettingGroup {
+use crate::shared::Definitions as SharedDefinitions;
+
+pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
+    let settings = define_settings(&shared_defs.settings);
+
+    TargetIsa::new("x86", settings)
+}
+
+pub(crate) fn define_settings(shared: &SettingGroup) -> SettingGroup {
     let mut settings = SettingGroupBuilder::new("x86");
 
     // CPUID.01H:ECX
diff --git a/cranelift/codegen/meta/src/isa/x86/mod.rs b/cranelift/codegen/meta/src/isa/x86/mod.rs
deleted file mode 100644
index b4c670fce7..0000000000
--- a/cranelift/codegen/meta/src/isa/x86/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::cdsl::isa::TargetIsa;
-
-use crate::shared::Definitions as SharedDefinitions;
-
-pub(crate) mod settings;
-
-pub(crate) fn define(shared_defs: &mut SharedDefinitions) -> TargetIsa {
-    let settings = settings::define(&shared_defs.settings);
-
-    TargetIsa::new("x86", settings)
-}
diff --git a/cranelift/codegen/meta/src/lib.rs b/cranelift/codegen/meta/src/lib.rs
index 77fcbc7bf9..d54e490f6c 100644
--- a/cranelift/codegen/meta/src/lib.rs
+++ b/cranelift/codegen/meta/src/lib.rs
@@ -70,7 +70,7 @@ pub fn generate(
                     continue;
                 }
 
-                let settings = crate::isa::x86::settings::define(&shared_defs.settings);
+                let settings = crate::isa::x86::define_settings(&shared_defs.settings);
                 gen_settings::generate(
                     &settings,
                     gen_settings::ParentGroup::Shared,