diff --git a/delta_performer.cc b/delta_performer.cc
index ce44be5..63aed33 100644
--- a/delta_performer.cc
+++ b/delta_performer.cc
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/format_macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/strings/string_util.h>
diff --git a/delta_performer_unittest.cc b/delta_performer_unittest.cc
index 8b640e8..6df65e4 100644
--- a/delta_performer_unittest.cc
+++ b/delta_performer_unittest.cc
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
diff --git a/download_action_unittest.cc b/download_action_unittest.cc
index 97dd0f3..c3eb9de 100644
--- a/download_action_unittest.cc
+++ b/download_action_unittest.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/stringprintf.h>
 
 #include "update_engine/action_pipe.h"
diff --git a/hardware.cc b/hardware.cc
index 74de45a..8fbd90e 100644
--- a/hardware.cc
+++ b/hardware.cc
@@ -4,7 +4,7 @@
 
 #include "update_engine/hardware.h"
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/strings/string_util.h>
 #include <rootdev/rootdev.h>
diff --git a/hwid_override.cc b/hwid_override.cc
index 064b2a2..768c86b 100644
--- a/hwid_override.cc
+++ b/hwid_override.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 
 #include "update_engine/simple_key_value_store.h"
 
diff --git a/hwid_override_unittest.cc b/hwid_override_unittest.cc
index 5c654b4..87d1682 100644
--- a/hwid_override_unittest.cc
+++ b/hwid_override_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include <base/files/file_path.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/scoped_temp_dir.h>
 #include <gtest/gtest.h>
 
diff --git a/main.cc b/main.cc
index 5966c25..7b92efa 100644
--- a/main.cc
+++ b/main.cc
@@ -7,7 +7,7 @@
 
 #include <base/at_exit.h>
 #include <base/command_line.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index 71185f6..94de4f3 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_util.h>
 #include <policy/device_policy.h>
 
diff --git a/omaha_request_params_unittest.cc b/omaha_request_params_unittest.cc
index 1daed1c..348e392 100644
--- a/omaha_request_params_unittest.cc
+++ b/omaha_request_params_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "gtest/gtest.h"
 #include "update_engine/constants.h"
 #include "update_engine/fake_system_state.h"
diff --git a/payload_generator/delta_diff_generator.cc b/payload_generator/delta_diff_generator.cc
index 8236292..94ceaa0 100644
--- a/payload_generator/delta_diff_generator.cc
+++ b/payload_generator/delta_diff_generator.cc
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/file_path.h>
 #include <base/logging.h>
 #include <base/memory/scoped_ptr.h>
diff --git a/payload_state_unittest.cc b/payload_state_unittest.cc
index 6646e56..27ee22c 100644
--- a/payload_state_unittest.cc
+++ b/payload_state_unittest.cc
@@ -5,7 +5,7 @@
 #include <glib.h>
 
 #include <base/files/file_path.h>
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include <base/strings/stringprintf.h>
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/postinstall_runner_action_unittest.cc b/postinstall_runner_action_unittest.cc
index d5e795e..1393a6f 100644
--- a/postinstall_runner_action_unittest.cc
+++ b/postinstall_runner_action_unittest.cc
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 #include <gtest/gtest.h>
diff --git a/prefs.cc b/prefs.cc
index c576a62..ca8749b 100644
--- a/prefs.cc
+++ b/prefs.cc
@@ -4,7 +4,7 @@
 
 #include "update_engine/prefs.h"
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/string_util.h>
diff --git a/prefs_unittest.cc b/prefs_unittest.cc
index 6ff3945..0c81b92 100644
--- a/prefs_unittest.cc
+++ b/prefs_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/macros.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
diff --git a/real_system_state.cc b/real_system_state.cc
index f093aad..faac5cd 100644
--- a/real_system_state.cc
+++ b/real_system_state.cc
@@ -4,7 +4,7 @@
 
 #include "update_engine/real_system_state.h"
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/time/time.h>
 
 #include "update_engine/constants.h"
diff --git a/simple_key_value_store.cc b/simple_key_value_store.cc
index 266d2e4..5669df2 100644
--- a/simple_key_value_store.cc
+++ b/simple_key_value_store.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_split.h>
 #include <base/strings/string_util.h>
 
diff --git a/simple_key_value_store_unittest.cc b/simple_key_value_store_unittest.cc
index ae51be8..1f9144f 100644
--- a/simple_key_value_store_unittest.cc
+++ b/simple_key_value_store_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/strings/string_util.h>
 
 #include "update_engine/test_utils.h"
diff --git a/update_attempter.cc b/update_attempter.cc
index db9aefd..d8ae609 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include <base/bind.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/rand_util.h>
 #include <base/strings/string_util.h>
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index cd83445..5286169 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <stdint.h>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <gtest/gtest.h>
 #include <policy/libpolicy.h>
 #include <policy/mock_device_policy.h>
diff --git a/update_manager/real_config_provider_unittest.cc b/update_manager/real_config_provider_unittest.cc
index 93e657d..ab47d03 100644
--- a/update_manager/real_config_provider_unittest.cc
+++ b/update_manager/real_config_provider_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "update_engine/update_manager/real_config_provider.h"
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/scoped_temp_dir.h>
 #include <base/memory/scoped_ptr.h>
 #include <gtest/gtest.h>
diff --git a/utils.cc b/utils.cc
index 6c527b3..0938704 100644
--- a/utils.cc
+++ b/utils.cc
@@ -26,7 +26,7 @@
 #include <vector>
 
 #include <base/callback.h>
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/file_path.h>
 #include <base/files/scoped_file.h>
 #include <base/logging.h>
diff --git a/utils_unittest.cc b/utils_unittest.cc
index 4618beb..832c2af 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/file_path.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>