diff --git a/configure.ac b/configure.ac
index e77b4f2..8d21dbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,11 @@
 
 # Checks for libraries.
 
+AC_ARG_WITH(sanitized-headers,
+      AS_HELP_STRING([--with-sanitized-headers=DIR],
+         [Specify the location of the sanitized Linux headers]),
+      [CPPFLAGS="$CPPFLAGS -idirafter $withval"])
+	  
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h netinet/in.h sys/ioctl.h unistd.h])
 
diff --git a/ipacm/src/Makefile.am b/ipacm/src/Makefile.am
index 250c32c..c43343a 100644
--- a/ipacm/src/Makefile.am
+++ b/ipacm/src/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_CPPFLAGS	= -DDEBUG
 AM_CPPFLAGS = -I./../inc \
-	      -I$(WORKSPACE)/data-ipa-cfg-mgr/ipanat/inc \
-	      -I$(WORKSPACE)/kernel/include \
+	      -I$(top_srcdir)/ipanat/inc \
 	      ${LIBXML_CFLAGS}
 AM_CPPFLAGS += -Wall -Wundef -Wno-trigraphs
 
diff --git a/ipanat/src/Makefile.am b/ipanat/src/Makefile.am
index cf9fc3f..f8b775c 100644
--- a/ipanat/src/Makefile.am
+++ b/ipanat/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs
-AM_CFLAGS += -I./../inc -I$(WORKSPACE)/kernel/include
+AM_CFLAGS += -I./../inc
 
 c_sources   = ipa_nat_drv.c \
               ipa_nat_drvi.c \