diff --git a/buffet/commands/command_manager.cc b/buffet/commands/command_manager.cc
index ae105b8..db1b5e7 100644
--- a/buffet/commands/command_manager.cc
+++ b/buffet/commands/command_manager.cc
@@ -4,8 +4,8 @@
 
 #include "buffet/commands/command_manager.h"
 
-#include <base/file_util.h>
 #include <base/files/file_enumerator.h>
+#include <base/files/file_util.h>
 #include <base/json/json_reader.h>
 #include <base/values.h>
 #include <chromeos/dbus/exported_object_manager.h>
diff --git a/buffet/commands/command_manager_unittest.cc b/buffet/commands/command_manager_unittest.cc
index 65241fe..4c103dc 100644
--- a/buffet/commands/command_manager_unittest.cc
+++ b/buffet/commands/command_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/json/json_writer.h>
 #include <gtest/gtest.h>
 
diff --git a/buffet/main.cc b/buffet/main.cc
index 0f2c6d0..6b8f164 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -6,8 +6,8 @@
 
 #include <base/at_exit.h>
 #include <base/command_line.h>
-#include <base/file_util.h>
 #include <base/files/file_path.h>
+#include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/message_loop/message_loop.h>
 #include <base/strings/string_util.h>
diff --git a/buffet/storage_impls.h b/buffet/storage_impls.h
index 84110c7..8b90a6c 100644
--- a/buffet/storage_impls.h
+++ b/buffet/storage_impls.h
@@ -5,7 +5,7 @@
 #ifndef BUFFET_STORAGE_IMPLS_H_
 #define BUFFET_STORAGE_IMPLS_H_
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/macros.h>
 #include <base/values.h>