diff --git a/Benchmark.cpp b/Benchmark.cpp
index 810adf4..bbab792 100644
--- a/Benchmark.cpp
+++ b/Benchmark.cpp
@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 #include <cutils/iosched_policy.h>
 #include <private/android_filesystem_config.h>
 
diff --git a/BenchmarkGen.h b/BenchmarkGen.h
index 6813b08..3e86608 100644
--- a/BenchmarkGen.h
+++ b/BenchmarkGen.h
@@ -20,7 +20,7 @@
  ******************************************************************/
 
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/CommandListener.cpp b/CommandListener.cpp
index 03f8c73..4a8ed75 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -30,7 +30,7 @@
 
 #define LOG_TAG "VoldCmdListener"
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 
diff --git a/CryptCommandListener.cpp b/CryptCommandListener.cpp
index 3132a82..1babef7 100644
--- a/CryptCommandListener.cpp
+++ b/CryptCommandListener.cpp
@@ -30,7 +30,7 @@
 
 #define LOG_TAG "VoldCryptCmdListener"
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 #include <cutils/sockets.h>
diff --git a/Disk.cpp b/Disk.cpp
index d5f3e5d..920edab 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -22,9 +22,9 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/file.h>
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <diskconfig/diskconfig.h>
 
 #include <vector>
diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index 80ef3e2..230fa8b 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -17,8 +17,8 @@
 #include "EmulatedVolume.h"
 #include "Utils.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 
diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index c337dbb..0807c2c 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -25,8 +25,8 @@
 #define LOG_TAG "Ext4Crypt"
 #include "cutils/log.h"
 #include <cutils/klog.h>
-#include <base/file.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
 
 namespace {
     // Key length in bits
diff --git a/MoveTask.cpp b/MoveTask.cpp
index 10cd549..d416718 100644
--- a/MoveTask.cpp
+++ b/MoveTask.cpp
@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <private/android_filesystem_config.h>
 #include <hardware_legacy/power.h>
 
diff --git a/PrivateVolume.cpp b/PrivateVolume.cpp
index 6ddef3f..a106481 100644
--- a/PrivateVolume.cpp
+++ b/PrivateVolume.cpp
@@ -23,8 +23,8 @@
 #include "ResponseCode.h"
 #include "cryptfs.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 
diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index eb550c3..2ec6736 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -20,8 +20,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 
diff --git a/TrimTask.cpp b/TrimTask.cpp
index 94bd097..d7bfda7 100644
--- a/TrimTask.cpp
+++ b/TrimTask.cpp
@@ -20,8 +20,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/properties.h>
 #include <fs_mgr.h>
 #include <private/android_filesystem_config.h>
diff --git a/Utils.cpp b/Utils.cpp
index d4618af..e4f473a 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -18,9 +18,9 @@
 #include "Utils.h"
 #include "Process.h"
 
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/properties.h>
 #include <private/android_filesystem_config.h>
diff --git a/VolumeBase.cpp b/VolumeBase.cpp
index 4dcdb0e..ea4d372 100644
--- a/VolumeBase.cpp
+++ b/VolumeBase.cpp
@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index ea5574b..e26b6fe 100755
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -35,8 +35,8 @@
 
 #include <openssl/md5.h>
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 
diff --git a/bench/benchgen.py b/bench/benchgen.py
index 77262c4..d529332 100644
--- a/bench/benchgen.py
+++ b/bench/benchgen.py
@@ -148,7 +148,7 @@
  ******************************************************************/
 
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 4cb9d31..0bd5b0c 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -37,8 +37,8 @@
 
 #define LOG_TAG "Vold"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/log.h>
 #include <cutils/properties.h>
 #include <logwrap/logwrap.h>
diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index b947822..84d27c4 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -17,8 +17,8 @@
 #include "F2fs.h"
 #include "Utils.h"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include <vector>
 #include <string>
diff --git a/fs/Vfat.cpp b/fs/Vfat.cpp
index df51eab..38681c9 100644
--- a/fs/Vfat.cpp
+++ b/fs/Vfat.cpp
@@ -37,8 +37,8 @@
 
 #define LOG_TAG "Vold"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/log.h>
 #include <cutils/properties.h>
 #include <selinux/selinux.h>
diff --git a/main.cpp b/main.cpp
index 648f36a..9cbcf88 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,8 +22,8 @@
 #include "cryptfs.h"
 #include "sehandle.h"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/klog.h>
 #include <cutils/properties.h>
 #include <cutils/sockets.h>