diff --git a/gralloc/Android.bp b/gralloc/Android.bp
index c7339c2f..b256e522 100644
--- a/gralloc/Android.bp
+++ b/gralloc/Android.bp
@@ -6,6 +6,10 @@ cc_library_shared {
         "-Wno-sign-conversion",
         "-DLOG_TAG=\"qtigralloc\"",
     ],
+    export_include_dirs: ["."],
+    header_abi_checker: {
+        enabled: true,
+    },
     shared_libs: [
          "liblog",
          "libcutils",
diff --git a/libqdmetadata/Android.bp b/libqdmetadata/Android.bp
index 3cd036bf..282fbf69 100644
--- a/libqdmetadata/Android.bp
+++ b/libqdmetadata/Android.bp
@@ -18,5 +18,9 @@ cc_library_shared {
     header_libs: ["libhardware_headers", "display_intf_headers"],
     srcs: ["qdMetaData.cpp", "qd_utils.cpp"],
     export_header_lib_headers: ["display_intf_headers"],
+    export_include_dirs: ["."],
+    header_abi_checker: {
+        enabled: true,
+    },
 }
 
diff --git a/services/config/src/Android.bp b/services/config/src/Android.bp
index b2bc8041..73fb5d42 100644
--- a/services/config/src/Android.bp
+++ b/services/config/src/Android.bp
@@ -21,5 +21,9 @@ cc_library_shared {
         "device_interface.cpp",
     ],
     export_header_lib_headers: ["display_intf_headers"],
+    export_include_dirs: ["."],
+    header_abi_checker: {
+        enabled: true,
+    },
 }