diff --git a/libraries/model-baker/src/model-baker/Baker.cpp b/libraries/model-baker/src/model-baker/Baker.cpp
index fc27756877..4d740f4a94 100644
--- a/libraries/model-baker/src/model-baker/Baker.cpp
+++ b/libraries/model-baker/src/model-baker/Baker.cpp
@@ -11,8 +11,6 @@
 
 #include "Baker.h"
 
-#include <shared/HifiTypes.h>
-
 #include "BakerTypes.h"
 #include "ModelMath.h"
 #include "BuildGraphicsMeshTask.h"
@@ -118,7 +116,7 @@ namespace baker {
 
     class BakerEngineBuilder {
     public:
-        using Input = VaryingSet2<hfm::Model::Pointer, QVariantHash>;
+        using Input = VaryingSet2<hfm::Model::Pointer, hifi::VariantHash>;
         using Output = VaryingSet2<hfm::Model::Pointer, MaterialMapping>;
         using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>;
         void build(JobModel& model, const Varying& input, Varying& output) {
@@ -170,7 +168,7 @@ namespace baker {
         }
     };
 
-    Baker::Baker(const hfm::Model::Pointer& hfmModel, const QVariantHash& mapping) :
+    Baker::Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping) :
         _engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<BakeContext>())) {
         _engine->feedInput<BakerEngineBuilder::Input>(0, hfmModel);
         _engine->feedInput<BakerEngineBuilder::Input>(1, mapping);
diff --git a/libraries/model-baker/src/model-baker/Baker.h b/libraries/model-baker/src/model-baker/Baker.h
index 1880aba618..e8a97b863d 100644
--- a/libraries/model-baker/src/model-baker/Baker.h
+++ b/libraries/model-baker/src/model-baker/Baker.h
@@ -12,8 +12,7 @@
 #ifndef hifi_baker_Baker_h
 #define hifi_baker_Baker_h
 
-#include <QMap>
-
+#include <shared/HifiTypes.h>
 #include <hfm/HFM.h>
 
 #include "Engine.h"
@@ -23,7 +22,7 @@
 namespace baker {
     class Baker {
     public:
-        Baker(const hfm::Model::Pointer& hfmModel, const QVariantHash& mapping);
+        Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping);
 
         void run();
 
@@ -34,7 +33,6 @@ namespace baker {
     protected:
         EnginePointer _engine;
     };
-
 };
 
 #endif //hifi_baker_Baker_h
diff --git a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
index 63d0408337..e5a2079d3f 100644
--- a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
+++ b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
@@ -13,7 +13,7 @@
 
 #include "ModelBakerLogging.h"
 
-QMap<QString, QString> getJointNameMapping(const QVariantHash& mapping) {
+QMap<QString, QString> getJointNameMapping(const hifi::VariantHash& mapping) {
     static const QString JOINT_NAME_MAPPING_FIELD = "jointMap";
     QMap<QString, QString> hfmToHifiJointNameMap;
     if (!mapping.isEmpty() && mapping.contains(JOINT_NAME_MAPPING_FIELD) && mapping[JOINT_NAME_MAPPING_FIELD].type() == QVariant::Hash) {
@@ -26,7 +26,7 @@ QMap<QString, QString> getJointNameMapping(const QVariantHash& mapping) {
     return hfmToHifiJointNameMap;
 }
 
-QMap<QString, glm::quat> getJointRotationOffsets(const QVariantHash& mapping) {
+QMap<QString, glm::quat> getJointRotationOffsets(const hifi::VariantHash& mapping) {
     QMap<QString, glm::quat> jointRotationOffsets;
     static const QString JOINT_ROTATION_OFFSET_FIELD = "jointRotationOffset";
     if (!mapping.isEmpty() && mapping.contains(JOINT_ROTATION_OFFSET_FIELD) && mapping[JOINT_ROTATION_OFFSET_FIELD].type() == QVariant::Hash) {
diff --git a/libraries/model-baker/src/model-baker/PrepareJointsTask.h b/libraries/model-baker/src/model-baker/PrepareJointsTask.h
index 6185d2fdad..0dbb9d584d 100644
--- a/libraries/model-baker/src/model-baker/PrepareJointsTask.h
+++ b/libraries/model-baker/src/model-baker/PrepareJointsTask.h
@@ -12,8 +12,7 @@
 #ifndef hifi_PrepareJointsTask_h
 #define hifi_PrepareJointsTask_h
 
-#include <QHash>
-
+#include <shared/HifiTypes.h>
 #include <hfm/HFM.h>
 
 #include "Engine.h"
@@ -29,7 +28,7 @@ public:
 class PrepareJointsTask {
 public:
     using Config = PrepareJointsTaskConfig;
-    using Input = baker::VaryingSet2<std::vector<hfm::Joint>, QVariantHash /*mapping*/>;
+    using Input = baker::VaryingSet2<std::vector<hfm::Joint>, hifi::VariantHash /*mapping*/>;
     using Output = baker::VaryingSet3<std::vector<hfm::Joint>, QMap<int, glm::quat> /*jointRotationOffsets*/, QHash<QString, int> /*jointIndices*/>;
     using JobModel = baker::Job::ModelIO<PrepareJointsTask, Input, Output, Config>;