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 {