diff --git a/uefi-raw/src/lib.rs b/uefi-raw/src/lib.rs
index 1eab855a2..eb30fab77 100644
--- a/uefi-raw/src/lib.rs
+++ b/uefi-raw/src/lib.rs
@@ -22,7 +22,6 @@
     unused
 )]
 
-#[macro_use]
 mod enums;
 
 pub mod capsule;
diff --git a/uefi-raw/src/protocol/ata.rs b/uefi-raw/src/protocol/ata.rs
index 5d7c2b1c5..e1f977f8d 100644
--- a/uefi-raw/src/protocol/ata.rs
+++ b/uefi-raw/src/protocol/ata.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use super::device_path::DevicePathProtocol;
-use crate::{Event, Status};
+use crate::{Event, Status, newtype_enum};
 use core::ffi::c_void;
 use uguid::{Guid, guid};
 
diff --git a/uefi-raw/src/protocol/console.rs b/uefi-raw/src/protocol/console.rs
index f31da8a24..7f5e92bf9 100644
--- a/uefi-raw/src/protocol/console.rs
+++ b/uefi-raw/src/protocol/console.rs
@@ -2,7 +2,7 @@
 
 pub mod serial;
 
-use crate::{Boolean, Char16, Event, Guid, PhysicalAddress, Status, guid};
+use crate::{Boolean, Char16, Event, Guid, PhysicalAddress, Status, guid, newtype_enum};
 use bitflags::bitflags;
 use core::ptr;
 
diff --git a/uefi-raw/src/protocol/console/serial.rs b/uefi-raw/src/protocol/console/serial.rs
index 675f5570d..73ca62ccc 100644
--- a/uefi-raw/src/protocol/console/serial.rs
+++ b/uefi-raw/src/protocol/console/serial.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Guid, Status, guid};
+use crate::{Guid, Status, guid, newtype_enum};
 use bitflags::bitflags;
 
 bitflags! {
diff --git a/uefi-raw/src/protocol/device_path.rs b/uefi-raw/src/protocol/device_path.rs
index f27985b55..95c5fdbce 100644
--- a/uefi-raw/src/protocol/device_path.rs
+++ b/uefi-raw/src/protocol/device_path.rs
@@ -42,7 +42,7 @@
 
 mod device_path_gen;
 
-use crate::{Boolean, Char16, Guid, guid};
+use crate::{Boolean, Char16, Guid, guid, newtype_enum};
 
 pub use device_path_gen::{acpi, bios_boot_spec, end, hardware, media, messaging};
 
diff --git a/uefi-raw/src/protocol/device_path/device_path_gen.rs b/uefi-raw/src/protocol/device_path/device_path_gen.rs
index 825a27929..8082807e3 100644
--- a/uefi-raw/src/protocol/device_path/device_path_gen.rs
+++ b/uefi-raw/src/protocol/device_path/device_path_gen.rs
@@ -10,7 +10,7 @@
 #![allow(missing_debug_implementations)]
 use crate::protocol::device_path;
 use crate::table::boot::MemoryType;
-use crate::{Guid, IpAddress, guid};
+use crate::{Guid, IpAddress, guid, newtype_enum};
 use bitflags::bitflags;
 use device_path::DevicePathProtocol as DevicePathHeader;
 #[cfg(doc)]
diff --git a/uefi-raw/src/protocol/file_system.rs b/uefi-raw/src/protocol/file_system.rs
index f6d1cb403..54046418c 100644
--- a/uefi-raw/src/protocol/file_system.rs
+++ b/uefi-raw/src/protocol/file_system.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::time::Time;
-use crate::{Boolean, Char16, Event, Guid, Status, guid};
+use crate::{Boolean, Char16, Event, Guid, Status, guid, newtype_enum};
 use bitflags::bitflags;
 use core::ffi::c_void;
 
diff --git a/uefi-raw/src/protocol/firmware_volume.rs b/uefi-raw/src/protocol/firmware_volume.rs
index 9184700f1..133a50074 100644
--- a/uefi-raw/src/protocol/firmware_volume.rs
+++ b/uefi-raw/src/protocol/firmware_volume.rs
@@ -2,7 +2,7 @@
 
 use crate::firmware_storage::FirmwareVolumeAttributes;
 use crate::protocol::block::Lba;
-use crate::{Guid, Handle, PhysicalAddress, Status, guid};
+use crate::{Guid, Handle, PhysicalAddress, Status, guid, newtype_enum};
 use core::ffi::c_void;
 use core::ops::RangeInclusive;
 
diff --git a/uefi-raw/src/protocol/hii/config.rs b/uefi-raw/src/protocol/hii/config.rs
index eb3a50a0e..228f8026c 100644
--- a/uefi-raw/src/protocol/hii/config.rs
+++ b/uefi-raw/src/protocol/hii/config.rs
@@ -4,7 +4,7 @@
 
 use core::fmt::Debug;
 
-use crate::{Char16, Guid, Status, guid};
+use crate::{Char16, Guid, Status, guid, newtype_enum};
 
 /// EFI_CONFIG_KEYWORD_HANDLER_PROTOCOL
 #[derive(Debug)]
diff --git a/uefi-raw/src/protocol/hii/database.rs b/uefi-raw/src/protocol/hii/database.rs
index a701f9914..2ad0e3579 100644
--- a/uefi-raw/src/protocol/hii/database.rs
+++ b/uefi-raw/src/protocol/hii/database.rs
@@ -3,7 +3,7 @@
 //! Bindings for HII Database Protocol
 
 use super::{HiiHandle, HiiPackageHeader, HiiPackageListHeader, KeyDescriptor};
-use crate::{Guid, Handle, Status, guid};
+use crate::{Guid, Handle, Status, guid, newtype_enum};
 
 /// EFI_HII_KEYBOARD_LAYOUT
 #[derive(Debug)]
diff --git a/uefi-raw/src/protocol/hii/mod.rs b/uefi-raw/src/protocol/hii/mod.rs
index 25d68300e..2df1f6a55 100644
--- a/uefi-raw/src/protocol/hii/mod.rs
+++ b/uefi-raw/src/protocol/hii/mod.rs
@@ -5,7 +5,7 @@
 pub mod config;
 pub mod database;
 
-use crate::{Char16, Guid};
+use crate::{Char16, Guid, newtype_enum};
 
 pub type HiiHandle = *mut core::ffi::c_void;
 
diff --git a/uefi-raw/src/protocol/network/dhcp4.rs b/uefi-raw/src/protocol/network/dhcp4.rs
index c8ee47098..95d3b8caa 100644
--- a/uefi-raw/src/protocol/network/dhcp4.rs
+++ b/uefi-raw/src/protocol/network/dhcp4.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Boolean, Char8, Event, Guid, Ipv4Address, MacAddress, Status, guid};
+use crate::{Boolean, Char8, Event, Guid, Ipv4Address, MacAddress, Status, guid, newtype_enum};
 use core::ffi::c_void;
 
 newtype_enum! {
diff --git a/uefi-raw/src/protocol/network/http.rs b/uefi-raw/src/protocol/network/http.rs
index 115f5fe18..9783c729d 100644
--- a/uefi-raw/src/protocol/network/http.rs
+++ b/uefi-raw/src/protocol/network/http.rs
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Boolean, Char8, Char16, Event, Guid, Ipv4Address, Ipv6Address, Status, guid};
+use crate::{
+    Boolean, Char8, Char16, Event, Guid, Ipv4Address, Ipv6Address, Status, guid, newtype_enum,
+};
 use core::ffi::c_void;
 use core::fmt::{self, Debug, Formatter};
 use core::ptr;
diff --git a/uefi-raw/src/protocol/network/ip4_config2.rs b/uefi-raw/src/protocol/network/ip4_config2.rs
index 2bed6937d..a4027f890 100644
--- a/uefi-raw/src/protocol/network/ip4_config2.rs
+++ b/uefi-raw/src/protocol/network/ip4_config2.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::protocol::network::ip4::Ip4RouteTable;
-use crate::{Char16, Event, Guid, Ipv4Address, MacAddress, Status, guid};
+use crate::{Char16, Event, Guid, Ipv4Address, MacAddress, Status, guid, newtype_enum};
 use core::ffi::c_void;
 
 newtype_enum! {
diff --git a/uefi-raw/src/protocol/network/pxe.rs b/uefi-raw/src/protocol/network/pxe.rs
index 15d1a39b6..0c99c378f 100644
--- a/uefi-raw/src/protocol/network/pxe.rs
+++ b/uefi-raw/src/protocol/network/pxe.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Boolean, Char8, Guid, IpAddress, MacAddress, Status, guid};
+use crate::{Boolean, Char8, Guid, IpAddress, MacAddress, Status, guid, newtype_enum};
 use bitflags::bitflags;
 use core::ffi::c_void;
 use core::fmt::{self, Debug, Formatter};
diff --git a/uefi-raw/src/protocol/network/snp.rs b/uefi-raw/src/protocol/network/snp.rs
index 744cacd50..5192dbb9a 100644
--- a/uefi-raw/src/protocol/network/snp.rs
+++ b/uefi-raw/src/protocol/network/snp.rs
@@ -4,7 +4,7 @@ use core::ffi;
 
 use bitflags::bitflags;
 
-use crate::{Boolean, Event, Guid, IpAddress, MacAddress, Status, guid};
+use crate::{Boolean, Event, Guid, IpAddress, MacAddress, Status, guid, newtype_enum};
 
 #[derive(Debug)]
 #[repr(C)]
diff --git a/uefi-raw/src/protocol/network/tls.rs b/uefi-raw/src/protocol/network/tls.rs
index fc7c7f569..e94f9ed86 100644
--- a/uefi-raw/src/protocol/network/tls.rs
+++ b/uefi-raw/src/protocol/network/tls.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use crate::{Guid, Status, guid};
+use crate::{Guid, Status, guid, newtype_enum};
 use core::ffi::c_void;
 
 newtype_enum! {
diff --git a/uefi-raw/src/protocol/nvme.rs b/uefi-raw/src/protocol/nvme.rs
index f599e6b05..876a7841b 100644
--- a/uefi-raw/src/protocol/nvme.rs
+++ b/uefi-raw/src/protocol/nvme.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use super::device_path::DevicePathProtocol;
-use crate::Status;
+use crate::{Status, newtype_enum};
 use core::ffi::c_void;
 use uguid::{Guid, guid};
 
diff --git a/uefi-raw/src/protocol/pci/root_bridge.rs b/uefi-raw/src/protocol/pci/root_bridge.rs
index a1b66872f..a58ffe6a6 100644
--- a/uefi-raw/src/protocol/pci/root_bridge.rs
+++ b/uefi-raw/src/protocol/pci/root_bridge.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use crate::table::boot::{AllocateType, MemoryType};
-use crate::{Handle, PhysicalAddress, Status};
+use crate::{Handle, PhysicalAddress, Status, newtype_enum};
 use core::ffi::c_void;
 use uguid::{Guid, guid};
 
diff --git a/uefi-raw/src/protocol/rng.rs b/uefi-raw/src/protocol/rng.rs
index 40984f051..30ece5693 100644
--- a/uefi-raw/src/protocol/rng.rs
+++ b/uefi-raw/src/protocol/rng.rs
@@ -2,7 +2,7 @@
 
 //! `Rng` protocol.
 
-use crate::{Guid, Status, guid};
+use crate::{Guid, Status, guid, newtype_enum};
 
 newtype_enum! {
     /// The algorithms listed are optional, not meant to be exhaustive
diff --git a/uefi-raw/src/protocol/scsi.rs b/uefi-raw/src/protocol/scsi.rs
index 2ca555d53..69fd70ad7 100644
--- a/uefi-raw/src/protocol/scsi.rs
+++ b/uefi-raw/src/protocol/scsi.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use super::device_path::DevicePathProtocol;
-use crate::{Event, Guid, Status, guid};
+use crate::{Event, Guid, Status, guid, newtype_enum};
 use core::ffi::c_void;
 
 pub const SCSI_TARGET_MAX_BYTES: usize = 0x10;
diff --git a/uefi-raw/src/protocol/tcg/enums.rs b/uefi-raw/src/protocol/tcg/enums.rs
index 98ee8bcaa..f12511049 100644
--- a/uefi-raw/src/protocol/tcg/enums.rs
+++ b/uefi-raw/src/protocol/tcg/enums.rs
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+use crate::newtype_enum;
+
 newtype_enum! {
     /// Algorithm identifiers.
     ///
diff --git a/uefi-raw/src/protocol/usb/host_controller.rs b/uefi-raw/src/protocol/usb/host_controller.rs
index b363933e1..ee3a670b2 100644
--- a/uefi-raw/src/protocol/usb/host_controller.rs
+++ b/uefi-raw/src/protocol/usb/host_controller.rs
@@ -4,7 +4,7 @@ use core::ffi;
 
 use bitflags::bitflags;
 
-use crate::{Boolean, Guid, Status, guid};
+use crate::{Boolean, Guid, Status, guid, newtype_enum};
 
 use super::{AsyncUsbTransferCallback, DataDirection, DeviceRequest, UsbTransferStatus};
 
diff --git a/uefi-raw/src/protocol/usb/mod.rs b/uefi-raw/src/protocol/usb/mod.rs
index cd08ee86e..42aa9574d 100644
--- a/uefi-raw/src/protocol/usb/mod.rs
+++ b/uefi-raw/src/protocol/usb/mod.rs
@@ -4,7 +4,7 @@ use core::ffi;
 
 use bitflags::bitflags;
 
-use crate::Status;
+use crate::{Status, newtype_enum};
 
 pub mod host_controller;
 pub mod io;
diff --git a/uefi-raw/src/status.rs b/uefi-raw/src/status.rs
index 58c71d8f9..70c651280 100644
--- a/uefi-raw/src/status.rs
+++ b/uefi-raw/src/status.rs
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+use crate::newtype_enum;
 use core::fmt::Debug;
 
 newtype_enum! {
@@ -46,7 +47,7 @@ pub enum Status: usize => {
     WRITE_PROTECTED         = Self::ERROR_BIT |  8,
     /// A resource has run out.
     OUT_OF_RESOURCES        = Self::ERROR_BIT |  9,
-    /// An inconstency was detected on the file system.
+    /// An inconsistency was detected on the file system.
     VOLUME_CORRUPTED        = Self::ERROR_BIT | 10,
     /// There is no more space on the file system.
     VOLUME_FULL             = Self::ERROR_BIT | 11,
diff --git a/uefi-raw/src/table/boot.rs b/uefi-raw/src/table/boot.rs
index a9932161c..d251df601 100644
--- a/uefi-raw/src/table/boot.rs
+++ b/uefi-raw/src/table/boot.rs
@@ -4,7 +4,9 @@
 
 use crate::protocol::device_path::DevicePathProtocol;
 use crate::table::Header;
-use crate::{Boolean, Char16, Event, Guid, Handle, PhysicalAddress, Status, VirtualAddress};
+use crate::{
+    Boolean, Char16, Event, Guid, Handle, PhysicalAddress, Status, VirtualAddress, newtype_enum,
+};
 use bitflags::bitflags;
 use core::ffi::c_void;
 use core::ops::RangeInclusive;
diff --git a/uefi-raw/src/table/runtime.rs b/uefi-raw/src/table/runtime.rs
index 2738e5b8e..4d1f74774 100644
--- a/uefi-raw/src/table/runtime.rs
+++ b/uefi-raw/src/table/runtime.rs
@@ -6,7 +6,7 @@ use crate::capsule::CapsuleHeader;
 use crate::table::Header;
 use crate::table::boot::MemoryDescriptor;
 use crate::time::Time;
-use crate::{Boolean, Char16, Guid, PhysicalAddress, Status, guid};
+use crate::{Boolean, Char16, Guid, PhysicalAddress, Status, guid, newtype_enum};
 use bitflags::bitflags;
 use core::ffi::c_void;
 
diff --git a/uefi/src/data_types/mod.rs b/uefi/src/data_types/mod.rs
index 0f36ce52d..a2569db24 100644
--- a/uefi/src/data_types/mod.rs
+++ b/uefi/src/data_types/mod.rs
@@ -117,7 +117,7 @@ pub trait Align {
     /// this will return 7. Returns 0 if `val == 0`.
     #[must_use]
     fn offset_up_to_alignment(val: usize) -> usize {
-        assert!(Self::alignment() != 0);
+        assert_ne!(Self::alignment(), 0);
         let r = val % Self::alignment();
         if r == 0 { 0 } else { Self::alignment() - r }
     }
@@ -169,7 +169,9 @@ pub use strs::{
     UnalignedCStr16Error,
 };
 
-/// These functions are used in the implementation of the [`cstr8`] macro.
+/// These functions are used in the implementation of the [`cstr8!`] macro.
+///
+/// [`cstr8!`]: crate::cstr8
 #[doc(hidden)]
 pub use strs::{str_num_latin1_chars, str_to_latin1};
 
diff --git a/xtask/src/device_path/mod.rs b/xtask/src/device_path/mod.rs
index b96f8516a..386768a46 100644
--- a/xtask/src/device_path/mod.rs
+++ b/xtask/src/device_path/mod.rs
@@ -54,7 +54,7 @@ fn gen_uefi_raw_code_as_string(groups: &[NodeGroup]) -> Result<String> {
         use bitflags::bitflags;
         use crate::protocol::device_path;
         use crate::table::boot::MemoryType;
-        use crate::{Guid, IpAddress, guid};
+        use crate::{Guid, IpAddress, guid, newtype_enum};
         use device_path::DevicePathProtocol as DevicePathHeader;
         #[cfg(doc)]
         use device_path::DeviceType;