diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index a5a91acb09..80cd16713b 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -234,7 +234,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
 
 uint32_t EntityMotionState::getIncomingDirtyFlags() const { 
     uint32_t dirtyFlags = _entity->getDirtyFlags(); 
-    
+#ifdef USE_BULLET_PHYSICS 
     // we add DIRTY_MOTION_TYPE if the body's motion type disagrees with entity velocity settings
     int bodyFlags = _body->getCollisionFlags();
     bool isMoving = _entity->isMoving();
@@ -242,5 +242,6 @@ uint32_t EntityMotionState::getIncomingDirtyFlags() const {
             (bodyFlags & btCollisionObject::CF_KINEMATIC_OBJECT && !isMoving)) {
         dirtyFlags |= EntityItem::DIRTY_MOTION_TYPE; 
     }
+#endif // USE_BULLET_PHYSICS
     return dirtyFlags;
 }
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index ce2becd729..6d98ee167d 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -18,9 +18,11 @@
 
 #ifndef USE_BULLET_PHYSICS
 // ObjectMotionState stubbery
+#include "KinematicController.h"
 class ObjectMotionState {
 public:
     // so that this stub implementation is not completely empty we give the class a data member
+    KinematicController* _kinematicController;
     bool _stubData;
 };
 #endif // USE_BULLET_PHYSICS
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 62553d1cc4..c5c2d91cf3 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -10,10 +10,7 @@
 //
 
 #include "PhysicsEngine.h"
-#ifdef USE_BULLET_PHYSICS
 
-#include "ShapeInfoUtil.h"
-#include "ThreadSafeDynamicsWorld.h"
 
 static uint32_t _frameCount;
 
@@ -22,6 +19,11 @@ uint32_t PhysicsEngine::getFrameCount() {
     return _frameCount;
 }
 
+#ifdef USE_BULLET_PHYSICS
+
+#include "ShapeInfoUtil.h"
+#include "ThreadSafeDynamicsWorld.h"
+
 PhysicsEngine::PhysicsEngine(const glm::vec3& offset)
     :   _collisionConfig(NULL), 
         _collisionDispatcher(NULL), 
diff --git a/libraries/physics/src/PhysicsEngine.h b/libraries/physics/src/PhysicsEngine.h
index fd81e12eb8..b11dd82081 100644
--- a/libraries/physics/src/PhysicsEngine.h
+++ b/libraries/physics/src/PhysicsEngine.h
@@ -12,9 +12,12 @@
 #ifndef hifi_PhysicsEngine_h
 #define hifi_PhysicsEngine_h
 
+#include <stdint.h>
+
+const float PHYSICS_ENGINE_FIXED_SUBSTEP = 1.0f / 60.0f;
+
 #ifdef USE_BULLET_PHYSICS
 
-#include <stdint.h>
 #include <QSet>
 #include <btBulletDynamicsCommon.h>
 
@@ -27,7 +30,6 @@
 #include "ThreadSafeDynamicsWorld.h"
 
 const float HALF_SIMULATION_EXTENT = 512.0f; // meters
-const float PHYSICS_ENGINE_FIXED_SUBSTEP = 1.0f / 60.0f;
 
 class ObjectMotionState;
 
@@ -97,6 +99,8 @@ private:
 #else // USE_BULLET_PHYSICS
 // PhysicsEngine stubbery until Bullet is required
 class PhysicsEngine {
+public:
+    static uint32_t getFrameCount();
 };
 #endif // USE_BULLET_PHYSICS
 #endif // hifi_PhysicsEngine_h
diff --git a/libraries/physics/src/SimpleEntityKinematicController.h b/libraries/physics/src/SimpleEntityKinematicController.h
index 78c8569a0f..1edfaf8d2c 100644
--- a/libraries/physics/src/SimpleEntityKinematicController.h
+++ b/libraries/physics/src/SimpleEntityKinematicController.h
@@ -17,6 +17,8 @@
 #include <assert.h>
 #include <glm/glm.hpp>
 
+#include <EntityItem.h>
+
 #include "KinematicController.h"
 
 class SimpleEntityKinematicController : public KinematicController {