diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 9254de7ad1..d5b29e22f0 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -49,6 +49,7 @@ ifneq ($(V),1)
 Q := @
 endif
 
+CC = gcc
 HOSTCC = gcc
 HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)
diff --git a/payloads/libpayload/util/kconfig/expr.h b/payloads/libpayload/util/kconfig/expr.h
index 9d4cba1c00..25ec05ee3b 100644
--- a/payloads/libpayload/util/kconfig/expr.h
+++ b/payloads/libpayload/util/kconfig/expr.h
@@ -12,7 +12,12 @@ extern "C" {
 
 #include <stdio.h>
 #ifndef __cplusplus
+#ifndef __sun
 #include <stdbool.h>
+#else
+typedef short bool;
+enum { true=1, false=0};
+#endif
 #endif
 
 struct file {
diff --git a/payloads/libpayload/util/kconfig/zconf.tab.c_shipped b/payloads/libpayload/util/kconfig/zconf.tab.c_shipped
index 346c416856..fa47f37133 100644
--- a/payloads/libpayload/util/kconfig/zconf.tab.c_shipped
+++ b/payloads/libpayload/util/kconfig/zconf.tab.c_shipped
@@ -158,7 +158,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"