diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h
index db830eabf4..cd191846d5 100644
--- a/libraries/models/src/ModelItem.h
+++ b/libraries/models/src/ModelItem.h
@@ -12,11 +12,7 @@
 #ifndef hifi_ModelItem_h
 #define hifi_ModelItem_h
 
-#include <cstring> // ???
-#include <stddef.h>
-#include <stdio.h> // for ssize_t
 #include <stdint.h>
-#include <stdlib.h>
 
 #include <glm/glm.hpp>
 
@@ -27,15 +23,8 @@
 #include <CollisionInfo.h>
 #include <SharedUtil.h>
 #include <OctreePacketData.h>
-#include <OctreeEditPacketSender.h>
 
 
-//#include <assert.h>
-//#include <PerfStat.h>
-#include <OctalCode.h>
-#include <PacketHeaders.h>
-//#include "ModelEditPacketSender.h"
-
 class ModelItem;
 class ModelEditPacketSender;
 class ModelItemProperties;
diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp
index e12865f807..b2c0923ef4 100644
--- a/tests/octree/src/ModelTests.cpp
+++ b/tests/octree/src/ModelTests.cpp
@@ -14,7 +14,13 @@
 
 #include <QDebug>
 
-#if 1
+#ifdef WIN32
+#ifndef ssize_t
+#define ssize_t int
+#endif
+#endif
+
+
 #include <Octree.h>
 #include <ModelItem.h>
 #include <ModelTree.h>
@@ -22,12 +28,10 @@
 #include <OctreeConstants.h>
 #include <PropertyFlags.h>
 #include <SharedUtil.h>
-#endif
 
 #include "ModelTests.h"
 
 void ModelTests::modelTreeTests(bool verbose) {
-#if 1
     int testsTaken = 0;
     int testsPassed = 0;
     int testsFailed = 0;
@@ -258,7 +262,6 @@ void ModelTests::modelTreeTests(bool verbose) {
     if (verbose) {
         qDebug() << "******************************************************************************************";
     }
-#endif
 }