diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index eccb0960dd..c3e1edd415 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -16,7 +16,7 @@
 
 #include <QObject>
 
-#include "JointState.h"
+#include "JointState.h"  // We might want to change this (later) to something that doesn't depend on gpu, fbx and model. -HRS
 
 class AnimationHandle;
 typedef std::shared_ptr<AnimationHandle> AnimationHandlePointer;
diff --git a/tests/rig/CMakeLists.txt b/tests/rig/CMakeLists.txt
index abf5da12c2..2e9dbc9424 100644
--- a/tests/rig/CMakeLists.txt
+++ b/tests/rig/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Declare dependencies
 macro (setup_testcase_dependencies)
   # link in the shared libraries
-  link_hifi_libraries(shared animation)
+  link_hifi_libraries(shared animation gpu fbx model)
 
   copy_dlls_beside_windows_executable()
 endmacro ()