From a0614fff1f0548cde52b121d0a1847b74cf61e50 Mon Sep 17 00:00:00 2001
From: Sam Haves <shaves@google.com>
Date: Tue, 24 Jun 2025 06:16:51 -0700
Subject: [PATCH] Fix tinyxml2 includes.

PiperOrigin-RevId: 775204246
Change-Id: Ia5c692eb29b2a670cb01e3efdeb85fd6e1474b99
---
 src/experimental/usd/plugins/mjcf/mjcf_file_format.cc | 2 +-
 src/xml/xml.cc                                        | 3 +--
 src/xml/xml_base.h                                    | 2 +-
 src/xml/xml_native_reader.cc                          | 3 +--
 src/xml/xml_native_reader.h                           | 3 +--
 src/xml/xml_urdf.cc                                   | 1 -
 src/xml/xml_util.cc                                   | 3 +--
 src/xml/xml_util.h                                    | 3 +--
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/experimental/usd/plugins/mjcf/mjcf_file_format.cc b/src/experimental/usd/plugins/mjcf/mjcf_file_format.cc
index b7e75bf5..180986b7 100644
--- a/src/experimental/usd/plugins/mjcf/mjcf_file_format.cc
+++ b/src/experimental/usd/plugins/mjcf/mjcf_file_format.cc
@@ -21,7 +21,7 @@
 
 #include <mujoco/mujoco.h>
 #include "mjcf/mujoco_to_usd.h"
-#include "third_party/tinyxml2/tinyxml2.h"
+#include "tinyxml2.h"
 #include <pxr/base/tf/diagnostic.h>
 #include <pxr/base/tf/enum.h>
 #include <pxr/base/tf/pathUtils.h>
diff --git a/src/xml/xml.cc b/src/xml/xml.cc
index 57b1e123..e7d9f581 100644
--- a/src/xml/xml.cc
+++ b/src/xml/xml.cc
@@ -27,8 +27,6 @@
 #include <string_view>
 #include <unordered_set>
 
-#include "tinyxml2.h"
-
 #include <mujoco/mujoco.h>
 #include <mujoco/mjmodel.h>
 #include <mujoco/mjplugin.h>
@@ -42,6 +40,7 @@
 #include "xml/xml_native_writer.h"
 #include "xml/xml_urdf.h"
 #include "xml/xml_util.h"
+#include "tinyxml2.h"
 
 namespace {
 
diff --git a/src/xml/xml_base.h b/src/xml/xml_base.h
index 9dc261b1..f6e41683 100644
--- a/src/xml/xml_base.h
+++ b/src/xml/xml_base.h
@@ -18,10 +18,10 @@
 #include <cstdlib>
 #include <string>
 
-#include "tinyxml2.h"
 #include <mujoco/mjmodel.h>
 #include <mujoco/mjspec.h>
 #include "xml/xml_util.h"
+#include "tinyxml2.h"
 
 
 // keyword maps (defined in implementation files)
diff --git a/src/xml/xml_native_reader.cc b/src/xml/xml_native_reader.cc
index 55d3c4ce..89f145db 100644
--- a/src/xml/xml_native_reader.cc
+++ b/src/xml/xml_native_reader.cc
@@ -28,8 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include "tinyxml2.h"
-
 #include <mujoco/mujoco.h>
 #include <mujoco/mjmodel.h>
 #include <mujoco/mjplugin.h>
@@ -45,6 +43,7 @@
 #include "user/user_util.h"
 #include "xml/xml_base.h"
 #include "xml/xml_util.h"
+#include "tinyxml2.h"
 
 namespace {
 using std::string;
diff --git a/src/xml/xml_native_reader.h b/src/xml/xml_native_reader.h
index 010ea2d5..1ad53464 100644
--- a/src/xml/xml_native_reader.h
+++ b/src/xml/xml_native_reader.h
@@ -18,13 +18,12 @@
 #include <sstream>
 #include <string>
 
-#include "tinyxml2.h"
-
 #include <mujoco/mujoco.h>
 #include <mujoco/mjspec.h>
 #include "user/user_util.h"
 #include "xml/xml_base.h"
 #include "xml/xml_util.h"
+#include "tinyxml2.h"
 
 class mjXReader : public mjXBase {
  public:
diff --git a/src/xml/xml_urdf.cc b/src/xml/xml_urdf.cc
index 3667cf35..5598366c 100644
--- a/src/xml/xml_urdf.cc
+++ b/src/xml/xml_urdf.cc
@@ -26,7 +26,6 @@
 #include "xml/xml_native_reader.h"
 #include "xml/xml_urdf.h"
 #include "xml/xml_util.h"
-
 #include "tinyxml2.h"
 
 using tinyxml2::XMLElement;
diff --git a/src/xml/xml_util.cc b/src/xml/xml_util.cc
index 5e7f52bc..ad1a3546 100644
--- a/src/xml/xml_util.cc
+++ b/src/xml/xml_util.cc
@@ -31,8 +31,6 @@
 #include <utility>
 #include <vector>
 
-#include "tinyxml2.h"
-
 #include <mujoco/mujoco.h>
 #include "cc/array_safety.h"
 #include "engine/engine_util_errmem.h"
@@ -40,6 +38,7 @@
 #include "user/user_util.h"
 #include "xml/xml_util.h"
 #include "xml/xml_numeric_format.h"
+#include "tinyxml2.h"
 
 namespace {
 
diff --git a/src/xml/xml_util.h b/src/xml/xml_util.h
index 86d61948..37cd843b 100644
--- a/src/xml/xml_util.h
+++ b/src/xml/xml_util.h
@@ -24,10 +24,9 @@
 #include <vector>
 #include <sstream>
 
-#include "tinyxml2.h"
-
 #include <mujoco/mujoco.h>
 #include "user/user_util.h"
+#include "tinyxml2.h"
 
 // error string copy
 void mjCopyError(char* dst, const char* src, int maxlen);