Move some include files around

assignment-client/src/entities/EntityServer.cpp

@@ -17,6 +17,9 @@
 #include <ScriptCache.h>
 #include <EntityEditFilters.h>
 #include <NetworkingConstants.h>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <AddressManager.h>
 
 #include "AssignmentParentFinder.h"
 #include "EntityNodeData.h"

assignment-client/src/entities/EntityServer.h

@@ -19,7 +19,6 @@
 #include "EntityItem.h"
 #include "EntityServerConsts.h"
 #include "EntityTree.h"
-#include <QJsonArray>
 
 /// Handles assignments of type EntityServer - sending entities to various clients.
 

libraries/entities/src/EntityEditPacketSender.cpp

@@ -18,6 +18,7 @@
 #include "EntitiesLogging.h"
 #include "EntityItem.h"
 #include "EntityItemProperties.h"
+#include <AddressManager.h>
 
 EntityEditPacketSender::EntityEditPacketSender() {
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();

libraries/entities/src/EntityEditPacketSender.h

@@ -19,8 +19,6 @@
 #include "EntityItem.h"
 #include "AvatarData.h"
 
-#include <AddressManager.h>
-
 /// Utility for processing, packing, queueing and sending of outbound edit voxel messages.
 class EntityEditPacketSender :  public OctreeEditPacketSender {
     Q_OBJECT

libraries/entities/src/EntityTree.cpp

@@ -18,6 +18,10 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <NetworkingConstants.h>
+#include "AccountManager.h"
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QJsonArray>
 
 #include <QtScript/QScriptEngine>
 

libraries/entities/src/EntityTree.h

@@ -15,11 +15,6 @@
 #include <QSet>
 #include <QVector>
 
-#include "AccountManager.h"
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
-
 #include <Octree.h>
 #include <SpatialParentFinder.h>