Make xfs symlink in include/ dir so we can find xfs/dmapi.h
diff --git a/include/Makefile b/include/Makefile
index 5bbc731..93eca5b 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -35,8 +35,11 @@
 
 HFILES = dmapi.h
 LSRCFILES = builddefs.in buildmacros buildrules dmapi_kern.h
+LDIRT = xfs
 
 default install :
+	rm -f xfs
+	$(LN_S) . xfs
 
 include $(BUILDRULES)
 
diff --git a/include/buildmacros b/include/buildmacros
index 26f90f4..d360443 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -56,7 +56,7 @@
 IMAGES_DIR = $(TOPDIR)/all-images
 DIST_DIR = $(TOPDIR)/dist
 
-CCF	= $(CC) $(CFLAGS)
+CCF	= $(CC) $(CFLAGS) $(CPPFLAGS)
 MAKEF	= $(MAKE) $(MAKEOPTS)
 CXXF	= $(CXX) $(CXXFLAGS)
 LDF	= $(LD) $(LDFLAGS)