diff --git a/common.mk b/common.mk
index 8362ec5..4234432 100644
--- a/common.mk
+++ b/common.mk
@@ -503,6 +503,8 @@ PRODUCT_VENDOR_MOVE_ENABLED := true
 # WiFi Display
 PRODUCT_PACKAGES += \
     libavservices_minijail \
+    libgui_shim \
+    libinput_shim \
     libnl \
     libpng.vendor \
     libwfdaac_vendor
diff --git a/extract-files.sh b/extract-files.sh
index d4c94b6..858df67 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -65,9 +65,14 @@ fi
 
 function blob_fixup() {
     case "${1}" in
+        system_ext/lib*/libwfdmmsrc_system.so)
+            [ "$2" = "" ] && return 0
+            grep -q "libgui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim.so" "${2}"
+            ;;
         system_ext/lib64/libwfdnative.so)
             [ "$2" = "" ] && return 0
             "${PATCHELF}" --remove-needed "android.hidl.base@1.0.so" "${2}"
+            grep -q "libinput_shim.so" "${2}" || "${PATCHELF}" --add-needed "libinput_shim.so" "${2}"
             ;;
         system_ext/etc/permissions/moto-telephony.xml)
             [ "$2" = "" ] && return 0