diff --git a/src/FBX2glTF.h b/src/FBX2glTF.h
index ed5cb09..81a5adc 100644
--- a/src/FBX2glTF.h
+++ b/src/FBX2glTF.h
@@ -29,4 +29,13 @@
 
 #include "mathfu.hpp"
 
+// give all modules access to our tweaked JSON
+#include <json.hpp>
+#include <fifo_map.hpp>
+
+template<class K, class V, class ignore, class A>
+using workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
+
+using json = nlohmann::basic_json<workaround_fifo_map>;
+
 extern bool verboseOutput;
diff --git a/src/fbx/Fbx2Raw.cpp b/src/fbx/Fbx2Raw.cpp
index b61702d..8404a1f 100644
--- a/src/fbx/Fbx2Raw.cpp
+++ b/src/fbx/Fbx2Raw.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 #include <cmath>
 
-#include "gltf/Raw2Gltf.hpp"
+#include "FBX2glTF.h"
 
 #include "utils/File_Utils.hpp"
 #include "utils/String_Utils.hpp"
diff --git a/src/gltf/Raw2Gltf.hpp b/src/gltf/Raw2Gltf.hpp
index 612cb0d..c15278d 100644
--- a/src/gltf/Raw2Gltf.hpp
+++ b/src/gltf/Raw2Gltf.hpp
@@ -16,14 +16,6 @@
 #undef ERROR
 #include <draco/compression/encode.h>
 
-#include <json.hpp>
-#include <fifo_map.hpp>
-
-template<class K, class V, class ignore, class A>
-using workaround_fifo_map = nlohmann::fifo_map<K, V, nlohmann::fifo_map_compare<K>, A>;
-
-using json = nlohmann::basic_json<workaround_fifo_map>;
-
 #include "FBX2glTF.h"
 #include "raw/RawModel.hpp"