diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index 0552adb..07c3220 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <time.h>
 
-#include <base/file_util.h>
 #include <base/files/file_path.h>
+#include <base/files/file_util.h>
 #include <base/hash.h>
 #include <base/logging.h>
 #include <base/strings/string_number_conversions.h>
diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 9528e77..0116a19 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <base/at_exit.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/stringprintf.h>
 #include <chromeos/dbus/service_constants.h>
diff --git a/metrics/metrics_library_test.cc b/metrics/metrics_library_test.cc
index 7bf5c63..7ede303 100644
--- a/metrics/metrics_library_test.cc
+++ b/metrics/metrics_library_test.cc
@@ -4,7 +4,7 @@
 
 #include <cstring>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <policy/mock_device_policy.h>
diff --git a/metrics/persistent_integer_test.cc b/metrics/persistent_integer_test.cc
index 097ec7d..a56aede 100644
--- a/metrics/persistent_integer_test.cc
+++ b/metrics/persistent_integer_test.cc
@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 
 #include <base/compiler_specific.h>
-#include <base/file_util.h>
 #include <base/files/file_enumerator.h>
+#include <base/files/file_util.h>
 
 #include "metrics/persistent_integer.h"
 
diff --git a/metrics/uploader/system_profile_cache.cc b/metrics/uploader/system_profile_cache.cc
index fd79961..12e8bec 100644
--- a/metrics/uploader/system_profile_cache.cc
+++ b/metrics/uploader/system_profile_cache.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
diff --git a/metrics/uploader/upload_service_test.cc b/metrics/uploader/upload_service_test.cc
index 5076e61..d60413d 100644
--- a/metrics/uploader/upload_service_test.cc
+++ b/metrics/uploader/upload_service_test.cc
@@ -5,7 +5,7 @@
 #include <gtest/gtest.h>
 
 #include "base/at_exit.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/sys_info.h"