diff --git a/atom/app/atom_content_client.cc b/atom/app/atom_content_client.cc
index 0075c289811..c7c9380b4a1 100644
--- a/atom/app/atom_content_client.cc
+++ b/atom/app/atom_content_client.cc
@@ -18,7 +18,7 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/user_agent.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/url_constants.h"
diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc
index b3b5b8f2a8f..0bb19fe5bb4 100644
--- a/atom/app/atom_main_delegate.cc
+++ b/atom/app/atom_main_delegate.cc
@@ -21,7 +21,7 @@
 #include "base/logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/common/content_switches.h"
-#include "ipc/ipc_features.h"
+#include "ipc/ipc_buildflags.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chromium_src/chrome/browser/printing/printing_message_filter.cc b/chromium_src/chrome/browser/printing/printing_message_filter.cc
index 52c6ecee811..9c23a80c221 100644
--- a/chromium_src/chrome/browser/printing/printing_message_filter.cc
+++ b/chromium_src/chrome/browser/printing/printing_message_filter.cc
@@ -17,7 +17,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
-#include "printing/features/features.h"
+#include "printing/buildflags/buildflags.h"
 
 #if defined(OS_ANDROID)
 #include "base/strings/string_number_conversions.h"
diff --git a/chromium_src/chrome/common/chrome_paths.cc b/chromium_src/chrome/common/chrome_paths.cc
index 30fe1fd7ba9..0022fcaed96 100644
--- a/chromium_src/chrome/common/chrome_paths.cc
+++ b/chromium_src/chrome/common/chrome_paths.cc
@@ -16,7 +16,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/widevine_cdm_constants.h"
-#include "media/media_features.h"
+#include "media/media_buildflags.h"
 #include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
diff --git a/chromium_src/chrome/common/chrome_utility_printing_messages.h b/chromium_src/chrome/common/chrome_utility_printing_messages.h
index fc71f0bd05f..0f4fa21ede7 100644
--- a/chromium_src/chrome/common/chrome_utility_printing_messages.h
+++ b/chromium_src/chrome/common/chrome_utility_printing_messages.h
@@ -13,7 +13,7 @@
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
 #include "printing/backend/print_backend.h"
-#include "printing/features/features.h"
+#include "printing/buildflags/buildflags.h"
 #include "printing/page_range.h"
 #include "printing/pdf_render_settings.h"
 #include "printing/pwg_raster_settings.h"
diff --git a/components/pepper_flash/BUILD.gn b/components/pepper_flash/BUILD.gn
index 9bd46abd77a..cd09cde28e5 100644
--- a/components/pepper_flash/BUILD.gn
+++ b/components/pepper_flash/BUILD.gn
@@ -38,7 +38,7 @@ component("pepper_flash") {
   deps = [
     "//content/public/browser",
     "//content/public/renderer",
-    "//media:media_features",
+    "//media:media_buildflags",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/proxy:ipc",