diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8a13ef650d..3706206f1f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -77,6 +77,7 @@
 #include "ModelUploader.h"
 #include "Util.h"
 
+#include "devices/Faceshift.h"
 #include "devices/Leapmotion.h"
 #include "devices/MIDIManager.h"
 #include "devices/OculusManager.h"
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 61ae317713..d1d15d22a9 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -54,7 +54,6 @@
 #include "avatar/Avatar.h"
 #include "avatar/AvatarManager.h"
 #include "avatar/MyAvatar.h"
-#include "devices/Faceshift.h"
 #include "devices/PrioVR.h"
 #include "devices/SixenseManager.h"
 #include "devices/Visage.h"
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index ec9b93e072..c08df2b2c5 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -38,6 +38,7 @@
 
 #include "Application.h"
 #include "AccountManager.h"
+#include "devices/Faceshift.h"
 #include "Menu.h"
 #include "scripting/LocationScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index 4b1e9e358c..a16cdd9270 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -11,6 +11,7 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include <DependencyManager.h>
+#include <devices/Faceshift.h>
 #include <NodeList.h>
 
 #include "Application.h"
diff --git a/interface/src/devices/Faceshift.cpp b/interface/src/devices/Faceshift.cpp
index fb74f416a9..5c1bbfe709 100644
--- a/interface/src/devices/Faceshift.cpp
+++ b/interface/src/devices/Faceshift.cpp
@@ -14,7 +14,6 @@
 #include <PerfStat.h>
 #include <SharedUtil.h>
 
-#include "Application.h"
 #include "Faceshift.h"
 #include "Menu.h"
 #include "Util.h"
diff --git a/interface/src/devices/Visage.cpp b/interface/src/devices/Visage.cpp
index 38dcdb4ce6..51b927df75 100644
--- a/interface/src/devices/Visage.cpp
+++ b/interface/src/devices/Visage.cpp
@@ -18,6 +18,7 @@
 #include <SharedUtil.h>
 
 #include "Application.h"
+#include "Faceshift.h"
 #include "Visage.h"
 
 // this has to go after our normal includes, because its definition of HANDLE conflicts with Qt's