From c20b337221fb1c8fb02b4ea3d9363adbc2ef0ad3 Mon Sep 17 00:00:00 2001
From: Eric Salo <salo@google.com>
Date: Thu, 26 Oct 2023 08:40:45 -0700
Subject: [PATCH] upb: remove redundant #includes from the foo.upbdefs.h
 gencode

PiperOrigin-RevId: 576883852
---
 upb_generator/protoc-gen-upbdefs.cc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/upb_generator/protoc-gen-upbdefs.cc b/upb_generator/protoc-gen-upbdefs.cc
index 69682c4e78..58234150a2 100644
--- a/upb_generator/protoc-gen-upbdefs.cc
+++ b/upb_generator/protoc-gen-upbdefs.cc
@@ -70,17 +70,13 @@ void WriteDefHeader(upb::FileDefPtr file, Output& output) {
       "#define $0_UPBDEFS_H_\n\n"
       "#include \"upb/reflection/def.h\"\n"
       "#include \"upb/reflection/internal/def_pool.h\"\n"
-      "#include \"upb/port/def.inc\"\n"
+      "\n"
+      "#include \"upb/port/def.inc\" // Must be last.\n"
       "#ifdef __cplusplus\n"
       "extern \"C\" {\n"
       "#endif\n\n",
       ToPreproc(file.name()));
 
-  output("#include \"upb/reflection/def.h\"\n");
-  output("\n");
-  output("#include \"upb/port/def.inc\"\n");
-  output("\n");
-
   output("extern _upb_DefPool_Init $0;\n", DefInitSymbol(file));
   output("\n");