diff --git a/src/components/logic/mod.rs b/src/components/logic/mod.rs
index 91f8bf7f..06e598bb 100644
--- a/src/components/logic/mod.rs
+++ b/src/components/logic/mod.rs
@@ -1,3 +1,19 @@
-mod constants;
-pub(crate) mod read;
-pub(crate) mod write;
+#[cfg(any(feature = "format-opus", feature = "format-vorbis", feature = "format-riff"))]
+pub(crate) mod constants;
+
+#[cfg(any(feature = "format-opus", feature = "format-vorbis"))]
+mod crc;
+#[cfg(any(feature = "format-opus", feature = "format-vorbis"))]
+pub(crate) mod ogg_generic;
+
+#[cfg(feature = "format-opus")]
+pub(crate) mod opus;
+
+#[cfg(feature = "format-vorbis")]
+pub(crate) mod vorbis;
+
+#[cfg(feature = "format-flac")]
+pub(crate) mod flac;
+
+#[cfg(feature = "format-riff")]
+pub(crate) mod riff;
diff --git a/src/components/tags/mod.rs b/src/components/tags/mod.rs
index eaf1ba58..9cf3a79a 100644
--- a/src/components/tags/mod.rs
+++ b/src/components/tags/mod.rs
@@ -1,17 +1,29 @@
+#[cfg(feature = "format-ape")]
 pub(crate) mod ape_tag;
-pub(crate) mod id3_tag;
-pub(crate) mod mp4_tag;
-pub(crate) mod riff_tag;
-pub(crate) mod vorbis_tag;
-
 #[cfg(feature = "format-ape")]
 pub use ape_tag::ApeTag;
+
+#[cfg(feature = "format-id3")]
+pub(crate) mod id3_tag;
 #[cfg(feature = "format-id3")]
 pub use id3_tag::Id3v2Tag;
+
+#[cfg(feature = "format-mp4")]
+pub(crate) mod mp4_tag;
 #[cfg(feature = "format-mp4")]
 pub use mp4_tag::Mp4Tag;
+
+#[cfg(feature = "format-riff")]
+pub(crate) mod riff_tag;
 #[cfg(feature = "format-riff")]
 pub use riff_tag::RiffTag;
+
+#[cfg(any(
+	feature = "format-vorbis",
+	feature = "format-opus",
+	feature = "format-flac"
+))]
+pub(crate) mod vorbis_tag;
 #[cfg(any(
 	feature = "format-vorbis",
 	feature = "format-opus",