diff --git a/libwvdrmengine/level3/arm/Android.mk b/libwvdrmengine/level3/arm/Android.mk
index 45671b70..6bb88386 100644
--- a/libwvdrmengine/level3/arm/Android.mk
+++ b/libwvdrmengine/level3/arm/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/level3/arm64/Android.mk b/libwvdrmengine/level3/arm64/Android.mk
index c9569acb..54c14a5a 100644
--- a/libwvdrmengine/level3/arm64/Android.mk
+++ b/libwvdrmengine/level3/arm64/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/level3/mips/Android.mk b/libwvdrmengine/level3/mips/Android.mk
index b8ee693b..85aeaf57 100644
--- a/libwvdrmengine/level3/mips/Android.mk
+++ b/libwvdrmengine/level3/mips/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/level3/mips64/Android.mk b/libwvdrmengine/level3/mips64/Android.mk
index e6a10849..133589b8 100644
--- a/libwvdrmengine/level3/mips64/Android.mk
+++ b/libwvdrmengine/level3/mips64/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/level3/x86/Android.mk b/libwvdrmengine/level3/x86/Android.mk
index 3ae9824b..34be62f2 100644
--- a/libwvdrmengine/level3/x86/Android.mk
+++ b/libwvdrmengine/level3/x86/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/level3/x86_64/Android.mk b/libwvdrmengine/level3/x86_64/Android.mk
index 51dc8114..7af373a6 100644
--- a/libwvdrmengine/level3/x86_64/Android.mk
+++ b/libwvdrmengine/level3/x86_64/Android.mk
@@ -5,7 +5,7 @@ LOCAL_CFLAGS := \
     -Wno-unused \
     -Wno-unused-parameter
 LOCAL_C_INCLUDES := \
-    system/core/base/include \
+    system/libbase/include \
     system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/cdm/util/include \
diff --git a/libwvdrmengine/vts/vendor_module/Android.mk b/libwvdrmengine/vts/vendor_module/Android.mk
index 47149834..1e5dfea1 100644
--- a/libwvdrmengine/vts/vendor_module/Android.mk
+++ b/libwvdrmengine/vts/vendor_module/Android.mk
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/cdm/core/test \
     vendor/widevine/libwvdrmengine/cdm/util/include \
     system/libhidl/base/include \
-    system/core/base/include \
+    system/libbase/include \
     system/libvintf/include \
 
 LOCAL_SRC_FILES := \