diff --git a/devices/src/debug_console.rs b/devices/src/debug_console.rs
index 7945edb00..49f6e132a 100644
--- a/devices/src/debug_console.rs
+++ b/devices/src/debug_console.rs
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-//! Module for [`DebugconState`].
+//! Module for [`DebugConsole`].
 
 use std::io;
 use std::io::Write;
@@ -16,9 +16,6 @@ use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottabl
 /// I/O-port.
 pub const DEFAULT_PORT: u64 = 0xe9;
 
-#[derive(Default)]
-pub struct DebugconState {}
-
 /// Emulates a debug console similar to the QEMU debugcon device. This device
 /// is stateless and only prints the bytes (usually text) that are written to
 /// it.
diff --git a/devices/src/interrupt_controller.rs b/devices/src/interrupt_controller.rs
index 8aec2810f..5250994c0 100644
--- a/devices/src/interrupt_controller.rs
+++ b/devices/src/interrupt_controller.rs
@@ -54,25 +54,6 @@ pub enum Error {
 
 type Result<T> = result::Result<T, Error>;
 
-pub struct MsiMessage {
-    // Message Address Register
-    //   31-20: Base address. Fixed value (0x0FEE)
-    //   19-12: Destination ID
-    //   11-4:  Reserved
-    //   3:     Redirection Hint indication
-    //   2:     Destination Mode
-    //   1-0:   Reserved
-    pub addr: u32,
-    // Message Data Register
-    //   32-16: Reserved
-    //   15:    Trigger Mode. 0 = Edge, 1 = Level
-    //   14:    Level. 0 = Deassert, 1 = Assert
-    //   13-11: Reserved
-    //   10-8:  Delivery Mode
-    //   7-0:   Vector
-    pub data: u32,
-}
-
 // Introduce trait InterruptController to uniform the interrupt
 // service provided for devices.
 // Device manager uses this trait without caring whether it is a