diff --git a/src/ObjCommon/XModel/Gltf/JsonGltf.h b/src/ObjCommon/XModel/Gltf/JsonGltf.h
index 91315e67..fe081504 100644
--- a/src/ObjCommon/XModel/Gltf/JsonGltf.h
+++ b/src/ObjCommon/XModel/Gltf/JsonGltf.h
@@ -325,21 +325,21 @@ namespace gltf
     class JsonRoot
     {
     public:
-        std::optional<std::vector<JsonAccessor>> accessors;
-        std::optional<std::vector<JsonAnimation>> animations;
         JsonAsset asset;
-        std::optional<std::vector<JsonBuffer>> buffers;
-        std::optional<std::vector<JsonBufferView>> bufferViews;
-        std::optional<std::vector<JsonImage>> images;
-        std::optional<std::vector<JsonMaterial>> materials;
-        std::optional<std::vector<JsonMesh>> meshes;
-        std::optional<std::vector<JsonNode>> nodes;
-        std::optional<std::vector<JsonSkin>> skins;
         std::optional<unsigned> scene;
         std::optional<std::vector<JsonScene>> scenes;
+        std::optional<std::vector<JsonNode>> nodes;
+        std::optional<std::vector<JsonAnimation>> animations;
+        std::optional<std::vector<JsonMaterial>> materials;
+        std::optional<std::vector<JsonMesh>> meshes;
         std::optional<std::vector<JsonTexture>> textures;
+        std::optional<std::vector<JsonImage>> images;
+        std::optional<std::vector<JsonSkin>> skins;
+        std::optional<std::vector<JsonAccessor>> accessors;
+        std::optional<std::vector<JsonBufferView>> bufferViews;
+        std::optional<std::vector<JsonBuffer>> buffers;
     };
 
     NLOHMANN_DEFINE_TYPE_EXTENSION(
-        JsonRoot, accessors, animations, asset, buffers, bufferViews, images, materials, meshes, nodes, skins, scene, scenes, textures);
+        JsonRoot, asset, scene, scenes, nodes, animations, materials, meshes, textures, images, skins, accessors, bufferViews, buffers);
 } // namespace gltf
diff --git a/src/ObjWriting/XModel/Gltf/GltfBinOutput.cpp b/src/ObjWriting/XModel/Gltf/GltfBinOutput.cpp
index 1f01b24e..7b5320e0 100644
--- a/src/ObjWriting/XModel/Gltf/GltfBinOutput.cpp
+++ b/src/ObjWriting/XModel/Gltf/GltfBinOutput.cpp
@@ -33,7 +33,7 @@ std::optional<std::string> BinOutput::CreateBufferUri(const void* buffer, size_t
     return std::nullopt;
 }
 
-void BinOutput::EmitJson(const nlohmann::json& json) const
+void BinOutput::EmitJson(const nlohmann::ordered_json& json) const
 {
     static constexpr uint32_t ZERO = 0u;
 
diff --git a/src/ObjWriting/XModel/Gltf/GltfBinOutput.h b/src/ObjWriting/XModel/Gltf/GltfBinOutput.h
index 91eacc75..d333ebd9 100644
--- a/src/ObjWriting/XModel/Gltf/GltfBinOutput.h
+++ b/src/ObjWriting/XModel/Gltf/GltfBinOutput.h
@@ -12,7 +12,7 @@ namespace gltf
         explicit BinOutput(std::ostream& stream);
 
         std::optional<std::string> CreateBufferUri(const void* buffer, size_t bufferSize) const override;
-        void EmitJson(const nlohmann::json& json) const override;
+        void EmitJson(const nlohmann::ordered_json& json) const override;
         void EmitBuffer(const void* buffer, size_t bufferSize) const override;
         void Finalize() const override;
 
diff --git a/src/ObjWriting/XModel/Gltf/GltfOutput.h b/src/ObjWriting/XModel/Gltf/GltfOutput.h
index 8cc7a3da..eafd5b2e 100644
--- a/src/ObjWriting/XModel/Gltf/GltfOutput.h
+++ b/src/ObjWriting/XModel/Gltf/GltfOutput.h
@@ -18,7 +18,7 @@ namespace gltf
 
     public:
         virtual std::optional<std::string> CreateBufferUri(const void* buffer, size_t bufferSize) const = 0;
-        virtual void EmitJson(const nlohmann::json& json) const = 0;
+        virtual void EmitJson(const nlohmann::ordered_json& json) const = 0;
         virtual void EmitBuffer(const void* buffer, size_t bufferSize) const = 0;
         virtual void Finalize() const = 0;
     };
diff --git a/src/ObjWriting/XModel/Gltf/GltfTextOutput.cpp b/src/ObjWriting/XModel/Gltf/GltfTextOutput.cpp
index c80a72f9..402deff8 100644
--- a/src/ObjWriting/XModel/Gltf/GltfTextOutput.cpp
+++ b/src/ObjWriting/XModel/Gltf/GltfTextOutput.cpp
@@ -32,7 +32,7 @@ std::optional<std::string> TextOutput::CreateBufferUri(const void* buffer, const
     return output;
 }
 
-void TextOutput::EmitJson(const nlohmann::json& json) const
+void TextOutput::EmitJson(const nlohmann::ordered_json& json) const
 {
     m_stream << std::setw(4) << json;
 }
diff --git a/src/ObjWriting/XModel/Gltf/GltfTextOutput.h b/src/ObjWriting/XModel/Gltf/GltfTextOutput.h
index d6b9d7b9..4fe847e7 100644
--- a/src/ObjWriting/XModel/Gltf/GltfTextOutput.h
+++ b/src/ObjWriting/XModel/Gltf/GltfTextOutput.h
@@ -12,7 +12,7 @@ namespace gltf
         explicit TextOutput(std::ostream& stream);
 
         std::optional<std::string> CreateBufferUri(const void* buffer, size_t bufferSize) const override;
-        void EmitJson(const nlohmann::json& json) const override;
+        void EmitJson(const nlohmann::ordered_json& json) const override;
         void EmitBuffer(const void* buffer, size_t bufferSize) const override;
         void Finalize() const override;
 
diff --git a/src/ObjWriting/XModel/Gltf/GltfWriter.cpp b/src/ObjWriting/XModel/Gltf/GltfWriter.cpp
index b3576ed0..7dc5a564 100644
--- a/src/ObjWriting/XModel/Gltf/GltfWriter.cpp
+++ b/src/ObjWriting/XModel/Gltf/GltfWriter.cpp
@@ -98,7 +98,7 @@ namespace
             FillBufferData(gltf, xmodel, bufferData);
             CreateBuffer(gltf, xmodel, bufferData);
 
-            const json jRoot = gltf;
+            const ordered_json jRoot = gltf;
             m_output->EmitJson(jRoot);
 
             if (!bufferData.empty())