diff --git a/Android.bp b/Android.bp
index 72ef7ef..3b81f41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,12 +3,21 @@ cc_library {
     vendor: true,
     srcs: [
         "lib/logging.c",
-        "lib/qrtr.c",
         "lib/qmi.c",
+        "lib/qrtr.c",
+    ],
+    cflags: [
+        "-Wno-error",
+        "-fPIC",
+    ],
+    export_include_dirs: [
+        "include",
+        "lib",
+    ],
+    local_include_dirs: [
+        "include",
+        "src",
     ],
-    cflags: ["-fPIC", "-Wno-error"],
-    export_include_dirs: ["lib"],
-    local_include_dirs: ["src"],
 }
 
 cc_binary {
@@ -20,7 +29,10 @@ cc_binary {
         "src/cfg.c",
     ],
     cflags: ["-Wno-error"],
-    local_include_dirs: ["lib"],
+    local_include_dirs: [
+        "include",
+        "lib",
+    ],
 }
 
 cc_binary {
@@ -31,5 +43,8 @@ cc_binary {
         "src/lookup.c",
     ],
     cflags: ["-Wno-error"],
-    local_include_dirs: ["lib"],
+    local_include_dirs: [
+        "include",
+        "lib",
+    ],
 }