diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index ee83a0aeca..1da8c64c15 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -34,6 +34,7 @@ CC_real:=$(CC)
 endif
 
 export top := $(CURDIR)
+export coreboottop ?= $(abspath $(top)/../../)
 export src := src
 export srck := $(abspath $(top)/../../util/kconfig)
 export obj ?= build
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
index 8e0a3d6f77..2332517cef 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.inc
@@ -58,6 +58,7 @@ subdirs-$(CONFIG_LP_LZ4) += liblz4
 
 INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj)
 INCLUDES += -include include/kconfig.h -include include/compiler.h
+INCLUDES += -I$(coreboottop)/src/commonlib/bsd/include
 
 CFLAGS += $(INCLUDES) -Os -pipe -nostdinc -ggdb3
 CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer
diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.inc
index ba465b0471..c4463d705a 100644
--- a/payloads/libpayload/tests/Makefile.inc
+++ b/payloads/libpayload/tests/Makefile.inc
@@ -11,8 +11,6 @@ testobj := $(obj)/tests
 endif
 coverage-dir := $(testobj)/coverage_reports
 
-coreboottop := ../../
-
 cmockasrc := $(coreboottop)/3rdparty/cmocka
 cmockaobj := $(objutil)/cmocka
 CMOCKA_LIB := $(cmockaobj)/src/libcmocka.so
@@ -34,6 +32,7 @@ TEST_CONFIG_ := CONFIG_LP_
 # Default includes
 TEST_CFLAGS := -include include/kconfig.h -include include/compiler.h
 TEST_CFLAGS += -Iinclude -Iinclude/mock
+TEST_CFLAGS += -I$(coreboottop)/src/commonlib/bsd/include
 TEST_CFLAGS += -I$(dir $(TEST_KCONFIG_AUTOHEADER))
 
 # Test specific includes