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 #include "mjcf/mujoco_to_usd.h" -#include "third_party/tinyxml2/tinyxml2.h" +#include "tinyxml2.h" #include #include #include 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 #include -#include "tinyxml2.h" - #include #include #include @@ -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 #include -#include "tinyxml2.h" #include #include #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 #include -#include "tinyxml2.h" - #include #include #include @@ -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 #include -#include "tinyxml2.h" - #include #include #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 #include -#include "tinyxml2.h" - #include #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 #include -#include "tinyxml2.h" - #include #include "user/user_util.h" +#include "tinyxml2.h" // error string copy void mjCopyError(char* dst, const char* src, int maxlen);