diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 1767761a..f9425af9 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <base/strings.h>
+#include <android-base/strings.h>
 
 #include "mincrypt/sha.h"
 #include "applypatch.h"
diff --git a/recovery.cpp b/recovery.cpp
index aaca3e0f..dace52f9 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -34,8 +34,8 @@
 #include <chrono>
 
 #include <adb.h>
-#include <base/file.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
 
diff --git a/screen_ui.cpp b/screen_ui.cpp
index f2fda2fb..23fc9015 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -30,8 +30,8 @@
 
 #include <vector>
 
-#include <base/strings.h>
-#include <base/stringprintf.h>
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
 #include <cutils/properties.h>
 
 #include "common.h"
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 4956cc29..48250419 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -53,8 +53,8 @@
 
 #include <memory>
 
-#include <base/file.h>
-#include <base/strings.h>
+#include <android-base/file.h>
+#include <android-base/strings.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
 #include <fs_mgr.h>
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index dd6cf0d9..a9d8cc68 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -37,8 +37,8 @@
 #include <string>
 #include <vector>
 
-#include <base/parseint.h>
-#include <base/strings.h>
+#include <android-base/parseint.h>
+#include <android-base/strings.h>
 
 #include "applypatch/applypatch.h"
 #include "edify/expr.h"
diff --git a/updater/install.cpp b/updater/install.cpp
index 97e39056..e2b3db7c 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -34,9 +34,9 @@
 #include <linux/xattr.h>
 #include <inttypes.h>
 
-#include <base/parseint.h>
-#include <base/strings.h>
-#include <base/stringprintf.h>
+#include <android-base/parseint.h>
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
 
 #include "bootloader.h"
 #include "applypatch/applypatch.h"
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 55b7afc8..3ee38e8a 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -35,7 +35,7 @@
 #include "wear_ui.h"
 #include "ui.h"
 #include "cutils/properties.h"
-#include "base/strings.h"
+#include "android-base/strings.h"
 
 static int char_width;
 static int char_height;