diff --git a/.gitignore b/.gitignore
index 33834fc34d3ad..70d501a1a4b38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .DS_Store
 .ccls-cache
 .classpath
+.clangd/
 .cproject
 .dart_tool
 .gdb_history
diff --git a/shell/platform/fuchsia/dart_runner/builtin_libraries.h b/shell/platform/fuchsia/dart_runner/builtin_libraries.h
index 4f5df5472f4f3..e41d930906386 100644
--- a/shell/platform/fuchsia/dart_runner/builtin_libraries.h
+++ b/shell/platform/fuchsia/dart_runner/builtin_libraries.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
-#define TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
 
 #include <memory>
 #include <string>
@@ -25,4 +25,4 @@ void InitBuiltinLibrariesForIsolate(
 
 }  // namespace dart_runner
 
-#endif  // TOPAZ_RUNTIME_DART_RUNNER_BUILTIN_LIBRARIES_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_BUILTIN_LIBRARIES_H_
diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.h b/shell/platform/fuchsia/dart_runner/dart_component_controller.h
index de46320b961b5..8f8f7acad2352 100644
--- a/shell/platform/fuchsia/dart_runner/dart_component_controller.h
+++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
-#define TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
 
 #include <memory>
 
@@ -92,4 +92,4 @@ class DartComponentController : public fuchsia::sys::ComponentController {
 
 }  // namespace dart_runner
 
-#endif  // TOPAZ_RUNTIME_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_COMPONENT_CONTROLLER_H_
diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.h b/shell/platform/fuchsia/dart_runner/dart_runner.h
index bfb762fd3b042..c4a0fd9c17ffe 100644
--- a/shell/platform/fuchsia/dart_runner/dart_runner.h
+++ b/shell/platform/fuchsia/dart_runner/dart_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
-#define TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
 
 #include <fuchsia/sys/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
@@ -41,4 +41,4 @@ class DartRunner : public fuchsia::sys::Runner {
 
 }  // namespace dart_runner
 
-#endif  // TOPAZ_RUNTIME_DART_RUNNER_DART_RUNNER_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_DART_RUNNER_H_
diff --git a/shell/platform/fuchsia/dart_runner/logging.h b/shell/platform/fuchsia/dart_runner/logging.h
index e66806408b07c..2eb57d47d8cdd 100644
--- a/shell/platform/fuchsia/dart_runner/logging.h
+++ b/shell/platform/fuchsia/dart_runner/logging.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
-#define TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_
 
 namespace dart_runner {
 
@@ -12,4 +12,4 @@ namespace dart_runner {
 
 }  // namespace dart_runner
 
-#endif  // TOPAZ_RUNTIME_DART_RUNNER_LOGGING_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_DART_RUNNER_LOGGING_H_
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge.h b/shell/platform/fuchsia/flutter/accessibility_bridge.h
index 14303fde2d151..ac124c985bcb6 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge.h
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
-#define TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
+#ifndef FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_
+#define FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 #include <fuchsia/sys/cpp/fidl.h>
@@ -136,4 +136,4 @@ class AccessibilityBridge
 };
 }  // namespace flutter_runner
 
-#endif  // TOPAZ_RUNTIME_FLUTTER_RUNNER_ACCESSIBILITY_BRIDGE_H_
+#endif  // FLUTTER_SHELL_PLATFORM_FUCHSIA_FLUTTER_ACCESSIBILITY_BRIDGE_H_