diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2d28d59..af61f88 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -161,6 +161,7 @@
        (info->dev_vendor != 0x0955) &&  // Nvidia
        (info->dev_vendor != 0x413c) &&  // DELL
        (info->dev_vendor != 0x2314) &&  // INQ Mobile
+       (info->dev_vendor != 0x0b05) &&  // Asus
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;
diff --git a/include/ion/ion.h b/include/ion/ion.h
index 879eab3..cafead5 100644
--- a/include/ion/ion.h
+++ b/include/ion/ion.h
@@ -18,8 +18,13 @@
  *  limitations under the License.
  */
 
+#ifndef __SYS_CORE_ION_H
+#define __SYS_CORE_ION_H
+
 #include <linux/ion.h>
 
+__BEGIN_DECLS
+
 int ion_open();
 int ion_close(int fd);
 int ion_alloc(int fd, size_t len, size_t align, unsigned int flags,
@@ -30,3 +35,6 @@
 int ion_share(int fd, struct ion_handle *handle, int *share_fd);
 int ion_import(int fd, int share_fd, struct ion_handle **handle);
 
+__END_DECLS
+
+#endif /* __SYS_CORE_ION_H */
diff --git a/libion/Android.mk b/libion/Android.mk
index 6abac3c..5121fee 100644
--- a/libion/Android.mk
+++ b/libion/Android.mk
@@ -5,11 +5,11 @@
 LOCAL_MODULE := libion
 LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_HEAPTRACKED_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ion.c ion_test.c
 LOCAL_MODULE := iontest
 LOCAL_MODULE_TAGS := optional tests
 LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_HEAPTRACKED_EXECUTABLE)
+include $(BUILD_EXECUTABLE)