diff --git a/configure.ac b/configure.ac
index 6302ea9..6a0e9c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@
 AC_ARG_WITH(sanitized-headers,
         AS_HELP_STRING([--with-sanitized-headers=DIR],
                 [Specify the location of the sanitized Linux headers]),
-        [CPPFLAGS="$CPPFLAGS -idirafter $withval"])
+        [CPPFLAGS="$CPPFLAGS -I $withval"])
 
 
 AC_ARG_WITH([glib],
@@ -110,6 +110,7 @@
 AM_CONDITIONAL([ADSP_HDLR], [test x$AUDIO_FEATURE_ADSP_HDLR_ENABLED = xtrue])
 AM_CONDITIONAL([AUDIO_IP_HDLR], [test x$AUDIO_FEATURE_IP_HDLR_ENABLED = xtrue])
 AM_CONDITIONAL([SPLIT_A2DP], [test x$AUDIO_FEATURE_ENABLED_SPLIT_A2DP = xtrue])
+AM_CONDITIONAL([QAF_SUPPORT], [test x$AUDIO_FEATURE_ENABLED_QAF = xtrue])
 
 AC_CONFIG_FILES([ \
         Makefile \
diff --git a/hal/Makefile.am b/hal/Makefile.am
index cb01e79..e648453 100644
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -172,6 +172,11 @@
 c_sources += audio_extn/ip_hdlr_intf.c
 endif
 
+if QAF_SUPPORT
+AM_CFLAGS += -DQAF_EXTN_ENABLED
+c_sources += audio_extn/qaf.c
+endif
+
 h_sources = audio_extn/audio_defs.h \
             audio_extn/audio_extn.h \
             audio_hw.h \