diff --git a/hal/Android.mk b/hal/Android.mk
index dc4dd1b..d37c766 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -10,6 +10,7 @@
                 src/PrefixParser.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
 LOCAL_MODULE := liboffloadhal
+
 #LOCAL_CPP_FLAGS := -Wall -Werror
 LOCAL_CFLAGS += -Wno-error
 LOCAL_SHARED_LIBRARIES := libhwbinder \
@@ -24,6 +25,7 @@
                         libhardware \
                         android.hardware.tetheroffload.config@1.0 \
                         android.hardware.tetheroffload.control@1.0
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 4f00e8a..ab8dd17 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -13,17 +13,6 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../inc
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../hal/inc
-ifeq ($(call is-platform-sdk-version-at-least,20),true)
-LOCAL_C_INCLUDES += external/icu/icu4c/source/common
-else
-LOCAL_C_INCLUDES += external/icu4c/common
-endif
-#LOCAL_C_INCLUDES += external/dhcpcd
-LOCAL_C_INCLUDES += external/libxml2/include
-LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include
-LOCAL_C_INCLUDES += external/libnfnetlink/include
 
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
diff --git a/ipanat/inc/ipa_nat_drv.h b/ipanat/inc/ipa_nat_drv.h
index 4ef8779..d5aa0c6 100644
--- a/ipanat/inc/ipa_nat_drv.h
+++ b/ipanat/inc/ipa_nat_drv.h
@@ -26,6 +26,8 @@
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+#ifndef IPA_NAT_DRV_H
+#define IPA_NAT_DRV_H
 
 #include "string.h"  /* memset */
 #include "stdlib.h"  /* free, malloc */
@@ -142,3 +144,4 @@
 int ipa_nat_modify_pdn(uint32_t  tbl_hdl,
 	uint8_t pdn_index,
 	ipa_nat_pdn_entry *pdn_info);
+#endif /* IPA_NAT_DRV_H */
\ No newline at end of file
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index 7a45a92..da7aa6a 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -10,14 +10,14 @@
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../inc
-LOCAL_C_INCLUDES += $(LOCAL_PATH)
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_SRC_FILES := ipa_nat_drv.c \
                    ipa_nat_drvi.c
 
-
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../inc
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_CFLAGS := -DDEBUG -Wall -Werror
 LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID