diff --git a/quiche/BUILD.bazel b/quiche/BUILD.bazel
index cd700f7..7e4687b 100644
--- a/quiche/BUILD.bazel
+++ b/quiche/BUILD.bazel
@@ -179,6 +179,8 @@
         "@com_google_absl//absl/hash",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/numeric:int128",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/time",
diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_command_line_flags_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_command_line_flags_impl.h
index d9f7bac..79d91d2 100644
--- a/quiche/common/platform/default/quiche_platform_impl/quiche_command_line_flags_impl.h
+++ b/quiche/common/platform/default/quiche_platform_impl/quiche_command_line_flags_impl.h
@@ -26,7 +26,7 @@
 }  // namespace quiche
 
 template <typename T>
-T GetQuicheFlagImpl(const absl::Flag<T>& flag) {
+T GetQuicheFlagImplImpl(const absl::Flag<T>& flag) {
   return absl::GetFlag(flag);
 }
 
diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.h
index de350de..9e97b26 100644
--- a/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.h
+++ b/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.h
@@ -29,13 +29,14 @@
 #include "quiche/common/quiche_protocol_flags_list.h"
 #undef QUICHE_PROTOCOL_FLAG
 
-inline bool GetQuicheFlagImpl(bool flag) { return FLAGS_##flag; }
-inline int32_t GetQuicheFlagImpl(int32_t flag) { return FLAGS_##flag; }
-inline int64_t GetQuicheFlagImpl(int64_t flag) { return FLAGS_##flag; }
-inline uint64_t GetQuicheFlagImpl(uint64_t flag) { return FLAGS_##flag; }
-inline double GetQuicheFlagImpl(double flag) { return FLAGS_##flag; }
-inline std::string GetQuicheFlagImpl(const std::string& flag) {
-  return FLAGS_##flag;
+#define GetQuicheFlagImpl(flag) GetQuicheFlagImplImpl(FLAGS_##flag)
+inline bool GetQuicheFlagImplImpl(bool flag) { return flag; }
+inline int32_t GetQuicheFlagImplImpl(int32_t flag) { return flag; }
+inline int64_t GetQuicheFlagImplImpl(int64_t flag) { return flag; }
+inline uint64_t GetQuicheFlagImplImpl(uint64_t flag) { return flag; }
+inline double GetQuicheFlagImplImpl(double flag) { return flag; }
+inline std::string GetQuicheFlagImplImpl(const std::string& flag) {
+  return flag;
 }
 #define SetQuicheFlagImpl(flag, value) ((FLAGS_##flag) = (value))