diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c
index 5837400e52..b924092e99 100644
--- a/util/x86emu/biosemu.c
+++ b/util/x86emu/biosemu.c
@@ -36,7 +36,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include <arch/io.h>
 #include <console/console.h>
 #else
diff --git a/util/x86emu/pcbios/pcibios.c b/util/x86emu/pcbios/pcibios.c
index 3ac92a68c1..4bbe565e8b 100644
--- a/util/x86emu/pcbios/pcibios.c
+++ b/util/x86emu/pcbios/pcibios.c
@@ -35,7 +35,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include <console/console.h>
 #else
 #include <console.h>
@@ -65,7 +65,7 @@ int pcibios_handler(void)
 		break;
 	case FIND_PCI_DEVICE:
 		/* FixME: support SI != 0 */
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 		dev = dev_find_device(X86_DX, X86_CX, dev);
 #else
 		dev = dev_find_pci_device(X86_DX, X86_CX, dev);
diff --git a/util/x86emu/vm86.c b/util/x86emu/vm86.c
index 86f856972a..d38ec00984 100644
--- a/util/x86emu/vm86.c
+++ b/util/x86emu/vm86.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <string.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include <console/console.h>
 #include <arch/io.h>
 #define printk(lvl, x...) printk_debug(x)
@@ -591,7 +591,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp,
 		vendorid = *pedx;
 		devindex = *pesi;
 		dev = 0;
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 		while ((dev = dev_find_device(vendorid, devid, dev))) {
 #else
 		while ((dev = dev_find_pci_device(vendorid, devid, dev))) {
diff --git a/util/x86emu/vm86_gdt.c b/util/x86emu/vm86_gdt.c
index 3398f31204..465d913105 100644
--- a/util/x86emu/vm86_gdt.c
+++ b/util/x86emu/vm86_gdt.c
@@ -33,7 +33,7 @@ __asm__ (
 	"	.globl gdtarg\n"
 	"gdtarg:			\n"
 	"	.word	gdt_limit	\n"
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 	"	.long	gdt	       	\n"		
 #else
 	"	.long	gdtptr	       	\n"		
@@ -78,7 +78,7 @@ __asm__ (
 
 	"__mygdt_end:				\n"
 
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 	/* FIXME: This does probably not belong here */
 	"	.globl idtarg\n"
 	"idtarg:\n"
diff --git a/util/x86emu/x86emu/sys.c b/util/x86emu/x86emu/sys.c
index e11f769cd3..76344a1065 100644
--- a/util/x86emu/x86emu/sys.c
+++ b/util/x86emu/x86emu/sys.c
@@ -46,7 +46,7 @@
 #include "debug.h"
 #include "prim_ops.h"
 #if 1 /* Coreboot needs to map prinkf to printk. */
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "arch/io.h"
 #else
 #include "io.h"
diff --git a/util/x86emu/yabel/biosemu.c b/util/x86emu/yabel/biosemu.c
index ca486138ba..27387d04f0 100644
--- a/util/x86emu/yabel/biosemu.c
+++ b/util/x86emu/yabel/biosemu.c
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include <types.h>
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 #include <cpu.h>
 #endif
 
@@ -21,7 +21,7 @@
 
 #include <x86emu/x86emu.h>
 #include <x86emu/regs.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "../x86emu/prim_ops.h"
 #else
 #include <x86emu/prim_ops.h>	// for push_word
@@ -34,7 +34,7 @@
 #include "device.h"
 #include "pmm.h"
 
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "compat/rtas.h"
 #else
 #include <rtas.h>
diff --git a/util/x86emu/yabel/compat/functions.c b/util/x86emu/yabel/compat/functions.c
index 6702dcc76d..2f4e0525b1 100644
--- a/util/x86emu/yabel/compat/functions.c
+++ b/util/x86emu/yabel/compat/functions.c
@@ -14,7 +14,7 @@
  */
 
 #include <types.h>
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 #include <config.h>
 #endif
 #include <device/device.h>
diff --git a/util/x86emu/yabel/debug.c b/util/x86emu/yabel/debug.c
index c3768fcc5a..e3374ba8c8 100644
--- a/util/x86emu/yabel/debug.c
+++ b/util/x86emu/yabel/debug.c
@@ -10,7 +10,7 @@
  *     IBM Corporation - initial implementation
  *****************************************************************************/
 
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 #include <cpu.h>
 #endif
 
diff --git a/util/x86emu/yabel/debug.h b/util/x86emu/yabel/debug.h
index de44c36b76..987029afc6 100644
--- a/util/x86emu/yabel/debug.h
+++ b/util/x86emu/yabel/debug.h
@@ -19,7 +19,7 @@ extern u32 debug_flags;
 extern void x86emu_dump_xregs(void);
 
 /* printf is not available in coreboot... use printk */
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include <console/console.h>
 #else
 #include <console.h>
diff --git a/util/x86emu/yabel/device.c b/util/x86emu/yabel/device.c
index 515531eb0e..82619848e0 100644
--- a/util/x86emu/yabel/device.c
+++ b/util/x86emu/yabel/device.c
@@ -12,7 +12,7 @@
 
 
 #include "device.h"
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "compat/rtas.h"
 #else
 #include "rtas.h"
@@ -396,7 +396,7 @@ biosemu_dev_init(struct device * device)
 {
 	u8 rval = 0;
 	//init bios_device struct
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 	DEBUG_PRINTF("%s\n", __func__);
 #else
 	DEBUG_PRINTF("%s(%s)\n", __func__, device->dtsname);
diff --git a/util/x86emu/yabel/device.h b/util/x86emu/yabel/device.h
index c8e78db886..1dad9e213c 100644
--- a/util/x86emu/yabel/device.h
+++ b/util/x86emu/yabel/device.h
@@ -14,7 +14,7 @@
 #define DEVICE_LIB_H
 
 #include <types.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include <arch/byteorder.h>
 #include "compat/of.h"
 #else
diff --git a/util/x86emu/yabel/interrupt.c b/util/x86emu/yabel/interrupt.c
index 39708984f6..62f8c25b49 100644
--- a/util/x86emu/yabel/interrupt.c
+++ b/util/x86emu/yabel/interrupt.c
@@ -10,7 +10,7 @@
  *     IBM Corporation - initial implementation
  *****************************************************************************/
 
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "compat/rtas.h"
 #else
 #include <rtas.h>
@@ -23,7 +23,7 @@
 #include "pmm.h"
 
 #include <x86emu/x86emu.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "../x86emu/prim_ops.h"
 #else
 #include <x86emu/prim_ops.h>
diff --git a/util/x86emu/yabel/io.c b/util/x86emu/yabel/io.c
index a3d9f40c0c..a69e5e66cd 100644
--- a/util/x86emu/yabel/io.c
+++ b/util/x86emu/yabel/io.c
@@ -11,7 +11,7 @@
  *****************************************************************************/
 
 #include <types.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "compat/rtas.h"
 #include "compat/time.h"
 #else
diff --git a/util/x86emu/yabel/mem.c b/util/x86emu/yabel/mem.c
index af096bf3e5..6e6d403738 100644
--- a/util/x86emu/yabel/mem.c
+++ b/util/x86emu/yabel/mem.c
@@ -11,14 +11,14 @@
  *****************************************************************************/
 
 #include <types.h>
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 #include <cpu.h>
 #endif
 #include "debug.h"
 #include "device.h"
 #include "x86emu/x86emu.h"
 #include "biosemu.h"
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "compat/time.h"
 #else
 #include <time.h>
diff --git a/util/x86emu/yabel/pmm.c b/util/x86emu/yabel/pmm.c
index 0186db92f5..fe7a3f4722 100644
--- a/util/x86emu/yabel/pmm.c
+++ b/util/x86emu/yabel/pmm.c
@@ -10,7 +10,7 @@
  ****************************************************************************/
 
 #include <x86emu/x86emu.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "../x86emu/prim_ops.h"
 #else
 #include <x86emu/prim_ops.h>
diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c
index 5fbf36c63f..5033c543d8 100644
--- a/util/x86emu/yabel/vbe.c
+++ b/util/x86emu/yabel/vbe.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include <types.h>
-#if !COREBOOT_V2
+#ifndef COREBOOT_V2
 #include <cpu.h>
 #endif
 
@@ -20,7 +20,7 @@
 
 #include <x86emu/x86emu.h>
 #include <x86emu/regs.h>
-#if COREBOOT_V2
+#ifdef COREBOOT_V2
 #include "../x86emu/prim_ops.h"
 #else
 #include <x86emu/prim_ops.h>	// for push_word