diff --git a/include/builddefs.in b/include/builddefs.in
index d855c89e..636f6321 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -11,6 +11,8 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 LOADERFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LIBXFS = @libxfs@
 LIBACL = @libacl@
@@ -75,7 +77,7 @@ ifeq ($(PKG_PLATFORM),freebsd)
 DEPENDFLAGS = -D__FreeBSD__
 endif
 
-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
+GCFLAGS = $(OPTIMIZER) $(DEBUG) $(CPPFLAGS) \
 	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
 
 # Global, Platform, Local CFLAGS
diff --git a/include/buildmacros b/include/buildmacros
index 801bcb61..276d2c80 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -41,10 +41,10 @@ LIBNAME = $(basename $(LTLIBRARY))
 LTOBJECTS = $(OBJECTS:.o=.lo)
 LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-LTLINK = $(LIBTOOL) --mode=link $(CC)
+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC)
 LTEXEC = $(LIBTOOL) --mode=execute
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
 
 ifeq ($(ENABLE_SHARED),yes)
 LTLDFLAGS += -rpath $(PKG_LIB_DIR)