diff --git a/libs/hostgraphics/Android.bp b/libs/hostgraphics/Android.bp
index 4407af6..7a700b0 100644
--- a/libs/hostgraphics/Android.bp
+++ b/libs/hostgraphics/Android.bp
@@ -17,26 +17,17 @@
     static_libs: [
         "libbase",
         "libmath",
+        "libui-types",
         "libutils",
     ],
 
     srcs: [
-        ":libui_host_common",
         "ADisplay.cpp",
         "Fence.cpp",
         "HostBufferQueue.cpp",
         "PublicFormat.cpp",
     ],
 
-    include_dirs: [
-        // Here we override all the headers automatically included with frameworks/native/include.
-        // When frameworks/native/include will be removed from the list of automatic includes.
-        // We will have to copy necessary headers with a pre-build step (generated headers).
-        ".",
-        "frameworks/native/libs/arect/include",
-        "frameworks/native/libs/ui/include_private",
-    ],
-
     header_libs: [
         "libnativebase_headers",
         "libnativedisplay_headers",