diff --git a/hifi.podspec b/hifi.podspec
index 6c4d1954bc..33ac415c5f 100644
--- a/hifi.podspec
+++ b/hifi.podspec
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   # s.exclude_files = 'Classes/Exclude'
   
   s.subspec "shared" do |sp|
-    sp.source_files = "libraries/shared/src"
+    sp.source_files = 'libraries/shared/src', 'libraries/shared/moc_*'
     sp.exclude_files = "libraries/shared/src/UrlReader.*"
     sp.dependency 'glm'
     sp.xcconfig = { 'CLANG_CXX_LIBRARY' => "libc++" }
@@ -47,9 +47,12 @@ Pod::Spec.new do |s|
   end
   
   s.subspec "avatars" do |sp|
-    sp.source_files = "libraries/avatar/src"
+    sp.source_files = 'libraries/avatars/src', 'libraries/avatars/moc_*'
     sp.dependency 'glm'
   end
+  
+  s.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/../../qt5-device/qtbase/include' }
+  s.libraries = 'libQtCoreCombined', 'libQt5Network', 'libQt5Script'
 
   # A list of file patterns which select the header files that should be
   # made available to the application. If the pattern is a directory then the
diff --git a/libraries/avatars/src/Agent.cpp b/libraries/avatars/src/Agent.cpp
index 359ca11acc..30443e212c 100644
--- a/libraries/avatars/src/Agent.cpp
+++ b/libraries/avatars/src/Agent.cpp
@@ -31,7 +31,7 @@ void Agent::run(QUrl scriptURL) {
     
     AvatarData *someObject = new AvatarData;
     
-    QScriptValue objectValue = engine.newObject();
+    QScriptValue objectValue = engine.newQObject(someObject);
     engine.globalObject().setProperty("AvatarData", objectValue);
     
     qDebug() << "Execution of script:" << engine.evaluate(scriptString).toString();
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 01907b92f4..44393b66d5 100755
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -14,7 +14,7 @@
 #include <PacketHeaders.h>
 
 #include "AvatarData.h"
-#include <VoxelConstants.h>
+//#include <VoxelConstants.h>
 
 using namespace std;
 
@@ -277,7 +277,8 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
 }
 
 glm::vec3 AvatarData::calculateCameraDirection() const {
-    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
+//    glm::vec3 direction = glm::vec3(_cameraOrientation * glm::vec4(IDENTITY_FRONT, 0.0f));
+    glm::vec3 direction;
     return direction;
 }
 
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 6eca7d3c3c..8c1dac5ad4 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -106,6 +106,9 @@ public:
     void setHeadData(HeadData* headData) { _headData = headData; }
     void setHandData(HandData* handData) { _handData = handData; }
     
+public slots:
+    void setPosition(float x, float y, float z) { _position = glm::vec3(x, y, z); }
+    
 protected:
     glm::vec3 _position;
     glm::vec3 _handPosition;
diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h
index d2b5cae90d..3464569b9b 100755
--- a/libraries/avatars/src/HandData.h
+++ b/libraries/avatars/src/HandData.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include <glm/glm.hpp>
-#include <glm/gtx/quaternion.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 class AvatarData;
 class FingerData;
diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp
index 4e637bcc79..c91626d99d 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/shared/src/Node.cpp
@@ -21,7 +21,7 @@
 #include "SharedUtil.h"
 #include "UDPSocket.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 int unpackNodeId(unsigned char* packedData, uint16_t* nodeId) {
     memcpy(nodeId, packedData, sizeof(uint16_t));
diff --git a/libraries/shared/src/Node.h b/libraries/shared/src/Node.h
index 46bf90ed43..df20664bda 100644
--- a/libraries/shared/src/Node.h
+++ b/libraries/shared/src/Node.h
@@ -18,7 +18,7 @@
 #include <sys/socket.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "NodeData.h"
 #include "SimpleMovingAverage.h"
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index cad9a4c797..0b32843644 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <cstdio>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "NodeList.h"
 #include "NodeTypes.h"
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index 38e8abe7fb..0ec1ed239b 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -14,7 +14,7 @@
 #include <iterator>
 #include <unistd.h>
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 #include "Node.h"
 #include "NodeTypes.h"
diff --git a/libraries/shared/src/OctalCode.cpp b/libraries/shared/src/OctalCode.cpp
index b085a146a2..4a00998860 100644
--- a/libraries/shared/src/OctalCode.cpp
+++ b/libraries/shared/src/OctalCode.cpp
@@ -11,7 +11,7 @@
 #include <cmath>
 #include <cstring>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "SharedUtil.h"
 #include "OctalCode.h"
diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp
index 821a2d0247..9baad2a57b 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/shared/src/PacketHeaders.cpp
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "PacketHeaders.h"
 
diff --git a/libraries/shared/src/PerfStat.cpp b/libraries/shared/src/PerfStat.cpp
index 86985eb038..2e255f1a3e 100644
--- a/libraries/shared/src/PerfStat.cpp
+++ b/libraries/shared/src/PerfStat.cpp
@@ -14,7 +14,7 @@
 #include <map>
 #include <string>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "PerfStat.h"
 
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index b6674fdb32..93ea8a70ed 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -20,7 +20,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "OctalCode.h"
 #include "PacketHeaders.h"
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index d840a83ed9..49e8ae6f02 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #ifdef _WIN32
 #include "Systime.h"
diff --git a/libraries/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp
index 270b090d4a..c156ddd1be 100644
--- a/libraries/shared/src/UDPSocket.cpp
+++ b/libraries/shared/src/UDPSocket.cpp
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #endif
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 #include "UDPSocket.h"