diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c
index 81d121a96a..5037011efa 100644
--- a/payloads/libpayload/arch/i386/coreboot.c
+++ b/payloads/libpayload/arch/i386/coreboot.c
@@ -84,7 +84,7 @@ static void cb_parse_version(void *ptr, struct sysinfo_t *info)
 	info->cb_version = (char *)ver->string;
 }
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 static void cb_parse_vbnv(unsigned char *ptr, struct sysinfo_t *info)
 {
 	struct cb_vbnv *vbnv = (struct cb_vbnv *)ptr;
@@ -251,7 +251,7 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
 #endif
 		case CB_TAG_MAINBOARD:
 			info->mainboard = (struct cb_mainboard *)ptr;
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 		case CB_TAG_GPIO:
 			cb_parse_gpios(ptr, info);
 			break;
diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c
index 19ac6628eb..1bac7a8aaa 100644
--- a/payloads/libpayload/arch/i386/main.c
+++ b/payloads/libpayload/arch/i386/main.c
@@ -50,8 +50,9 @@ void start_main(void)
 	lib_get_sysinfo();
 
 	/* Optionally set up the consoles. */
-	if (!CONFIG_SKIP_CONSOLE_INIT)
-		console_init();
+#ifndef CONFIG_SKIP_CONSOLE_INIT
+	console_init();
+#endif
 
 	/*
 	 * Any other system init that has to happen before the
diff --git a/payloads/libpayload/arch/powerpc/main.c b/payloads/libpayload/arch/powerpc/main.c
index 431cac460b..9722e0c0c5 100644
--- a/payloads/libpayload/arch/powerpc/main.c
+++ b/payloads/libpayload/arch/powerpc/main.c
@@ -47,8 +47,9 @@ void start_main(void)
 	extern int main(int argc, char **argv);
 
 	/* Optionally set up the consoles. */
-	if (!CONFIG_SKIP_CONSOLE_INIT)
-		console_init();
+#ifndef CONFIG_SKIP_CONSOLE_INIT
+	console_init();
+#endif
 
 	/* Gather system information. */
 	lib_get_sysinfo();
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index bb5b2eea68..80763f0a46 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -57,7 +57,7 @@ struct sysinfo_t {
 	u32 cmos_range_start;
 	u32 cmos_range_end;
 	u32 cmos_checksum_location;
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	u32 vbnv_start;
 	u32 vbnv_size;
 #endif
@@ -77,7 +77,7 @@ struct sysinfo_t {
 
 	struct cb_framebuffer *framebuffer;
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	int num_gpios;
 	struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
 #endif
@@ -87,7 +87,7 @@ struct sysinfo_t {
 	struct cb_header *header;
 	struct cb_mainboard *mainboard;
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	void	*vdat_addr;
 	u32	vdat_size;
 #endif