diff --git a/server/Android.bp b/server/Android.bp
index dc8a3cc..2f8ee89 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -43,6 +43,9 @@
         "libutils",
         "netd_aidl_interface-cpp",
     ],
+    export_shared_lib_headers: [
+        "netd_aidl_interface-cpp",
+    ],
     aidl: {
         export_aidl_headers: true,
         local_include_dirs: ["binder"],
@@ -99,7 +102,6 @@
         "libpcap",
         "libqtaguid",
         "libssl",
-        "netd_aidl_interface-cpp",
     ],
     aidl: {
         export_aidl_headers: true,
@@ -226,6 +228,5 @@
         "libqtaguid",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-cpp",
     ],
 }
diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index 51f03cf..08a75e0 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -10,7 +10,6 @@
         "libnetd_client",
         "libnetdaidl",
         "libnetdutils",
-        "netd_aidl_interface-cpp",
     ],
     static_libs: [
         "libnetd_test_dnsresponder",