8 files changed, 16 insertions, 11 deletions
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 066ef3495c..d8ad959f0d 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -113,8 +113,8 @@ TOOLCPPFLAGS += -D_XOPEN_SOURCE=700 # strdup() from string.h
 TOOLCPPFLAGS += -I$(top)/util/cbfstool/flashmap
 TOOLCPPFLAGS += -I$(top)/util/cbfstool
 TOOLCPPFLAGS += -I$(objutil)/cbfstool
-TOOLCPPFLAGS += -I$(top)/src/commonlib/include
-TOOLCPPFLAGS += -include $(top)/src/commonlib/include/commonlib/compiler.h
+TOOLCPPFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include
+TOOLCPPFLAGS += -include $(top)/src/commonlib/bsd/include/commonlib/bsd/compiler.h
 TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/include
 TOOLCPPFLAGS += -I$(VBOOT_SOURCE)/firmware/2lib/include
 # UEFI header file support. It's not pretty, but that's what we currently
@@ -163,6 +163,10 @@ $(objutil)/cbfstool/%.o: $(top)/src/commonlib/%.c
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
 	$(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
 
+$(objutil)/cbfstool/%.o: $(top)/src/commonlib/bsd/%.c
+	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
+	$(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
+
 $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lz4/lib/%.c
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
 	$(HOSTCC) $(TOOLCPPFLAGS) $(TOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 6071437d05..be920b4598 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -26,7 +26,7 @@
 #include "cbfs.h"
 #include "rmodule.h"
 
-#include <commonlib/compression.h>
+#include <commonlib/bsd/compression.h>
 
 /* Checks if program segment contains the ignored section */
 static int is_phdr_ignored(Elf64_Phdr *phdr, Elf64_Shdr *shdr)
diff --git a/util/cbfstool/compress.c b/util/cbfstool/compress.c
index a6a0df4dd1..993809426f 100644
--- a/util/cbfstool/compress.c
+++ b/util/cbfstool/compress.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "common.h"
 #include "lz4/lib/lz4frame.h"
-#include <commonlib/compression.h>
+#include <commonlib/bsd/compression.h>
 
 static int lz4_compress(char *in, int in_len, char *out, int *out_len)
 {
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index 55a4e10402..56445d8ad5 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -20,8 +20,8 @@ INSTALL  ?= /usr/bin/env install
 PREFIX   ?= /usr/local
 CFLAGS   ?= -O2
 CFLAGS   += -Wall -Wextra -Wmissing-prototypes -Werror
-CPPFLAGS += -I . -I $(ROOT)/commonlib/include
-CPPFLAGS += -include commonlib/compiler.h
+CPPFLAGS += -I . -I $(ROOT)/commonlib/include -I $(ROOT)/commonlib/bsd/include
+CPPFLAGS += -include $(ROOT)/commonlib/bsd/include/commonlib/bsd/compiler.h
 
 OBJS = $(PROGRAM).o
 
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index a4f0af6217..50c6c30650 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -19,9 +19,9 @@ CC      = gcc
 INSTALL = /usr/bin/env install
 PREFIX  = /usr/local
 CFLAGS  = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror
-CFLAGS += -I../../src/commonlib/include
+CFLAGS += -I../../src/commonlib/include -I../../src/commonlib/bsd/include
 CFLAGS += -I../cbfstool/flashmap
-CFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h
+CFLAGS += -include ../../src/commonlib/bsd/include/commonlib/bsd/compiler.h
 LDFLAGS =
 
 OBJS = ifdtool.o
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index cd02fa8abe..23ea8a6ee6 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -25,7 +25,8 @@ PREFIX  ?= /usr/local
 CFLAGS  ?= -O2 -g -Wall -Wextra -Wmissing-prototypes
 LDFLAGS += -lpci -lz
 
-CPPFLAGS += -I$(top)/src/commonlib/include
+CPPFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include
+
 
 OBJS = inteltool.o pcr.o cpu.o gpio.o gpio_groups.o rootcmplx.o powermgt.o \
        memory.o pcie.o amb.o ivy_memory.o spi.o gfx.o ahci.o \
diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile
index fb9aadefda..57f2627e49 100644
--- a/util/intelvbttool/Makefile
+++ b/util/intelvbttool/Makefile
@@ -17,7 +17,7 @@ PROGRAM = intelvbttool
 CC ?= gcc
 CFLAGS ?= -O2 -g
 CFLAGS += -Wall -Werror
-CFLAGS += -I../../src/commonlib/include
+CFLAGS += -I../../src/commonlib/include -I ../../src/commonlib/bsd/include
 
 all: $(PROGRAM)
 
diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.inc
index c47b43956d..b821f06f11 100644
--- a/util/sconfig/Makefile.inc
+++ b/util/sconfig/Makefile.inc
@@ -4,7 +4,7 @@ sconfigobj += sconfig.tab.o
 sconfigobj += main.o
 
 SCONFIGFLAGS += -I$(top)/util/sconfig -I$(objutil)/sconfig
-SCONFIGFLAGS += -I$(top)/src/commonlib/include
+SCONFIGFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include
 
 $(objutil)/sconfig:
 	mkdir -p $@