diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 6bb896fd7b29e3f4ae6d082e316e9f2c92a5cd81..88d6033ed9fbc41cbe173dd666b5cd39a71afa66 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -23,6 +23,7 @@ cc_library_shared {
         "libandroid_runtime",
         "libbinder",
         "libcutils",
+        "libhwui",
         "liblog",
         "libutils",
         "libgui",
diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp
index b1e3d6fe845a5f4c92d682109e25d5c495d1ea24..213b3adfb2a80222bc4c0c040ba5a9dbf93333e5 100644
--- a/libs/input/tests/Android.bp
+++ b/libs/input/tests/Android.bp
@@ -20,6 +20,7 @@ cc_test {
     shared_libs: [
         "libandroid_runtime",
         "libinputservice",
+        "libhwui",
         "libgui",
         "libutils",
     ],
diff --git a/native/android/Android.bp b/native/android/Android.bp
index 257ae7332cc1ba4b9b26195ec622f6998fb69038..0a8ef38303a11af12520feac2496383eff998a65 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -81,6 +81,8 @@ cc_library_shared {
         "libarect",
     ],
 
+    header_libs: [ "libhwui_internal_headers" ],
+
     whole_static_libs: ["libnativedisplay", "libnativewindow"],
 
     export_static_lib_headers: ["libarect"],
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
index 376ea77740c20cc89af7d83c2d4708367f18fa36..15b473c2a6ab82b07c47e086bf93d31aa12ef640 100644
--- a/native/graphics/jni/Android.bp
+++ b/native/graphics/jni/Android.bp
@@ -37,6 +37,8 @@ cc_library_shared {
         "liblog",
     ],
 
+    header_libs: [ "libhwui_internal_headers" ],
+
     static_libs: ["libarect"],
 
     arch: {
diff --git a/native/webview/plat_support/Android.bp b/native/webview/plat_support/Android.bp
index 88decc86c387193cb57c3fd4b65c64de84383e1d..1a3b36d046e1596518033ffb5b3195f07509cc53 100644
--- a/native/webview/plat_support/Android.bp
+++ b/native/webview/plat_support/Android.bp
@@ -30,12 +30,14 @@ cc_library_shared {
         "graphic_buffer_impl.cpp",
     ],
 
+    header_libs: [ "libhwui_internal_headers" ],
+
     shared_libs: [
         "libandroidfw",
-        "libandroid_runtime",
         "libcutils",
         "libhwui",
         "liblog",
+        "libnativehelper",
         "libui",
         "libutils",
         "libvulkan",
diff --git a/native/webview/plat_support/graphics_utils.cpp b/native/webview/plat_support/graphics_utils.cpp
index 56825cee452079c585c123e89b5ac2a99465ed84..8d7a59e46e726fcbd0d47a3d53ae75d946298860 100644
--- a/native/webview/plat_support/graphics_utils.cpp
+++ b/native/webview/plat_support/graphics_utils.cpp
@@ -25,11 +25,9 @@
 #include <cstdlib>
 #include <jni.h>
 #include <utils/Log.h>
-#include "android/graphics/GraphicsJNI.h"
+#include "GraphicsJNI.h"
 #include "graphic_buffer_impl.h"
 #include "SkCanvasStateUtils.h"
-#include "SkGraphics.h"
-#include "SkPicture.h"
 
 #define NELEM(x) ((int) (sizeof(x) / sizeof((x)[0])))
 
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index f9ef0b7b8e9dc527c86f8f0ef79f98e6a2262a68..a4bea661583bdf650ac04d449352210ae9850ba7 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -11,6 +11,7 @@ LOCAL_SHARED_LIBRARIES := \
     libnativehelper \
     libRS \
     libcutils \
+    libhwui \
     liblog \
     libutils \
     libui \