From 34bba28775f354d171f131375fec492c8dddf0dd Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 24 Sep 2015 21:53:57 +0200
Subject: [PATCH] More header cleanup

---
 interface/src/Application.cpp      |  7 ++++---
 interface/src/Application.h        | 24 +++++++-----------------
 interface/src/avatar/MyAvatar.cpp  |  2 ++
 interface/src/ui/AvatarInputs.cpp  |  5 +++--
 interface/src/ui/ScriptEditBox.cpp |  5 ++++-
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index de227cd934..8e7f2b6973 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -111,12 +111,16 @@
 #include "LODManager.h"
 #include "Menu.h"
 #include "ModelPackager.h"
+#include "Stars.h"
 #include "Util.h"
 #include "InterfaceLogging.h"
 #include "InterfaceActionFactory.h"
+#include "PluginContainerProxy.h"
+#include "AnimDebugDraw.h"
 
 #include "avatar/AvatarManager.h"
 #include "audio/AudioScope.h"
+
 #include "devices/DdeFaceTracker.h"
 #include "devices/EyeTracker.h"
 #include "devices/Faceshift.h"
@@ -152,9 +156,6 @@
 #include "ui/UpdateDialog.h"
 #include "ui/overlays/Cube3DOverlay.h"
 
-#include "PluginContainerProxy.h"
-#include "AnimDebugDraw.h"
-
 // ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
 // FIXME seems to be broken.
 #if defined(Q_OS_WIN)
diff --git a/interface/src/Application.h b/interface/src/Application.h
index c2c8606653..e9eacf7e36 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -37,31 +37,27 @@
 #include <ViewFrustum.h>
 #include <SimpleMovingAverage.h>
 
-#include "AudioClient.h"
+
 #include "Bookmarks.h"
 #include "Camera.h"
 #include "Environment.h"
 #include "FileLogger.h"
 #include "Menu.h"
 #include "Physics.h"
-#include "Stars.h"
 #include "avatar/AvatarUpdate.h"
-#include "avatar/Avatar.h"
 #include "avatar/MyAvatar.h"
 #include "scripting/ControllerScriptingInterface.h"
 #include "scripting/DialogsManagerScriptingInterface.h"
-#include "scripting/WebWindowClass.h"
-#include "ui/AudioStatsDialog.h"
-#include "ui/BandwidthDialog.h"
-#include "ui/ModelsBrowser.h"
-#include "ui/OctreeStatsDialog.h"
 #include "ui/SnapshotShareDialog.h"
-#include "ui/LodToolsDialog.h"
-#include "ui/LogDialog.h"
-#include "ui/overlays/Overlays.h"
 #include "ui/ApplicationOverlay.h"
 #include "ui/ApplicationCompositor.h"
+#include "ui/AudioStatsDialog.h"
+#include "ui/BandwidthDialog.h"
+#include "ui/LodToolsDialog.h"
+#include "ui/LogDialog.h"
+#include "ui/OctreeStatsDialog.h"
 #include "ui/OverlayConductor.h"
+#include "ui/overlays/Overlays.h"
 #include "ui/RunningScriptsWidget.h"
 #include "ui/ToolWindow.h"
 #include "octree/OctreePacketProcessor.h"
@@ -72,16 +68,10 @@
 #include "render/Engine.h"
 
 class OffscreenGlCanvas;
-
 class GLCanvas;
 class FaceTracker;
 class MainWindow;
 
-namespace gpu {
-    class Context;
-    typedef std::shared_ptr<Context> ContextPointer;
-}
-
 #ifdef Q_OS_WIN
 static const UINT UWM_IDENTIFY_INSTANCES =
     RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME"));
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index ce5768de48..6ed2cf9ad0 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -25,6 +25,7 @@
 #include <AudioClient.h>
 #include <DependencyManager.h>
 #include <display-plugins/DisplayPlugin.h>
+#include <FSTReader.h>
 #include <GeometryUtil.h>
 #include <NodeList.h>
 #include <udt/PacketHeaders.h>
@@ -37,6 +38,7 @@
 
 #include "devices/Faceshift.h"
 
+
 #include "Application.h"
 #include "AvatarManager.h"
 #include "Environment.h"
diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp
index bc9181945f..a9827a23c2 100644
--- a/interface/src/ui/AvatarInputs.cpp
+++ b/interface/src/ui/AvatarInputs.cpp
@@ -7,13 +7,14 @@
 //
 
 
-#include "Application.h"
 #include "AvatarInputs.h"
 
+#include <AudioClient.h>
 #include <SettingHandle.h>
 
-#include "Menu.h"
+#include "Application.h"
 #include "devices/FaceTracker.h"
+#include "Menu.h"
 
 HIFI_QML_DEF(AvatarInputs)
 
diff --git a/interface/src/ui/ScriptEditBox.cpp b/interface/src/ui/ScriptEditBox.cpp
index acabaa3c8f..2aea225b17 100644
--- a/interface/src/ui/ScriptEditBox.cpp
+++ b/interface/src/ui/ScriptEditBox.cpp
@@ -10,8 +10,11 @@
 //
 
 #include "ScriptEditBox.h"
+
+#include <QPainter>
+#include <QTextBlock>
+
 #include "ScriptLineNumberArea.h"
-#include "Application.h"
 
 ScriptEditBox::ScriptEditBox(QWidget* parent) :
     QPlainTextEdit(parent)