diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index e3d01826b3..d7e4b1ae7c 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -194,7 +194,7 @@ link_hifi_libraries(
recording fbx networking model-networking entities avatars
audio audio-client animation script-engine physics
render-utils entities-renderer avatars-renderer ui auto-updater
- controllers plugins image
+ controllers plugins image trackers
ui-plugins display-plugins input-plugins
${NON_ANDROID_LIBRARIES}
)
diff --git a/interface/resources/icons/tablet-icons/goto-msg.svg b/interface/resources/icons/tablet-icons/goto-msg.svg
index ef905b6066..9b576ab1bf 100644
--- a/interface/resources/icons/tablet-icons/goto-msg.svg
+++ b/interface/resources/icons/tablet-icons/goto-msg.svg
@@ -1,18 +1,18 @@
-
-
-
+
+
+
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 306fa99852..1d90c523b5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -128,6 +128,7 @@
#include
#include
#include
+#include
#include "AudioClient.h"
@@ -136,7 +137,6 @@
#include "avatar/ScriptAvatar.h"
#include "CrashHandler.h"
#include "devices/DdeFaceTracker.h"
-#include "devices/EyeTracker.h"
#include "devices/Leapmotion.h"
#include "DiscoverabilityManager.h"
#include "GLCanvas.h"
diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp
index f2eeba9d60..16e5776d87 100644
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@@ -13,6 +13,7 @@
#include
#include
+#include
#include "Application.h"
#include "Avatar.h"
@@ -22,7 +23,6 @@
#include "Menu.h"
#include "Util.h"
#include "devices/DdeFaceTracker.h"
-#include "devices/EyeTracker.h"
#include
using namespace std;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index b8c7656839..f2726930b5 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -41,7 +41,7 @@
#include
#include
#include
-#include
+#include
#include "Application.h"
#include "AvatarManager.h"
diff --git a/interface/src/devices/DdeFaceTracker.h b/interface/src/devices/DdeFaceTracker.h
index 973c3b224e..f125dfc3cf 100644
--- a/interface/src/devices/DdeFaceTracker.h
+++ b/interface/src/devices/DdeFaceTracker.h
@@ -22,7 +22,7 @@
#include
#include
-#include "FaceTracker.h"
+#include
class DdeFaceTracker : public FaceTracker, public Dependency {
Q_OBJECT
diff --git a/interface/src/devices/Leapmotion.h b/interface/src/devices/Leapmotion.h
index d7981a65e8..6ecec8ccf9 100644
--- a/interface/src/devices/Leapmotion.h
+++ b/interface/src/devices/Leapmotion.h
@@ -14,7 +14,7 @@
#include
-#include "MotionTracker.h"
+#include
#ifdef HAVE_LEAPMOTION
#include
diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index 0d0c2ef668..f3ec3cd79d 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -17,7 +17,7 @@
#include
#include "Application.h"
-#include "devices/MotionTracker.h"
+#include
void ControllerScriptingInterface::handleMetaEvent(HFMetaEvent* event) {
if (event->type() == HFActionEvent::startType()) {
diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp
index 341915e57f..2b715eac9d 100644
--- a/interface/src/ui/AvatarInputs.cpp
+++ b/interface/src/ui/AvatarInputs.cpp
@@ -11,9 +11,9 @@
#include
#include
+#include
#include "Application.h"
-#include "devices/FaceTracker.h"
#include "Menu.h"
HIFI_QML_DEF(AvatarInputs)
diff --git a/libraries/trackers/CMakeLists.txt b/libraries/trackers/CMakeLists.txt
new file mode 100644
index 0000000000..0999a45b59
--- /dev/null
+++ b/libraries/trackers/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(TARGET_NAME trackers)
+setup_hifi_library()
+GroupSources("src")
+link_hifi_libraries(shared)
+
+target_bullet()
diff --git a/interface/src/devices/DeviceTracker.cpp b/libraries/trackers/src/trackers/DeviceTracker.cpp
similarity index 100%
rename from interface/src/devices/DeviceTracker.cpp
rename to libraries/trackers/src/trackers/DeviceTracker.cpp
diff --git a/interface/src/devices/DeviceTracker.h b/libraries/trackers/src/trackers/DeviceTracker.h
similarity index 100%
rename from interface/src/devices/DeviceTracker.h
rename to libraries/trackers/src/trackers/DeviceTracker.h
diff --git a/interface/src/devices/EyeTracker.cpp b/libraries/trackers/src/trackers/EyeTracker.cpp
similarity index 100%
rename from interface/src/devices/EyeTracker.cpp
rename to libraries/trackers/src/trackers/EyeTracker.cpp
diff --git a/interface/src/devices/EyeTracker.h b/libraries/trackers/src/trackers/EyeTracker.h
similarity index 100%
rename from interface/src/devices/EyeTracker.h
rename to libraries/trackers/src/trackers/EyeTracker.h
diff --git a/interface/src/devices/FaceTracker.cpp b/libraries/trackers/src/trackers/FaceTracker.cpp
similarity index 100%
rename from interface/src/devices/FaceTracker.cpp
rename to libraries/trackers/src/trackers/FaceTracker.cpp
diff --git a/interface/src/devices/FaceTracker.h b/libraries/trackers/src/trackers/FaceTracker.h
similarity index 100%
rename from interface/src/devices/FaceTracker.h
rename to libraries/trackers/src/trackers/FaceTracker.h
diff --git a/interface/src/devices/Logging.cpp b/libraries/trackers/src/trackers/Logging.cpp
similarity index 100%
rename from interface/src/devices/Logging.cpp
rename to libraries/trackers/src/trackers/Logging.cpp
diff --git a/interface/src/devices/Logging.h b/libraries/trackers/src/trackers/Logging.h
similarity index 100%
rename from interface/src/devices/Logging.h
rename to libraries/trackers/src/trackers/Logging.h
diff --git a/interface/src/devices/MotionTracker.cpp b/libraries/trackers/src/trackers/MotionTracker.cpp
similarity index 100%
rename from interface/src/devices/MotionTracker.cpp
rename to libraries/trackers/src/trackers/MotionTracker.cpp
diff --git a/interface/src/devices/MotionTracker.h b/libraries/trackers/src/trackers/MotionTracker.h
similarity index 100%
rename from interface/src/devices/MotionTracker.h
rename to libraries/trackers/src/trackers/MotionTracker.h