Header cleanup

interface/src/Util.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Util.h"
+
 #include <iostream>
 #include <cstring>
 #include <time.h>
@@ -19,17 +21,17 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/detail/func_common.hpp>
 
+#include <QElapsedTimer>
 #include <QThread>
 
 #include <ByteCountCoding.h>
-#include <SharedUtil.h>
 #include <DeferredLightingEffect.h>
+#include <GeometryCache.h>
+#include <OctreeConstants.h>
+#include <SharedUtil.h>
 
-#include "world.h"
-#include "Application.h"
 #include "InterfaceLogging.h"
-
-#include "Util.h"
+#include "world.h"
 
 using namespace std;
 

interface/src/scripting/MenuScriptingInterface.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
-
 #include "MenuScriptingInterface.h"
 
+#include "Menu.h"
+#include <MenuItemProperties.h>
 
 MenuScriptingInterface* MenuScriptingInterface::getInstance() {
     static MenuScriptingInterface sharedInstance;

interface/src/scripting/MenuScriptingInterface.h

@@ -12,13 +12,10 @@
 #ifndef hifi_MenuScriptingInterface_h
 #define hifi_MenuScriptingInterface_h
 
-#include <QDebug>
-#include <QMutex>
 #include <QObject>
 #include <QString>
 
-#include "Menu.h"
-#include <MenuItemProperties.h>
+class MenuItemProperties;
 
 class MenuScriptingInterface : public QObject {
     Q_OBJECT

interface/src/scripting/SettingsScriptingInterface.cpp

@@ -9,10 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <SettingHandle.h>
-
 #include "SettingsScriptingInterface.h"
 
+#include <SettingHandle.h>
 
 SettingsScriptingInterface* SettingsScriptingInterface::getInstance() {
     static SettingsScriptingInterface sharedInstance;

interface/src/scripting/SettingsScriptingInterface.h

@@ -12,12 +12,9 @@
 #ifndef hifi_SettingsScriptingInterface_h
 #define hifi_SettingsScriptingInterface_h
 
-#include <QDebug>
 #include <QObject>
 #include <QString>
 
-#include "Application.h"
-
 class SettingsScriptingInterface : public QObject {
     Q_OBJECT
     SettingsScriptingInterface() { };

interface/src/ui/ScriptLineNumberArea.cpp

@@ -11,7 +11,7 @@
 
 #include "ScriptLineNumberArea.h"
 
-#include "Application.h"
+#include "ScriptEditBox.h"
 
 ScriptLineNumberArea::ScriptLineNumberArea(ScriptEditBox* scriptEditBox) :
     QWidget(scriptEditBox)

interface/src/ui/ScriptLineNumberArea.h

@@ -13,7 +13,8 @@
 #define hifi_ScriptLineNumberArea_h
 
 #include <QWidget>
-#include "ScriptEditBox.h"
+
+class ScriptEditBox;
 
 class ScriptLineNumberArea : public QWidget {
 

interface/src/ui/overlays/Billboard3DOverlay.cpp

@@ -10,7 +10,6 @@
 //
 
 #include "Billboard3DOverlay.h"
-#include "Application.h"
 
 Billboard3DOverlay::Billboard3DOverlay(const Billboard3DOverlay* billboard3DOverlay) :
     Planar3DOverlay(billboard3DOverlay),

interface/src/ui/overlays/Billboardable.cpp

@@ -12,6 +12,7 @@
 #include "Billboardable.h"
 
 #include <Application.h>
+#include <Transform.h>
 
 void Billboardable::setProperties(const QScriptValue &properties) {
     QScriptValue isFacingAvatar = properties.property("isFacingAvatar");

interface/src/ui/overlays/Billboardable.h

@@ -13,9 +13,12 @@
 #define hifi_Billboardable_h
 
 #include <QScriptValue>
-#include <QScriptEngine>
 
-#include <Transform.h>
+#include <glm/gtc/quaternion.hpp>
+
+class QScriptEngine;
+class QString;
+class Transform;
 
 class Billboardable {
 public:

interface/src/ui/overlays/Image3DOverlay.cpp

@@ -18,8 +18,8 @@
 #include <DependencyManager.h>
 #include <GeometryCache.h>
 #include <gpu/Batch.h>
+#include <RegisteredMetaTypes.h>
 
-#include "Application.h"
 #include "GeometryUtil.h"
 
 

interface/src/ui/overlays/OverlayPanel.cpp

@@ -18,7 +18,6 @@
 
 #include "avatar/AvatarManager.h"
 #include "avatar/MyAvatar.h"
-#include "Application.h"
 #include "Base3DOverlay.h"
 
 PropertyBinding::PropertyBinding(QString avatar, QUuid entity) :

interface/src/ui/overlays/OverlaysPayload.cpp

@@ -13,8 +13,8 @@
 #include <limits>
 #include <typeinfo>
 
-#include <Application.h>
 #include <avatar/AvatarManager.h>
+#include <avatar/MyAvatar.h>
 #include <LODManager.h>
 #include <render/Scene.h>
 

interface/src/ui/overlays/Text3DOverlay.cpp

@@ -11,11 +11,11 @@
 #include "Text3DOverlay.h"
 
 #include <DeferredLightingEffect.h>
+#include <GeometryCache.h>
+#include <RegisteredMetaTypes.h>
 #include <RenderDeferredTask.h>
 #include <TextRenderer3D.h>
 
-#include "Application.h"
-
 const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
 const float DEFAULT_BACKGROUND_ALPHA = 0.7f;
 const float DEFAULT_MARGIN = 0.1f;