Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision d84398a712d42ccaa585aac0dacb41b9a0bd98d3)
+++ boot/Makefile.build	(revision 96521f2f62397b11b7b23251e5a66693fb739e47)
@@ -31,5 +31,5 @@
 include Makefile.common
 
-INCLUDES = generic/include
+INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
 OPTIMIZATION = 3
 
@@ -38,5 +38,5 @@
 LFLAGS = --fatal-warnings
 
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
 	-fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
 	-finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -45,9 +45,9 @@
 	-pipe
 
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
 	-ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
 	-Werror-implicit-function-declaration -wd170
 
-CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
 	-fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
 	-finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \