diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 95436a5b8b..6f30ca983b 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -28,7 +28,6 @@
 #endif
 
 #include "devices/Faceshift.h"
-#include "devices/OculusManager.h"
 #include "devices/SixenseManager.h"
 #include "ui/ChatWindow.h"
 #include "ui/JSConsole.h"
@@ -56,6 +55,8 @@ const int ONE_SECOND_OF_FRAMES = 60;
 const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
 //////////////////////////////////////////////////////////
 
+const float DEFAULT_OCULUS_UI_ANGULAR_SIZE = 72.0f;
+
 const QString SETTINGS_ADDRESS_KEY = "address";
 class QSettings;
 
diff --git a/interface/src/devices/OculusManager.h b/interface/src/devices/OculusManager.h
index 591ba53239..71fc08c8f9 100644
--- a/interface/src/devices/OculusManager.h
+++ b/interface/src/devices/OculusManager.h
@@ -19,8 +19,6 @@
 
 #include <ProgramObject.h>
 
-const float DEFAULT_OCULUS_UI_ANGULAR_SIZE = 72.0f;
-
 class Camera;
 class PalmData;
 class Text3DOverlay;
diff --git a/interface/src/devices/SixenseManager.h b/interface/src/devices/SixenseManager.h
index 0a7ab78c0e..4082edd153 100644
--- a/interface/src/devices/SixenseManager.h
+++ b/interface/src/devices/SixenseManager.h
@@ -25,6 +25,8 @@
 
 #endif
 
+class PalmData;
+
 const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2
 const unsigned int BUTTON_1 = 1U << 5;
 const unsigned int BUTTON_2 = 1U << 6;
diff --git a/interface/src/ui/ApplicationOverlay.h b/interface/src/ui/ApplicationOverlay.h
index e2094f2a8e..33dcea67a3 100644
--- a/interface/src/ui/ApplicationOverlay.h
+++ b/interface/src/ui/ApplicationOverlay.h
@@ -12,6 +12,7 @@
 #ifndef hifi_ApplicationOverlay_h
 #define hifi_ApplicationOverlay_h
 
+class Camera;
 class Overlays;
 class QOpenGLFramebufferObject;