diff --git a/src/crosvm/cmdline.rs b/src/crosvm/cmdline.rs
index c237a96e3b..3e5101b441 100644
--- a/src/crosvm/cmdline.rs
+++ b/src/crosvm/cmdline.rs
@@ -38,6 +38,7 @@ use devices::virtio::device_constants::video::VideoDeviceConfig;
 #[cfg(feature = "audio")]
 use devices::virtio::snd::parameters::Parameters as SndParameters;
 use devices::virtio::vhost::user::device;
+#[cfg(feature = "gpu")]
 use devices::virtio::GpuParameters;
 use devices::virtio::NetParameters;
 #[cfg(feature = "audio")]
@@ -49,6 +50,7 @@ use devices::StubPciParameters;
 use hypervisor::ProtectionType;
 use resources::AddressRange;
 use serde::Deserialize;
+#[cfg(feature = "gpu")]
 use serde_keyvalue::FromKeyValues;
 #[cfg(feature = "gpu")]
 use vm_control::gpu::DisplayParameters as GpuDisplayParameters;
diff --git a/src/crosvm/sys/unix/config.rs b/src/crosvm/sys/unix/config.rs
index 25430d9bba..c8c4e6a1de 100644
--- a/src/crosvm/sys/unix/config.rs
+++ b/src/crosvm/sys/unix/config.rs
@@ -20,6 +20,7 @@ use devices::SerialParameters;
 use serde::Deserialize;
 use serde::Serialize;
 
+#[cfg(feature = "gpu")]
 use crate::crosvm::cmdline::FixedGpuParameters;
 use crate::crosvm::config::invalid_value_err;
 use crate::crosvm::config::Config;