header file cleanup

interface/src/entities/EntityTreeRenderer.cpp

@@ -9,28 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <gpu/GPUConfig.h>
+
 #include <glm/gtx/quaternion.hpp>
 
 #include <QScriptSyntaxCheckResult>
  
-#include <FBXReader.h>
-
-#include "InterfaceConfig.h"
-
-#include <BoxEntityItem.h>
 #include <GlowEffect.h>
-#include <ModelEntityItem.h>
-#include <MouseEvent.h>
+#include <NetworkAccessManager.h>
 #include <PerfStat.h>
-#include <RenderArgs.h>
-
 
 #include "Menu.h"
-#include "NetworkAccessManager.h"
 #include "EntityTreeRenderer.h"
 
-#include "devices/OculusManager.h"
-
 #include "RenderableBoxEntityItem.h"
 #include "RenderableLightEntityItem.h"
 #include "RenderableModelEntityItem.h"

interface/src/entities/EntityTreeRenderer.h

@@ -12,24 +12,14 @@
 #ifndef hifi_EntityTreeRenderer_h
 #define hifi_EntityTreeRenderer_h
 
-#include <glm/glm.hpp>
-#include <stdint.h>
-
 #include <EntityTree.h>
 #include <EntityScriptingInterface.h> // for RayToEntityIntersectionResult
-#include <Model.h>
 #include <MouseEvent.h>
-#include <Octree.h>
-#include <OctreePacketData.h>
 #include <OctreeRenderer.h>
-#include <PacketHeaders.h>
-#include <RenderArgs.h>
-#include <SharedUtil.h>
-#include <ViewFrustum.h>
 
+class Model;
 class ScriptEngine;
 
-
 class EntityScriptDetails {
 public:
     QString scriptText;

interface/src/entities/RenderableBoxEntityItem.cpp

@@ -11,21 +11,13 @@
 
 #include <glm/gtx/quaternion.hpp>
 
-#include <FBXReader.h>
+#include <gpu/GPUConfig.h>
 
-#include "InterfaceConfig.h"
-
-#include <BoxEntityItem.h>
 #include <DeferredLightingEffect.h>
-#include <ModelEntityItem.h>
 #include <PerfStat.h>
 
-
-#include "Menu.h"
-#include "EntityTreeRenderer.h"
 #include "RenderableBoxEntityItem.h"
 
-
 EntityItem* RenderableBoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return new RenderableBoxEntityItem(entityID, properties);
 }

interface/src/entities/RenderableBoxEntityItem.h

@@ -12,17 +12,6 @@
 #ifndef hifi_RenderableBoxEntityItem_h
 #define hifi_RenderableBoxEntityItem_h
 
-#include <glm/glm.hpp>
-#include <stdint.h>
-
-#include <EntityTree.h>
-#include <Octree.h>
-#include <OctreePacketData.h>
-#include <OctreeRenderer.h>
-#include <PacketHeaders.h>
-#include <SharedUtil.h>
-#include <ViewFrustum.h>
-
 #include <BoxEntityItem.h>
 
 class RenderableBoxEntityItem : public BoxEntityItem  {

interface/src/entities/RenderableLightEntityItem.cpp

@@ -11,21 +11,15 @@
 
 #include <glm/gtx/quaternion.hpp>
 
-#include <FBXReader.h>
-
-#include "InterfaceConfig.h"
+#include <gpu/GPUConfig.h>
 
 #include <DeferredLightingEffect.h>
 #include <PerfStat.h>
-#include <LightEntityItem.h>
-
 
 #include "Application.h"
 #include "Menu.h"
-#include "EntityTreeRenderer.h"
 #include "RenderableLightEntityItem.h"
 
-
 EntityItem* RenderableLightEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return new RenderableLightEntityItem(entityID, properties);
 }

interface/src/entities/RenderableLightEntityItem.h

@@ -12,17 +12,6 @@
 #ifndef hifi_RenderableLightEntityItem_h
 #define hifi_RenderableLightEntityItem_h
 
-#include <glm/glm.hpp>
-#include <stdint.h>
-
-#include <EntityTree.h>
-#include <Octree.h>
-#include <OctreePacketData.h>
-#include <OctreeRenderer.h>
-#include <PacketHeaders.h>
-#include <SharedUtil.h>
-#include <ViewFrustum.h>
-
 #include <LightEntityItem.h>
 
 class RenderableLightEntityItem : public LightEntityItem  {

interface/src/entities/RenderableModelEntityItem.h

@@ -18,7 +18,6 @@
 #include <ModelEntityItem.h>
 
 class Model;
-class RenderArgs;
 
 class RenderableModelEntityItem : public ModelEntityItem  {
 public:

interface/src/entities/RenderableSphereEntityItem.h

@@ -13,7 +13,6 @@
 #define hifi_RenderableSphereEntityItem_h
 
 #include <SphereEntityItem.h>
-class RenderArgs;
 
 class RenderableSphereEntityItem : public SphereEntityItem  {
 public:

interface/src/entities/RenderableTextEntityItem.cpp

@@ -14,7 +14,6 @@
 #include <gpu/GPUConfig.h>
 #include <PerfStat.h>
 
-#include "EntityTreeRenderer.h"
 #include "RenderableTextEntityItem.h"
 #include "ui/TextRenderer.h"
 

interface/src/entities/RenderableTextEntityItem.h

@@ -13,7 +13,6 @@
 #define hifi_RenderableTextEntityItem_h
 
 #include <TextEntityItem.h>
-class RenderArgs;
 
 class RenderableTextEntityItem : public TextEntityItem  {
 public:

interface/src/ui/overlays/LocalModelsOverlay.h

@@ -12,10 +12,10 @@
 #ifndef hifi_LocalModelsOverlay_h
 #define hifi_LocalModelsOverlay_h
 
-#include "entities/EntityTreeRenderer.h"
-
 #include "Volume3DOverlay.h"
 
+class EntityTreeRenderer;
+
 class LocalModelsOverlay : public Volume3DOverlay {
     Q_OBJECT
 public: