diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp
index 5c67715ab9..51e235c4e2 100644
--- a/libraries/octree/src/OctreeQuery.cpp
+++ b/libraries/octree/src/OctreeQuery.cpp
@@ -6,22 +6,11 @@
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
-#include <cstdio>
-#include <cstring>
-#include <stdint.h>
-
-#include <NodeList.h>
-#include <PacketHeaders.h>
 #include <SharedUtil.h>
-#include <UUID.h>
+
 #include "OctreeConstants.h"
-
 #include "OctreeQuery.h"
 
-using namespace std;
-
-static const float fingerVectorRadix = 4; // bits of precision when converting from float<->fixed
-
 OctreeQuery::OctreeQuery() :
     NodeData(),
     _cameraPosition(0,0,0),
diff --git a/libraries/octree/src/OctreeQuery.h b/libraries/octree/src/OctreeQuery.h
index 800d30b7cd..3b53aaa501 100644
--- a/libraries/octree/src/OctreeQuery.h
+++ b/libraries/octree/src/OctreeQuery.h
@@ -9,8 +9,6 @@
 #ifndef __hifi__OctreeQuery__
 #define __hifi__OctreeQuery__
 
-#include <string>
-
 /* VS2010 defines stdint.h, but not inttypes.h */
 #if defined(_MSC_VER)
 typedef signed char  int8_t;
@@ -27,17 +25,9 @@ typedef unsigned long long quint64;
 #endif
 
 
-#include <vector>
-
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
-#include <QtCore/QObject>
-#include <QtCore/QUuid>
-#include <QtCore/QVariantMap>
-
-#include <RegisteredMetaTypes.h>
-
 #include <NodeData.h>
 
 // First bitset