diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 5b3b53a40c..7e63085d1d 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -17,6 +17,7 @@
 #include <QTemporaryDir>
 
 #include <FSTReader.h>
+#include <FBXSerializer.h>
 #include <OffscreenUi.h>
 
 #include "ModelSelector.h"
diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h
index 7068d5cb76..7c0f9d86c1 100644
--- a/interface/src/ModelPropertiesDialog.h
+++ b/interface/src/ModelPropertiesDialog.h
@@ -14,7 +14,7 @@
 
 #include <QDialog>
 
-#include <FBXSerializer.h>
+#include <hfm/HFM.h>
 #include <FSTReader.h>
 
 #include "ui/ModelsBrowser.h"
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 646f1bc010..34f302b501 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -13,7 +13,6 @@
 
 #include <PathUtils.h>
 
-#include <FBXSerializer.h>
 #include <FBXWriter.h>
 
 #ifdef _WIN32
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index 89794bf40a..9401da4314 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -15,6 +15,8 @@
 #include <QVector>
 
 #include <NumericalConstants.h>
+#include <FBXSerializer.h>
+#include <OBJSerializer.h>
 
 
 // FBXSerializer jumbles the order of the meshes by reading them back out of a hashtable.  This will put
diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h
index 7a6f2f1db6..0fb70e8af7 100644
--- a/tools/vhacd-util/src/VHACDUtil.h
+++ b/tools/vhacd-util/src/VHACDUtil.h
@@ -18,10 +18,10 @@
 #include <vector>
 #include <chrono> //c++11 feature
 #include <QFile>
-#include <FBXSerializer.h>
-#include <OBJSerializer.h>
 #include <VHACD.h>
 
+#include <hfm/HFM.h>
+
 namespace vhacd {
     class VHACDUtil {
     public: