Fix tinyxml2 includes.

PiperOrigin-RevId: 775204246
Change-Id: Ia5c692eb29b2a670cb01e3efdeb85fd6e1474b99

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>

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 {
 

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)

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;

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:

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;

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 {
 

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);