diff --git a/src/app/pci.rs b/src/app/pci.rs
index 21a6464..b2184ad 100644
--- a/src/app/pci.rs
+++ b/src/app/pci.rs
@@ -1,7 +1,6 @@
 use core::{mem, slice};
 use hwio::{Io, Pio};
-use std::prelude::*;
-use std::uefi::guid::GuidKind;
+use std::uefi::guid;
 
 #[allow(dead_code)]
 #[repr(packed)]
@@ -82,8 +81,8 @@ unsafe fn rsdp_mcfg(rsdp: &Rsdp) -> Option<&'static [u8]> {
 
 pub fn pci_mcfg() -> Option<&'static [u8]> {
     for table in std::system_table().config_tables() {
-        match table.VendorGuid.kind() {
-            GuidKind::Acpi | GuidKind::Acpi2 => unsafe {
+        match table.VendorGuid {
+            guid::ACPI_TABLE_GUID | guid::ACPI_20_TABLE_GUID => unsafe {
                 let rsdp = &*(table.VendorTable as *const Rsdp);
                 if let Some(some) = rsdp_mcfg(rsdp) {
                     return Some(some);
diff --git a/src/dmi.rs b/src/dmi.rs
index c2daf21..3f22083 100644
--- a/src/dmi.rs
+++ b/src/dmi.rs
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use core::slice;
-use std::prelude::*;
-use std::uefi::guid::GuidKind;
+use std::uefi::guid;
 
 pub fn dmi() -> Vec<dmi::Table> {
     for table in std::system_table().config_tables() {
-        let data_opt = match table.VendorGuid.kind() {
-            GuidKind::Smbios => unsafe {
+        let data_opt = match table.VendorGuid {
+            guid::SMBIOS_TABLE_GUID => unsafe {
                 let smbios = &*(table.VendorTable as *const dmi::Smbios);
                 //TODO: smbios is_valid fails on bonw14, assume UEFI is right
                 Some(slice::from_raw_parts(
@@ -15,7 +14,7 @@ pub fn dmi() -> Vec<dmi::Table> {
                     smbios.table_length as usize,
                 ))
             },
-            GuidKind::Smbios3 => unsafe {
+            guid::SMBIOS3_TABLE_GUID => unsafe {
                 let smbios = &*(table.VendorTable as *const dmi::Smbios3);
                 //TODO: smbios is_valid fails on bonw14, assume UEFI is right
                 Some(slice::from_raw_parts(