diff --git a/Android.mk b/Android.mk
index 302b143..01c3ce3 100755
--- a/Android.mk
+++ b/Android.mk
@@ -107,11 +107,11 @@
 LOCAL_C_INCLUDES += \
     bionic \
     system/extras \
-    system/core/adb \
+    packages/modules/adb \
     system/core/libmodprobe/include \
     system/core/libsparse \
     external/zlib \
-    system/core/libziparchive/include \
+    system/libziparchive/include \
     external/freetype/include \
     external/boringssl/include \
     external/libcxx/include \
diff --git a/gui/Android.bp b/gui/Android.bp
index c66cae4..2c4a33e 100644
--- a/gui/Android.bp
+++ b/gui/Android.bp
@@ -31,7 +31,7 @@
         "bootable/recovery/crypto/scrypt/lib/util",
         "bootable/recovery/otautil/include",
         "bootable/recovery/install/include",
-        "system/core/libziparchive/include",
+        "system/libziparchive/include",
         "bootable/recovery/recovery_ui/include",
         "bootable/recovery/fuse_sideload/include",
         "bootable/recovery/gui/include",
@@ -40,7 +40,8 @@
         "bootable/recovery/libpixelflinger/include",
         "bootable/recovery/minuitwrp/include",
         "bionic",
-        "system/core/base/include",
+        "system/libbase/include",
+        "system/core/libcutils/include",
         "system/core/include",
         "external/freetype/include",
         "external/libpng"
@@ -87,4 +88,4 @@
         "libotautil",
         "libpng"
     ]
-}
\ No newline at end of file
+}
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 3911711..9401405 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -34,7 +34,6 @@
 
     include_dirs: [
         "bootable/recovery/otautil/include",
-        "system/core/adb",
         "packages/modules/adb",
     ],
 
diff --git a/minuitwrp/libminuitwrp_defaults.go b/minuitwrp/libminuitwrp_defaults.go
index 2f82c6e..88d7858 100644
--- a/minuitwrp/libminuitwrp_defaults.go
+++ b/minuitwrp/libminuitwrp_defaults.go
@@ -257,8 +257,8 @@
 	}
 
 	if getMakeVars(ctx, "TW_SUPPORT_INPUT_AIDL_HAPTICS") == "true" {
-		sharedLibs = append(sharedLibs, "android.hardware.vibrator-ndk_platform")
-		sharedLibs = append(sharedLibs, "android.hardware.vibrator-cpp")
+		sharedLibs = append(sharedLibs, "android.hardware.vibrator-V1-ndk_platform")
+		sharedLibs = append(sharedLibs, "android.hardware.vibrator-V1-cpp")
 	}
 
 	if getMakeVars(ctx, "TW_INCLUDE_JPEG") != "" {
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index effa273..a5c7094 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -29,7 +29,7 @@
 ifneq ($(wildcard external/unzip/Android.mk),)
 	RECOVERY_BINARY_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/unzip
 endif
-ifneq ($(wildcard system/core/libziparchive/Android.bp),)
+ifneq ($(wildcard system/libziparchive/Android.bp),)
 	RECOVERY_BINARY_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/bin/unzip
 endif
 ifneq ($(wildcard external/one-true-awk/Android.bp),)