diff --git a/src/x86/fam_wrappers.rs b/src/cpuid.rs
similarity index 100%
rename from src/x86/fam_wrappers.rs
rename to src/cpuid.rs
diff --git a/src/lib.rs b/src/lib.rs
index 005808b..40f596f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,6 +7,9 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
+#[cfg(feature = "fam-wrappers")]
+pub mod cpuid;
+
 #[macro_use]
 #[cfg(feature = "fam-wrappers")]
 extern crate vmm_sys_util;
diff --git a/src/x86/mod.rs b/src/x86/mod.rs
index 50b033e..0259d1c 100644
--- a/src/x86/mod.rs
+++ b/src/x86/mod.rs
@@ -5,9 +5,5 @@
 // Keep this until https://github.com/rust-lang/rust-bindgen/issues/1651 is fixed.
 #[cfg_attr(test, allow(deref_nullptr))]
 pub mod bindings;
-#[cfg(feature = "fam-wrappers")]
-pub mod fam_wrappers;
 
 pub use self::bindings::*;
-#[cfg(feature = "fam-wrappers")]
-pub use self::fam_wrappers::*;