diff --git a/toolchain/lex/numeric_literal.cpp b/toolchain/lex/numeric_literal.cpp
index a153564457ff..1be9ab820a6f 100644
--- a/toolchain/lex/numeric_literal.cpp
+++ b/toolchain/lex/numeric_literal.cpp
@@ -12,12 +12,10 @@
 #include "toolchain/lex/character_set.h"
 #include "toolchain/lex/helpers.h"
 
-namespace llvm {
-
 // We use formatv primarily for diagnostics. In these cases, it's expected that
 // the spelling in source code should be used.
 template <>
-struct format_provider<Carbon::Lex::NumericLiteral::Radix> {
+struct llvm::format_provider<Carbon::Lex::NumericLiteral::Radix> {
   using Radix = Carbon::Lex::NumericLiteral::Radix;
   static void format(const Radix& radix, raw_ostream& out,
                      StringRef /*style*/) {
@@ -35,8 +33,6 @@ struct format_provider<Carbon::Lex::NumericLiteral::Radix> {
   }
 };
 
-}  // namespace llvm
-
 namespace Carbon::Lex {
 
 auto NumericLiteral::Lex(llvm::StringRef source_text)
diff --git a/toolchain/lex/token_kind.h b/toolchain/lex/token_kind.h
index b023943945f2..7ca87e99acab 100644
--- a/toolchain/lex/token_kind.h
+++ b/toolchain/lex/token_kind.h
@@ -133,12 +133,10 @@ constexpr llvm::ArrayRef<TokenKind> TokenKind::KeywordTokens =
 
 }  // namespace Carbon::Lex
 
-namespace llvm {
-
 // We use formatv primarily for diagnostics. In these cases, it's expected that
 // the spelling in source code should be used.
 template <>
-struct format_provider<Carbon::Lex::TokenKind> {
+struct llvm::format_provider<Carbon::Lex::TokenKind> {
   static void format(const Carbon::Lex::TokenKind& kind, raw_ostream& out,
                      StringRef /*style*/) {
     auto spelling = kind.fixed_spelling();
@@ -151,6 +149,4 @@ struct format_provider<Carbon::Lex::TokenKind> {
   }
 };
 
-}  // namespace llvm
-
 #endif  // CARBON_TOOLCHAIN_LEX_TOKEN_KIND_H_
diff --git a/toolchain/parse/context.cpp b/toolchain/parse/context.cpp
index ab2a285e7a32..9f27bd080bfd 100644
--- a/toolchain/parse/context.cpp
+++ b/toolchain/parse/context.cpp
@@ -25,11 +25,9 @@ enum class RelativeLocation : int8_t {
 
 }  // namespace Carbon::Parse
 
-namespace llvm {
-
 // Adapts RelativeLocation for use with formatv.
 template <>
-struct format_provider<Carbon::Parse::RelativeLocation> {
+struct llvm::format_provider<Carbon::Parse::RelativeLocation> {
   using RelativeLocation = Carbon::Parse::RelativeLocation;
   static void format(const RelativeLocation& loc, raw_ostream& out,
                      StringRef /*style*/) {
@@ -47,8 +45,6 @@ struct format_provider<Carbon::Parse::RelativeLocation> {
   }
 };
 
-}  // namespace llvm
-
 namespace Carbon::Parse {
 
 Context::Context(Tree& tree, Lex::TokenizedBuffer& tokens,