diff --git a/Android.mk b/Android.mk
index cbfbbd2..d087216 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,7 +47,8 @@
 	libselinux \
 	libutils \
 	libhardware \
-	libsoftkeymaster
+	libsoftkeymaster \
+	libbase \
 
 common_static_libraries := \
 	libfs_mgr \
diff --git a/Disk.cpp b/Disk.cpp
index 673827c..56dface 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -21,10 +21,10 @@
 #include "Utils.h"
 #include "VolumeBase.h"
 
+#include <base/file.h>
+#include <base/stringprintf.h>
 #include <cutils/log.h>
 #include <diskconfig/diskconfig.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -33,6 +33,9 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
+using android::base::ReadFileToString;
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 
diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index 5149962..bec1025 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -19,10 +19,9 @@
 #include "EmulatedVolume.h"
 #include "Utils.h"
 
+#include <base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>
@@ -32,6 +31,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 
diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 78c8fa5..255a6bc 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -20,10 +20,9 @@
 #include "PublicVolume.h"
 #include "Utils.h"
 
+#include <base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>
@@ -33,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 
diff --git a/Utils.cpp b/Utils.cpp
index 7cbb2ce..6ad5d16 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -22,8 +22,6 @@
 
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>