From e1b0e5a2dd2a8ec10d005cc23198f7f437c3c825 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 16 Oct 2017 16:00:32 -0700
Subject: [PATCH] Move some include files around

---
 assignment-client/src/entities/EntityServer.cpp   | 3 +++
 assignment-client/src/entities/EntityServer.h     | 1 -
 libraries/entities/src/EntityEditPacketSender.cpp | 1 +
 libraries/entities/src/EntityEditPacketSender.h   | 2 --
 libraries/entities/src/EntityTree.cpp             | 4 ++++
 libraries/entities/src/EntityTree.h               | 5 -----
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index d99187adee..d23cdd593e 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/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"
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index bcfeb3485d..05404b28c8 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/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.
 
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index a629e7908a..e82ed82093 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/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();
diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h
index 4e8a4be13d..bf79bb9203 100644
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/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
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 57b4c9acc1..ba92947a2e 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/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>
 
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index d6539babe7..922d60f132 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/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>