diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fbe55071e4..d0abc47b85 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -61,6 +61,7 @@
 #include <HFBackEvent.h>
 #include <LocalVoxelsList.h>
 #include <LogHandler.h>
+#include <MainWindow.h>
 #include <NetworkAccessManager.h>
 #include <OctalCode.h>
 #include <OctreeSceneStats.h>
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 833f1374ce..c2136f1c57 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -12,35 +12,21 @@
 #ifndef hifi_Application_h
 #define hifi_Application_h
 
-#include <map>
-#include <time.h>
-
 #include <QApplication>
-#include <QMainWindow>
-#include <QAction>
 #include <QHash>
 #include <QImage>
-#include <QList>
 #include <QPointer>
 #include <QSet>
 #include <QSettings>
 #include <QStringList>
-#include <QHash>
-#include <QTouchEvent>
 #include <QUndoStack>
-#include <QSystemTrayIcon>
 
 #include <EntityCollisionSystem.h>
 #include <EntityEditPacketSender.h>
-#include <NetworkPacket.h>
-#include <NodeList.h>
-#include <PacketHeaders.h>
-#include <ScriptEngine.h>
 #include <OctreeQuery.h>
 #include <ViewFrustum.h>
 #include <VoxelEditPacketSender.h>
 
-#include "MainWindow.h"
 #include "Audio.h"
 #include "Camera.h"
 #include "DatagramProcessor.h"
@@ -89,17 +75,19 @@
 #include "UndoStackScriptingInterface.h"
 
 
-class QAction;
-class QActionGroup;
 class QGLWidget;
 class QKeyEvent;
 class QMouseEvent;
 class QSettings;
+class QSystemTrayIcon;
+class QTouchEvent;
 class QWheelEvent;
 
 class FaceTracker;
+class MainWindow;
 class Node;
 class ProgramObject;
+class ScriptEngine;
 
 static const float NODE_ADDED_RED   = 0.0f;
 static const float NODE_ADDED_GREEN = 1.0f;
diff --git a/interface/src/GLCanvas.cpp b/interface/src/GLCanvas.cpp
index cec3f62b7d..10090de51a 100644
--- a/interface/src/GLCanvas.cpp
+++ b/interface/src/GLCanvas.cpp
@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QMainWindow>
 #include <QMimeData>
 #include <QUrl>
 #include <QWindow>
 
 #include "Application.h"
 #include "GLCanvas.h"
+#include "MainWindow.h"
 #include "devices/OculusManager.h"
 
 const int MSECS_PER_FRAME_WHEN_THROTTLED = 66;
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 6c2c3966fc..14327bd51a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -32,6 +32,7 @@
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <DependencyManager.h>
+#include <MainWindow.h>
 #include <UUID.h>
 #include <UserActivityLogger.h>
 #include <XmppClient.h>
diff --git a/interface/src/entities/EntityTreeRenderer.h b/interface/src/entities/EntityTreeRenderer.h
index a8695db36d..3d79358536 100644
--- a/interface/src/entities/EntityTreeRenderer.h
+++ b/interface/src/entities/EntityTreeRenderer.h
@@ -17,6 +17,7 @@
 
 #include <EntityTree.h>
 #include <EntityScriptingInterface.h> // for RayToEntityIntersectionResult
+#include <MouseEvent.h>
 #include <Octree.h>
 #include <OctreePacketData.h>
 #include <OctreeRenderer.h>
@@ -27,6 +28,8 @@
 
 #include "renderer/Model.h"
 
+class ScriptEngine;
+
 class EntityScriptDetails {
 public:
     QString scriptText;
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 591ae87560..d69b1d0ba1 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -17,6 +17,7 @@
 #include <QScriptValue>
 
 #include "Application.h"
+#include "MainWindow.h"
 #include "Menu.h"
 #include "ui/ModelsBrowser.h"
 
diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index dbc29be71a..3fc915e073 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -12,6 +12,7 @@
 #include "AddressBarDialog.h"
 #include "AddressManager.h"
 #include "Application.h"
+#include "MainWindow.h"
 
 const QString ADDRESSBAR_GO_BUTTON_ICON = "images/address-bar-submit.svg";
 const QString ADDRESSBAR_GO_BUTTON_ACTIVE_ICON = "images/address-bar-submit-active.svg";
diff --git a/interface/src/ui/AnimationsDialog.cpp b/interface/src/ui/AnimationsDialog.cpp
index c5ab826ebb..65e7cadc77 100644
--- a/interface/src/ui/AnimationsDialog.cpp
+++ b/interface/src/ui/AnimationsDialog.cpp
@@ -22,6 +22,7 @@
 
 #include "AnimationsDialog.h"
 #include "Application.h"
+#include "MainWindow.h"
 
 AnimationsDialog::AnimationsDialog() :
     QDialog(Application::getInstance()->getWindow()) {
diff --git a/interface/src/ui/AttachmentsDialog.cpp b/interface/src/ui/AttachmentsDialog.cpp
index 44dd2452e6..1209af580d 100644
--- a/interface/src/ui/AttachmentsDialog.cpp
+++ b/interface/src/ui/AttachmentsDialog.cpp
@@ -20,6 +20,7 @@
 
 #include "Application.h"
 #include "AttachmentsDialog.h"
+#include "MainWindow.h"
 
 AttachmentsDialog::AttachmentsDialog() :
     QDialog(Application::getInstance()->getWindow()) {
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 747b4ae68d..61ce9f88fc 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -16,6 +16,8 @@
 #include <QScrollBar>
 #include <QSizePolicy>
 #include <QTimer>
+#include "qtimespan.h"
+
 
 #include <AddressManager.h>
 #include <AccountManager.h>
@@ -23,7 +25,7 @@
 #include "Application.h"
 #include "ChatMessageArea.h"
 #include "FlowLayout.h"
-#include "qtimespan.h"
+#include "MainWindow.h"
 #include "UIUtil.h"
 #include "XmppClient.h"
 
diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp
index ab84980d80..23d6d5df2f 100644
--- a/interface/src/ui/HMDToolsDialog.cpp
+++ b/interface/src/ui/HMDToolsDialog.cpp
@@ -21,6 +21,7 @@
 
 #include <VoxelConstants.h>
 
+#include "MainWindow.h"
 #include "Menu.h"
 #include "devices/OculusManager.h"
 #include "ui/HMDToolsDialog.h"
diff --git a/interface/src/ui/MetavoxelEditor.cpp b/interface/src/ui/MetavoxelEditor.cpp
index 97c4c08b41..46f69b0452 100644
--- a/interface/src/ui/MetavoxelEditor.cpp
+++ b/interface/src/ui/MetavoxelEditor.cpp
@@ -37,6 +37,7 @@
 #include <MetavoxelUtil.h>
 
 #include "Application.h"
+#include "MainWindow.h"
 #include "MetavoxelEditor.h"
 
 using namespace std;
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 61cc9718b3..318dce977a 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -11,6 +11,7 @@
 
 
 #include "Application.h"
+#include "MainWindow.h"
 #include "Menu.h"
 #include "ModelsBrowser.h"
 #include "PreferencesDialog.h"
diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp
index da1d2c68f4..8774bffc36 100644
--- a/interface/src/ui/ToolWindow.cpp
+++ b/interface/src/ui/ToolWindow.cpp
@@ -10,6 +10,7 @@
 //
 
 #include "Application.h"
+#include "MainWindow.h"
 #include "ToolWindow.h"
 #include "UIUtil.h"