diff --git a/content_handler/accessibility_bridge.h b/content_handler/accessibility_bridge.h
index 059baec0f5c99..b209342c662f3 100644
--- a/content_handler/accessibility_bridge.h
+++ b/content_handler/accessibility_bridge.h
@@ -6,7 +6,7 @@
 
 #include <map>
 
-#include <fuchsia/cpp/modular.h>
+#include <modular/cpp/fidl.h>
 
 #include "flutter/lib/ui/semantics/semantics_node.h"
 #include "lib/fxl/macros.h"
diff --git a/content_handler/application.h b/content_handler/application.h
index 8c958ef8d2f4f..f6c1dfde4101c 100644
--- a/content_handler/application.h
+++ b/content_handler/application.h
@@ -8,9 +8,9 @@
 #include <memory>
 #include <set>
 
-#include <fuchsia/cpp/component.h>
-#include <fuchsia/cpp/views_v1.h>
-#include <fuchsia/cpp/views_v1_token.h>
+#include <component/cpp/fidl.h>
+#include <views_v1/cpp/fidl.h>
+#include <views_v1_token/cpp/fidl.h>
 
 #include "engine.h"
 #include "flutter/common/settings.h"
diff --git a/content_handler/application_runner.h b/content_handler/application_runner.h
index e83aca58ba9b3..302d3c685a345 100644
--- a/content_handler/application_runner.h
+++ b/content_handler/application_runner.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include <fuchsia/cpp/component.h>
+#include <component/cpp/fidl.h>
 
 #include "application.h"
 #include "lib/app/cpp/application_context.h"
diff --git a/content_handler/compositor_context.h b/content_handler/compositor_context.h
index 9a7b66e995bcc..b59c010387b9c 100644
--- a/content_handler/compositor_context.h
+++ b/content_handler/compositor_context.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <fuchsia/cpp/ui.h>
+#include <ui/cpp/fidl.h>
 
 #include "flutter/flow/compositor_context.h"
 #include "lib/fxl/macros.h"
diff --git a/content_handler/engine.h b/content_handler/engine.h
index 747246ff01a7c..24d942bba8d3a 100644
--- a/content_handler/engine.h
+++ b/content_handler/engine.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <fuchsia/cpp/views_v1.h>
-#include <fuchsia/cpp/views_v1_token.h>
+#include <views_v1/cpp/fidl.h>
+#include <views_v1_token/cpp/fidl.h>
 #include <zx/event.h>
 
 #include "flutter/shell/common/shell.h"
diff --git a/content_handler/fuchsia_font_manager.h b/content_handler/fuchsia_font_manager.h
index 974ed2c72a423..266ac639fc983 100644
--- a/content_handler/fuchsia_font_manager.h
+++ b/content_handler/fuchsia_font_manager.h
@@ -17,7 +17,7 @@
 #ifndef TXT_FUCHSIA_FONT_MANAGER_H_
 #define TXT_FUCHSIA_FONT_MANAGER_H_
 
-#include <fuchsia/cpp/fonts.h>
+#include <fonts/cpp/fidl.h>
 #include <memory>
 #include "lib/fxl/macros.h"
 #include "third_party/skia/include/core/SkStream.h"
diff --git a/content_handler/isolate_configurator.h b/content_handler/isolate_configurator.h
index dc6995185e4fd..c5e4aa3b2df9b 100644
--- a/content_handler/isolate_configurator.h
+++ b/content_handler/isolate_configurator.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <fuchsia/cpp/component.h>
-#include <fuchsia/cpp/ui.h>
-#include <fuchsia/cpp/views_v1.h>
+#include <component/cpp/fidl.h>
+#include <ui/cpp/fidl.h>
+#include <views_v1/cpp/fidl.h>
 
 #include "lib/fxl/macros.h"
 #include "lib/ui/flutter/sdk_ext/src/natives.h"
diff --git a/content_handler/platform_view.h b/content_handler/platform_view.h
index 00c9ad0cf1d5f..fde06eaf5b59f 100644
--- a/content_handler/platform_view.h
+++ b/content_handler/platform_view.h
@@ -7,10 +7,10 @@
 #include <map>
 #include <set>
 
-#include <fuchsia/cpp/input.h>
-#include <fuchsia/cpp/modular.h>
-#include <fuchsia/cpp/views_v1.h>
-#include <fuchsia/cpp/views_v1_token.h>
+#include <input/cpp/fidl.h>
+#include <modular/cpp/fidl.h>
+#include <views_v1/cpp/fidl.h>
+#include <views_v1_token/cpp/fidl.h>
 
 #include "accessibility_bridge.h"
 #include "flutter/lib/ui/window/viewport_metrics.h"