3 files changed, 4 insertions, 4 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 5bc4d1c2f9..242d29762c 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -53,7 +53,7 @@ struct device_operations {
 	void (*disable)(device_t dev);
 	void (*set_link)(device_t dev, unsigned int link);
 	void (*reset_bus)(struct bus *bus);
-#if CONFIG_GENERATE_SMBIOS_TABLES
+#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
 	int (*get_smbios_data)(device_t dev, int *handle,
 		unsigned long *current);
 	void (*get_smbios_strings)(device_t dev, struct smbios_type11 *t);
@@ -163,7 +163,7 @@ extern struct bus	*free_links;
 
 extern const char mainboard_name[];
 
-#if CONFIG_GFXUMA
+#if IS_ENABLED(CONFIG_GFXUMA)
 /* IGD UMA memory */
 extern uint64_t uma_memory_base;
 extern uint64_t uma_memory_size;
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index a04fc10677..0f2d2bde00 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -15,7 +15,7 @@
 #ifndef PCI_H
 #define PCI_H
 
-#if CONFIG_PCI
+#if IS_ENABLED(CONFIG_PCI)
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h
index 1eb3cd025a..48178c8e1f 100644
--- a/src/include/device/pci_ehci.h
+++ b/src/include/device/pci_ehci.h
@@ -29,7 +29,7 @@ void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port);
 void pci_ehci_dbg_enable(pci_devfn_t dev, unsigned long base);
 
 #ifndef __PRE_RAM__
-#if !CONFIG_USBDEBUG
+#if !IS_ENABLED(CONFIG_USBDEBUG)
 #define pci_ehci_read_resources pci_dev_read_resources
 #else
 /* Relocation of EHCI Debug Port BAR