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 {