diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index b8e7652cca..eb58e32897 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -17,6 +17,7 @@
 
 #include <QtScript/QScriptEngine>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 #include <QtCore/QTimer>
 #include <QUuid>
diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h
index ecee81e337..2cf130b727 100644
--- a/assignment-client/src/AssignmentClient.h
+++ b/assignment-client/src/AssignmentClient.h
@@ -15,6 +15,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QPointer>
+#include <QtCore/QSharedPointer>
 
 #include "ThreadedAssignment.h"
 
diff --git a/assignment-client/src/AssignmentClientMonitor.h b/assignment-client/src/AssignmentClientMonitor.h
index 20d4a6767b..ffd6505c6c 100644
--- a/assignment-client/src/AssignmentClientMonitor.h
+++ b/assignment-client/src/AssignmentClientMonitor.h
@@ -17,6 +17,7 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/QProcess>
 #include <QtCore/QDateTime>
+#include <QtCore/QSharedPointer>
 #include <QDir>
 
 #include <Assignment.h>
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index fe84df5141..a4531da7ba 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -13,6 +13,7 @@
 #define hifi_AssetServer_h
 
 #include <QtCore/QDir>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThreadPool>
 #include <QRunnable>
 
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index c7726d2fea..5b75ed54d2 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -12,6 +12,8 @@
 #ifndef hifi_AudioMixer_h
 #define hifi_AudioMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <AABox.h>
 #include <AudioHRTF.h>
 #include <AudioRingBuffer.h>
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index 16c849c216..b6f26aebc0 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -20,6 +20,7 @@
 #endif
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>
 
 #include <AABox.h>
 #include <AudioHRTF.h>
diff --git a/assignment-client/src/avatars/AvatarMixer.h b/assignment-client/src/avatars/AvatarMixer.h
index 1a19a61bd2..92821277de 100644
--- a/assignment-client/src/avatars/AvatarMixer.h
+++ b/assignment-client/src/avatars/AvatarMixer.h
@@ -16,6 +16,8 @@
 #ifndef hifi_AvatarMixer_h
 #define hifi_AvatarMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <set>
 #include <shared/RateCounter.h>
 #include <PortableHighResolutionClock.h>
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index 83a2ff384a..e77eb4d070 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -19,6 +19,7 @@
 #include <queue>
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 
 #include "MixerAvatar.h"
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 9bb3a237e0..3d79ee48bf 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -14,6 +14,8 @@
 
 #include "../octree/OctreeServer.h"
 
+#include <QtCore/QSharedPointer>
+
 #include <memory>
 
 #include <EntityItem.h>
diff --git a/assignment-client/src/messages/MessagesMixer.h b/assignment-client/src/messages/MessagesMixer.h
index 9a43aca347..0070cbad4d 100644
--- a/assignment-client/src/messages/MessagesMixer.h
+++ b/assignment-client/src/messages/MessagesMixer.h
@@ -15,6 +15,8 @@
 #ifndef hifi_MessagesMixer_h
 #define hifi_MessagesMixer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ThreadedAssignment.h>
 
 /// Handles assignments of type MessagesMixer - distribution of avatar data to various clients
diff --git a/assignment-client/src/octree/OctreeHeadlessViewer.h b/assignment-client/src/octree/OctreeHeadlessViewer.h
index 17173718e8..2c256c8516 100644
--- a/assignment-client/src/octree/OctreeHeadlessViewer.h
+++ b/assignment-client/src/octree/OctreeHeadlessViewer.h
@@ -12,6 +12,8 @@
 #ifndef hifi_OctreeHeadlessViewer_h
 #define hifi_OctreeHeadlessViewer_h
 
+#include <QtCore/QSharedPointer>
+
 #include <OctreeProcessor.h>
 #include <OctreeQuery.h>
 
diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.h b/assignment-client/src/octree/OctreeInboundPacketProcessor.h
index a7fa297d24..101debe5f0 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.h
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.h
@@ -14,6 +14,8 @@
 #ifndef hifi_OctreeInboundPacketProcessor_h
 #define hifi_OctreeInboundPacketProcessor_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedPacketProcessor.h>
 
 #include "SequenceNumberStats.h"
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index 3ae4dddee9..43623768bf 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -17,6 +17,7 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>
 
 #include <HTTPManager.h>
 
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
index b795339174..b7929eb5af 100644
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUuid>
 
 #include <EntityEditPacketSender.h>
diff --git a/domain-server/src/DomainGatekeeper.h b/domain-server/src/DomainGatekeeper.h
index 94f760d42e..b24f550483 100644
--- a/domain-server/src/DomainGatekeeper.h
+++ b/domain-server/src/DomainGatekeeper.h
@@ -20,6 +20,7 @@
 
 #include <QtCore/QObject>
 #include <QtNetwork/QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <DomainHandler.h>
 
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 3d4f6cd626..24c8eb0f05 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -17,6 +17,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonDocument>
 #include <QtNetwork/QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <HifiConfigVariantMap.h>
 #include <HTTPManager.h>
diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index d42c0a4e2a..d5eb52b216 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -19,6 +19,7 @@
 #include <QtCore/QTimer>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
+#include <QtCore/QSharedPointer>
 
 #include <LimitedNodeList.h>
 #include <NetworkAccessManager.h>
diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h
index e68115f7ef..b13a06f44b 100644
--- a/ice-server/src/IceServer.h
+++ b/ice-server/src/IceServer.h
@@ -14,7 +14,6 @@
 #define hifi_IceServer_h
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QSharedPointer>
 #include <QUdpSocket>
 
 #include <openssl/rsa.h>
diff --git a/interface/src/Application.h b/interface/src/Application.h
index e771d7ea38..165326215f 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -18,6 +18,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QPointer>
 #include <QtCore/QSet>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QStringList>
 #include <QtQuick/QQuickItem>
 
diff --git a/interface/src/InterfaceParentFinder.cpp b/interface/src/InterfaceParentFinder.cpp
index 0f1c8876a9..411b156c14 100644
--- a/interface/src/InterfaceParentFinder.cpp
+++ b/interface/src/InterfaceParentFinder.cpp
@@ -11,6 +11,8 @@
 
 #include "InterfaceParentFinder.h"
 
+#include <QtCore/QSharedPointer>
+
 #include <Application.h>
 #include <AvatarData.h>
 #include <avatar/AvatarManager.h>
diff --git a/interface/src/LoginStateManager.h b/interface/src/LoginStateManager.h
index b898303ba6..0c1a0249a6 100644
--- a/interface/src/LoginStateManager.h
+++ b/interface/src/LoginStateManager.h
@@ -11,7 +11,6 @@
 #ifndef hifi_LoginStateManager_h
 #define hifi_LoginStateManager_h
 #include <QtCore/QList>
-#include <QtCore/QSharedPointer>
 #include <QtCore/QVariant>
 
 #include <PointerEvent.h>
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index 1fd9c63aab..f7e951d21d 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -16,7 +16,6 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
 
 #include <AvatarHashMap.h>
 #include <PhysicsEngine.h>
diff --git a/interface/src/avatar/GrabManager.cpp b/interface/src/avatar/GrabManager.cpp
index 8273def490..254ce0b0d9 100644
--- a/interface/src/avatar/GrabManager.cpp
+++ b/interface/src/avatar/GrabManager.cpp
@@ -11,6 +11,7 @@
 
 
 #include "GrabManager.h"
+#include <QtCore/QSharedPointer>
 
 void GrabManager::simulateGrabs() {
     QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index 224e58d58c..d8b89ce1bb 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -14,6 +14,8 @@
 #ifndef hifi_Wallet_h
 #define hifi_Wallet_h
 
+#include <QtCore/QSharedPointer>
+
 #include <DependencyManager.h>
 #include <Node.h>
 #include <ReceivedMessage.h>
diff --git a/interface/src/octree/OctreePacketProcessor.h b/interface/src/octree/OctreePacketProcessor.h
index d56b7e0e35..d2210ba41f 100644
--- a/interface/src/octree/OctreePacketProcessor.h
+++ b/interface/src/octree/OctreePacketProcessor.h
@@ -12,6 +12,8 @@
 #ifndef hifi_OctreePacketProcessor_h
 #define hifi_OctreePacketProcessor_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedPacketProcessor.h>
 #include <ReceivedMessage.h>
 
diff --git a/interface/src/raypick/CollisionPick.h b/interface/src/raypick/CollisionPick.h
index 24317bf19a..8825ea65d1 100644
--- a/interface/src/raypick/CollisionPick.h
+++ b/interface/src/raypick/CollisionPick.h
@@ -8,6 +8,8 @@
 #ifndef hifi_CollisionPick_h
 #define hifi_CollisionPick_h
 
+#include <QtCore/QSharedPointer>
+
 #include <PhysicsEngine.h>
 #include <model-networking/ModelCache.h>
 #include <RegisteredMetaTypes.h>
diff --git a/interface/src/scripting/ScreenshareScriptingInterface.h b/interface/src/scripting/ScreenshareScriptingInterface.h
index ec8f3cd619..ceb7b1d9fc 100644
--- a/interface/src/scripting/ScreenshareScriptingInterface.h
+++ b/interface/src/scripting/ScreenshareScriptingInterface.h
@@ -16,6 +16,7 @@
 #include <QProcess>
 #include <QtCore/QCoreApplication>
 #include <QNetworkReply>
+#include <QtCore/QSharedPointer>
 
 #include <PathUtils.h>
 #include <ReceivedMessage.h>
diff --git a/interface/src/scripting/SelectionScriptingInterface.h b/interface/src/scripting/SelectionScriptingInterface.h
index f13d8d2427..07b131ac9a 100644
--- a/interface/src/scripting/SelectionScriptingInterface.h
+++ b/interface/src/scripting/SelectionScriptingInterface.h
@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QMap>
+#include <QtCore/QSharedPointer>
 #include <DependencyManager.h>
 
 #include <AbstractViewStateInterface.h>
diff --git a/interface/src/scripting/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
index 60f850adac..0194c62b82 100644
--- a/interface/src/scripting/WalletScriptingInterface.cpp
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -10,6 +10,7 @@
 //
 
 #include "WalletScriptingInterface.h"
+#include <QtCore/QSharedPointer>
 #include <SettingHandle.h>
 
 CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) {
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index eeb3601886..202eb6ed6a 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -14,7 +14,6 @@
 
 #include <QFutureWatcher>
 #include <QObject>
-#include <QSharedPointer>
 #include <QCompleter>
 #include <QtCore/QJsonArray>
 
diff --git a/interface/src/ui/SnapshotAnimated.h b/interface/src/ui/SnapshotAnimated.h
index 15734f57c8..3d7e879b1d 100644
--- a/interface/src/ui/SnapshotAnimated.h
+++ b/interface/src/ui/SnapshotAnimated.h
@@ -12,6 +12,7 @@
 #ifndef hifi_SnapshotAnimated_h
 #define hifi_SnapshotAnimated_h
 
+#include <QtCore/QSharedPointer>
 #include <QtCore/QVector>
 #include <Application.h>
 #include <DependencyManager.h>
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index b3bf15d523..940fa80311 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -15,6 +15,7 @@
 
 #include <QtCore/QObject>
 #include <QUuid>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 #include <PointerEvent.h>
diff --git a/libraries/animation/src/AnimNodeLoader.h b/libraries/animation/src/AnimNodeLoader.h
index 6db001c261..3e644bc3f8 100644
--- a/libraries/animation/src/AnimNodeLoader.h
+++ b/libraries/animation/src/AnimNodeLoader.h
@@ -14,6 +14,7 @@
 #include <memory>
 
 #include <QNetworkReply>
+#include <QtCore/QSharedPointer>
 #include <QString>
 #include <QUrl>
 
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index e8bfa75ecb..b1f0cc13a2 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -13,6 +13,7 @@
 #define hifi_AnimationCache_h
 
 #include <QtCore/QRunnable>
+#include <QtCore/QSharedPointer>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValue>
 
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 5e753fbef8..8041eb559c 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -24,6 +24,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QVector>
 #include <QtMultimedia/QAudio>
 #include <QtMultimedia/QAudioFormat>
diff --git a/libraries/audio-client/src/AudioIOStats.h b/libraries/audio-client/src/AudioIOStats.h
index 215a4e5414..3a99666354 100644
--- a/libraries/audio-client/src/AudioIOStats.h
+++ b/libraries/audio-client/src/AudioIOStats.h
@@ -15,6 +15,7 @@
 #include "MovingMinMaxAvg.h"
 
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <AudioStreamStats.h>
 #include <Node.h>
diff --git a/libraries/audio/src/AbstractAudioInterface.cpp b/libraries/audio/src/AbstractAudioInterface.cpp
index 3d813eafd7..99e6ef3870 100644
--- a/libraries/audio/src/AbstractAudioInterface.cpp
+++ b/libraries/audio/src/AbstractAudioInterface.cpp
@@ -8,8 +8,6 @@
 
 #include "AbstractAudioInterface.h"
 
-#include <QtCore/QSharedPointer>
-
 #include <Node.h>
 #include <NodeType.h>
 #include <DependencyManager.h>
diff --git a/libraries/audio/src/AudioInjectorManager.cpp b/libraries/audio/src/AudioInjectorManager.cpp
index 9494a84fab..f9417d9ff1 100644
--- a/libraries/audio/src/AudioInjectorManager.cpp
+++ b/libraries/audio/src/AudioInjectorManager.cpp
@@ -12,6 +12,7 @@
 #include "AudioInjectorManager.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/QSharedPointer>
 
 #include <SharedUtil.h>
 #include <shared/QtHelpers.h>
diff --git a/libraries/audio/src/Sound.h b/libraries/audio/src/Sound.h
index bfa682845a..eb6bc67c66 100644
--- a/libraries/audio/src/Sound.h
+++ b/libraries/audio/src/Sound.h
@@ -14,6 +14,7 @@
 
 #include <QRunnable>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtNetwork/QNetworkReply>
 #include <QtScript/qscriptengine.h>
 
diff --git a/libraries/audio/src/SoundCache.h b/libraries/audio/src/SoundCache.h
index 48c3354877..973edc4048 100644
--- a/libraries/audio/src/SoundCache.h
+++ b/libraries/audio/src/SoundCache.h
@@ -12,6 +12,8 @@
 #ifndef hifi_SoundCache_h
 #define hifi_SoundCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ResourceCache.h>
 
 #include "Sound.h"
diff --git a/libraries/avatars/src/ClientTraitsHandler.h b/libraries/avatars/src/ClientTraitsHandler.h
index 35499fd2cf..bcabc98fb9 100644
--- a/libraries/avatars/src/ClientTraitsHandler.h
+++ b/libraries/avatars/src/ClientTraitsHandler.h
@@ -12,6 +12,8 @@
 #ifndef hifi_ClientTraitsHandler_h
 #define hifi_ClientTraitsHandler_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ReceivedMessage.h>
 
 #include "AssociatedTraitValues.h"
diff --git a/libraries/baking/src/MaterialBaker.h b/libraries/baking/src/MaterialBaker.h
index 33123cfc73..cb8289cfdb 100644
--- a/libraries/baking/src/MaterialBaker.h
+++ b/libraries/baking/src/MaterialBaker.h
@@ -12,6 +12,8 @@
 #ifndef hifi_MaterialBaker_h
 #define hifi_MaterialBaker_h
 
+#include <QtCore/QSharedPointer>
+
 #include "Baker.h"
 
 #include "TextureBaker.h"
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index 991cbc25bf..5c336f502f 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -17,6 +17,7 @@
 #include <QtCore/QUrl>
 #include <QtNetwork/QNetworkReply>
 #include <QJsonArray>
+#include <QtCore/QSharedPointer>
 
 #include "Baker.h"
 #include "MaterialBaker.h"
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index ba83ddff55..02aa336a54 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -14,6 +14,7 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QBuffer>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h
index 009e5f6c4f..c3f2c66ae7 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.h
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.h
@@ -15,6 +15,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QStack>
 #include <QtGui/QMouseEvent>
+#include <QtCore/QSharedPointer>
 
 #include <AudioInjectorManager.h>
 #include <EntityScriptingInterface.h> // for RayToEntityIntersectionResult
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h
index fb04e08ec7..14bf5b105d 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h
@@ -10,6 +10,7 @@
 #ifndef hifi_RenderableWebEntityItem_h
 #define hifi_RenderableWebEntityItem_h
 
+#include <QtCore/QSharedPointer>
 #include <WebEntityItem.h>
 #include "RenderableEntityItem.h"
 
diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h
index 3cc2f016f0..9e91155b02 100644
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/libraries/entities/src/EntityEditPacketSender.h
@@ -12,6 +12,8 @@
 #ifndef hifi_EntityEditPacketSender_h
 #define hifi_EntityEditPacketSender_h
 
+#include <QtCore/QSharedPointer>
+
 #include <OctreeEditPacketSender.h>
 
 #include <mutex>
diff --git a/libraries/entities/src/EntityScriptServerLogClient.h b/libraries/entities/src/EntityScriptServerLogClient.h
index 62b76f8870..9eee5daed8 100644
--- a/libraries/entities/src/EntityScriptServerLogClient.h
+++ b/libraries/entities/src/EntityScriptServerLogClient.h
@@ -13,6 +13,7 @@
 #define hifi_EntityScriptServerLogClient_h
 
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <NodeList.h>
 
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 5db278f51e..8a3b92f31f 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -17,6 +17,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
+#include <QtCore/QSharedPointer>
 #include <QtQml/QJSValue>
 #include <QtQml/QJSValueList>
 
diff --git a/libraries/material-networking/src/material-networking/ShaderCache.h b/libraries/material-networking/src/material-networking/ShaderCache.h
index fe9edd7ddf..5129a7d8b4 100644
--- a/libraries/material-networking/src/material-networking/ShaderCache.h
+++ b/libraries/material-networking/src/material-networking/ShaderCache.h
@@ -9,6 +9,7 @@
 #ifndef hifi_ShaderCache_h
 #define hifi_ShaderCache_h
 
+#include <QtCore/QSharedPointer>
 #include <ResourceCache.h>
 
 class NetworkShader : public Resource {
diff --git a/libraries/material-networking/src/material-networking/TextureCache.h b/libraries/material-networking/src/material-networking/TextureCache.h
index c0633c2f9b..d2279fbc89 100644
--- a/libraries/material-networking/src/material-networking/TextureCache.h
+++ b/libraries/material-networking/src/material-networking/TextureCache.h
@@ -18,6 +18,7 @@
 #include <QMap>
 #include <QColor>
 #include <QMetaEnum>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 #include <ResourceCache.h>
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 615951345f..236c6262bf 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -12,6 +12,8 @@
 #ifndef hifi_ModelCache_h
 #define hifi_ModelCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include <DependencyManager.h>
 #include <ResourceCache.h>
 
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index 1860a1744a..ef2eec43b8 100644
--- a/libraries/networking/src/AssetClient.h
+++ b/libraries/networking/src/AssetClient.h
@@ -15,6 +15,7 @@
 #include <QStandardItemModel>
 #include <QtQml/QJSEngine>
 #include <QString>
+#include <QtCore/QSharedPointer>
 
 #include <map>
 
diff --git a/libraries/networking/src/BaseAssetScriptingInterface.h b/libraries/networking/src/BaseAssetScriptingInterface.h
index 31aad21ba2..1dcc5ea2ef 100644
--- a/libraries/networking/src/BaseAssetScriptingInterface.h
+++ b/libraries/networking/src/BaseAssetScriptingInterface.h
@@ -15,6 +15,7 @@
 #define hifi_BaseAssetScriptingInterface_h
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 #include "AssetClient.h"
 #include <shared/MiniPromises.h>
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index 7553168b09..bcb89afe3a 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -17,6 +17,7 @@
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QUuid>
 #include <QtCore/QUrl>
diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/networking/src/EntityScriptClient.h
index 4cfb03dca7..1fddc6b976 100644
--- a/libraries/networking/src/EntityScriptClient.h
+++ b/libraries/networking/src/EntityScriptClient.h
@@ -12,6 +12,8 @@
 #ifndef hifi_EntityScriptClient_h
 #define hifi_EntityScriptClient_h
 
+#include <QtCore/QSharedPointer>
+
 #include "ClientServerUtils.h"
 #include "LimitedNodeList.h"
 #include "ReceivedMessage.h"
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 47b333220b..04b17c6266 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -29,6 +29,7 @@
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QSet>
 #include <QtCore/QSharedMemory>
+#include <QtCore/QSharedPointer>
 #include <QtNetwork/QUdpSocket>
 #include <QtNetwork/QHostAddress>
 
diff --git a/libraries/networking/src/MappingRequest.cpp b/libraries/networking/src/MappingRequest.cpp
index 263f8d023c..fe9281beff 100644
--- a/libraries/networking/src/MappingRequest.cpp
+++ b/libraries/networking/src/MappingRequest.cpp
@@ -11,6 +11,7 @@
 
 #include "MappingRequest.h"
 
+#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 
 #include <DependencyManager.h>
diff --git a/libraries/networking/src/MessagesClient.h b/libraries/networking/src/MessagesClient.h
index db2085da5a..8ad252a596 100644
--- a/libraries/networking/src/MessagesClient.h
+++ b/libraries/networking/src/MessagesClient.h
@@ -15,6 +15,7 @@
 
 #include <QString>
 #include <QByteArray>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 
diff --git a/libraries/networking/src/NLPacket.h b/libraries/networking/src/NLPacket.h
index b2a174a540..04eb58049a 100644
--- a/libraries/networking/src/NLPacket.h
+++ b/libraries/networking/src/NLPacket.h
@@ -13,8 +13,6 @@
 #ifndef hifi_NLPacket_h
 #define hifi_NLPacket_h
 
-#include <QtCore/QSharedPointer>
-
 #include <UUID.h>
 
 #include "udt/Packet.h"
diff --git a/libraries/networking/src/NLPacketList.h b/libraries/networking/src/NLPacketList.h
index 9c50033ca7..bfb6062a1c 100644
--- a/libraries/networking/src/NLPacketList.h
+++ b/libraries/networking/src/NLPacketList.h
@@ -12,6 +12,7 @@
 #ifndef hifi_NLPacketList_h
 #define hifi_NLPacketList_h
 
+#include <QtCore/QSharedPointer>
 #include "udt/PacketList.h"
 
 #include "NLPacket.h"
diff --git a/libraries/networking/src/NetworkPeer.h b/libraries/networking/src/NetworkPeer.h
index a3012087af..e7c6849ad9 100644
--- a/libraries/networking/src/NetworkPeer.h
+++ b/libraries/networking/src/NetworkPeer.h
@@ -16,6 +16,7 @@
 #include <atomic>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QUuid>
 
diff --git a/libraries/networking/src/NodeData.h b/libraries/networking/src/NodeData.h
index b4cb87d0c2..f07a9db03c 100644
--- a/libraries/networking/src/NodeData.h
+++ b/libraries/networking/src/NodeData.h
@@ -14,7 +14,6 @@
 
 #include <QtCore/QMutex>
 #include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
 
 #include "NetworkPeer.h"
 #include "NLPacket.h"
diff --git a/libraries/networking/src/ReceivedMessage.cpp b/libraries/networking/src/ReceivedMessage.cpp
index 684ad665ba..0db605a87e 100644
--- a/libraries/networking/src/ReceivedMessage.cpp
+++ b/libraries/networking/src/ReceivedMessage.cpp
@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <chrono>
 
-#include "QSharedPointer"
-
 int receivedMessageMetaTypeId = qRegisterMetaType<ReceivedMessage*>("ReceivedMessage*");
 int sharedPtrReceivedMessageMetaTypeId = qRegisterMetaType<QSharedPointer<ReceivedMessage>>("QSharedPointer<ReceivedMessage>");
 
diff --git a/libraries/networking/src/ReceivedMessage.h b/libraries/networking/src/ReceivedMessage.h
index f9c8245a10..924670bac2 100644
--- a/libraries/networking/src/ReceivedMessage.h
+++ b/libraries/networking/src/ReceivedMessage.h
@@ -15,6 +15,7 @@
 
 #include <QByteArray>
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <atomic>
 
diff --git a/libraries/networking/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h
index 6c590ec54d..c8c45085b8 100644
--- a/libraries/networking/src/ReceivedPacketProcessor.h
+++ b/libraries/networking/src/ReceivedPacketProcessor.h
@@ -12,6 +12,7 @@
 #ifndef hifi_ReceivedPacketProcessor_h
 #define hifi_ReceivedPacketProcessor_h
 
+#include <QtCore/QSharedPointer>
 #include <QWaitCondition>
 
 #include "NodeList.h"
diff --git a/libraries/octree/src/OctreePersistThread.h b/libraries/octree/src/OctreePersistThread.h
index 6a38a21a84..8726cc5fcb 100644
--- a/libraries/octree/src/OctreePersistThread.h
+++ b/libraries/octree/src/OctreePersistThread.h
@@ -15,6 +15,7 @@
 #define hifi_OctreePersistThread_h
 
 #include <QString>
+#include <QtCore/QSharedPointer>
 #include <GenericThread.h>
 #include "Octree.h"
 
diff --git a/libraries/physics/src/ObjectDynamic.cpp b/libraries/physics/src/ObjectDynamic.cpp
index 6759697832..4c20bc1e21 100644
--- a/libraries/physics/src/ObjectDynamic.cpp
+++ b/libraries/physics/src/ObjectDynamic.cpp
@@ -11,6 +11,8 @@
 
 #include "ObjectDynamic.h"
 
+#include <QtCore/QSharedPointer>
+
 #include "EntitySimulation.h"
 
 #include "PhysicsLogging.h"
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h
index 5c95bf05f8..e2b27f4b26 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.h
+++ b/libraries/plugins/src/plugins/DisplayPlugin.h
@@ -18,6 +18,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QJsonObject>
 #include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QWaitCondition>
 
 #include <GLMHelpers.h>
diff --git a/libraries/plugins/src/plugins/PluginManager.h b/libraries/plugins/src/plugins/PluginManager.h
index f0aa662634..d3040f1d9b 100644
--- a/libraries/plugins/src/plugins/PluginManager.h
+++ b/libraries/plugins/src/plugins/PluginManager.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <QObject>
+#include <QtCore/QSharedPointer>
 
 #include <DependencyManager.h>
 #include <SettingHandle.h>
diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.h b/libraries/procedural/src/procedural/ProceduralMaterialCache.h
index ff0a8cf81c..7d6a6ecdf3 100644
--- a/libraries/procedural/src/procedural/ProceduralMaterialCache.h
+++ b/libraries/procedural/src/procedural/ProceduralMaterialCache.h
@@ -8,6 +8,8 @@
 #ifndef hifi_MaterialCache_h
 #define hifi_MaterialCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include "glm/glm.hpp"
 
 #include <ResourceCache.h>
diff --git a/libraries/qml/src/qml/OffscreenSurface.h b/libraries/qml/src/qml/OffscreenSurface.h
index 8209398e05..1dd699eafe 100644
--- a/libraries/qml/src/qml/OffscreenSurface.h
+++ b/libraries/qml/src/qml/OffscreenSurface.h
@@ -17,7 +17,6 @@
 #include <QtCore/QUrl>
 #include <QtCore/QSize>
 #include <QtCore/QPointF>
-#include <QtCore/QSharedPointer>
 #include <QtCore/QTimer>
 
 #include <QtQml/QJSValue>
diff --git a/libraries/qml/src/qml/impl/SharedObject.h b/libraries/qml/src/qml/impl/SharedObject.h
index 50c56ad714..4f287471e8 100644
--- a/libraries/qml/src/qml/impl/SharedObject.h
+++ b/libraries/qml/src/qml/impl/SharedObject.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
 #include <QtCore/QThread>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
diff --git a/libraries/recording/src/recording/ClipCache.h b/libraries/recording/src/recording/ClipCache.h
index 202cd2f00e..e909af7e70 100644
--- a/libraries/recording/src/recording/ClipCache.h
+++ b/libraries/recording/src/recording/ClipCache.h
@@ -9,6 +9,8 @@
 #ifndef hifi_Recording_ClipCache_h
 #define hifi_Recording_ClipCache_h
 
+#include <QtCore/QSharedPointer>
+
 #include <ResourceCache.h>
 
 #include "Forward.h"
diff --git a/libraries/render-utils/src/FboCache.h b/libraries/render-utils/src/FboCache.h
index cedc4bff82..6a6df30cd2 100644
--- a/libraries/render-utils/src/FboCache.h
+++ b/libraries/render-utils/src/FboCache.h
@@ -15,7 +15,7 @@
 #include <QOffscreenSurface>
 #include <QQueue>
 #include <QMap>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <QMutex>
 
 class QOpenGLFramebufferObject;
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h
index bc88566b9a..a170958a91 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.h
+++ b/libraries/script-engine/src/RecordingScriptingInterface.h
@@ -16,6 +16,7 @@
 #include <mutex>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 
 #include <BaseScriptEngine.h>
 #include <DependencyManager.h>
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index a6f7341f77..0933025ee1 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 #include <QtCore/QSet>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QStringList>
 #include <QMap>
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 62c215c7df..ab47f80731 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -9,6 +9,7 @@
 #include "ScriptEngines.h"
 
 #include <QtCore/QStandardPaths>
+#include <QtCore/QSharedPointer>
 
 #include <QtWidgets/QApplication>
 
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index 52c9a922af..61d8f95442 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -19,6 +19,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
 #include <QtCore/QReadWriteLock>
+#include <QtCore/QUrl>
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>
diff --git a/libraries/shared/src/BaseScriptEngine.h b/libraries/shared/src/BaseScriptEngine.h
index c917aa2722..73914dc689 100644
--- a/libraries/shared/src/BaseScriptEngine.h
+++ b/libraries/shared/src/BaseScriptEngine.h
@@ -14,6 +14,7 @@
 
 #include <functional>
 #include <QtCore/QDebug>
+#include <QtCore/QSharedPointer>
 #include <QtScript/QScriptEngine>
 
 class ScriptEngine;
diff --git a/libraries/shared/src/DependencyManager.h b/libraries/shared/src/DependencyManager.h
index 00faba0e89..cd226b9960 100644
--- a/libraries/shared/src/DependencyManager.h
+++ b/libraries/shared/src/DependencyManager.h
@@ -15,7 +15,7 @@
 #include <QtGlobal>
 #include <QDebug>
 #include <QHash>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <QWeakPointer>
 #include <QMutex>
 
diff --git a/libraries/shared/src/SettingHandle.h b/libraries/shared/src/SettingHandle.h
index e77ee00b05..4fce3bef96 100644
--- a/libraries/shared/src/SettingHandle.h
+++ b/libraries/shared/src/SettingHandle.h
@@ -18,6 +18,7 @@
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 #include <QtCore/QReadWriteLock>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QDebug>
 
 #include <glm/glm.hpp>
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 69f3539152..7a02c2dbbb 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -11,6 +11,8 @@
 
 #include "SpatiallyNestable.h"
 
+#include <QtCore/QSharedPointer>
+
 #include <queue>
 
 #include "DependencyManager.h"
diff --git a/libraries/shared/src/shared/ScriptInitializerMixin.h b/libraries/shared/src/shared/ScriptInitializerMixin.h
index cefa33c2d3..2a7fc10e06 100644
--- a/libraries/shared/src/shared/ScriptInitializerMixin.h
+++ b/libraries/shared/src/shared/ScriptInitializerMixin.h
@@ -10,7 +10,6 @@
 
 #include <functional>
 #include <mutex>
-#include <QSharedPointer>
 #include "../DependencyManager.h"
 
 class QScriptEngine;
diff --git a/libraries/ui/src/CursorManager.cpp b/libraries/ui/src/CursorManager.cpp
index 8eb4989ab6..b462c4fb78 100644
--- a/libraries/ui/src/CursorManager.cpp
+++ b/libraries/ui/src/CursorManager.cpp
@@ -9,6 +9,7 @@
 #include "CursorManager.h"
 
 #include <QCursor>
+#include <QtCore/QSharedPointer>
 #include <QWidget>
 #include <QUrl>
 
diff --git a/libraries/ui/src/DesktopPreviewProvider.h b/libraries/ui/src/DesktopPreviewProvider.h
index 449c3723e1..b0cc64245f 100644
--- a/libraries/ui/src/DesktopPreviewProvider.h
+++ b/libraries/ui/src/DesktopPreviewProvider.h
@@ -8,6 +8,7 @@
 
 #include <DependencyManager.h>
 #include <QImage>
+#include <QtCore/QSharedPointer>
 
 class DesktopPreviewProvider : public QObject, public Dependency {
     SINGLETON_DEPENDENCY
diff --git a/libraries/ui/src/VirtualPadManager.cpp b/libraries/ui/src/VirtualPadManager.cpp
index bf325a0bd6..be6eef87d3 100644
--- a/libraries/ui/src/VirtualPadManager.cpp
+++ b/libraries/ui/src/VirtualPadManager.cpp
@@ -7,6 +7,7 @@
 //
 
 #include "VirtualPadManager.h"
+#include <QtCore/QSharedPointer>
 
 namespace VirtualPad {
 
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 5dfdce0c63..09107a7c21 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -24,6 +24,7 @@
 #include <QtQuick/QQuickRenderControl>
 #include <QtCore/QThread>
 #include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QWaitCondition>
 #include <QtMultimedia/QMediaService>
 #include <QtMultimedia/QAudioOutputSelectorControl>
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h
index 0b1af6451a..af0c03de80 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@@ -13,6 +13,7 @@
 #include <atomic>
 
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUuid>
 #include <QtCore/QVariant>
 #include <QtCore/QAbstractListModel>
diff --git a/libraries/ui/src/ui/types/ContextAwareProfile.h b/libraries/ui/src/ui/types/ContextAwareProfile.h
index 486ac5481a..7ea5684699 100644
--- a/libraries/ui/src/ui/types/ContextAwareProfile.h
+++ b/libraries/ui/src/ui/types/ContextAwareProfile.h
@@ -15,7 +15,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QSet>
-#include <QtCore/QSharedPointer>
 
 #if !defined(Q_OS_ANDROID)
 #include <QtWebEngine/QQuickWebEngineProfile>
diff --git a/plugins/JSAPIExample/src/JSAPIExample.cpp b/plugins/JSAPIExample/src/JSAPIExample.cpp
index 4654279bec..34c28bdf8f 100644
--- a/plugins/JSAPIExample/src/JSAPIExample.cpp
+++ b/plugins/JSAPIExample/src/JSAPIExample.cpp
@@ -14,6 +14,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QJsonObject>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QThread>
diff --git a/tools/gpu-frame-player/src/main.cpp b/tools/gpu-frame-player/src/main.cpp
index ac48ee2e1c..fe0e97fa0b 100644
--- a/tools/gpu-frame-player/src/main.cpp
+++ b/tools/gpu-frame-player/src/main.cpp
@@ -7,6 +7,7 @@
 //
 
 #include <QtWidgets/QApplication>
+#include <QtCore/QSharedPointer>
 
 #include <shared/FileLogger.h>
 #include "PlayerWindow.h"
diff --git a/tools/ice-client/src/ICEClientApp.cpp b/tools/ice-client/src/ICEClientApp.cpp
index d35223885a..233b5e71f0 100644
--- a/tools/ice-client/src/ICEClientApp.cpp
+++ b/tools/ice-client/src/ICEClientApp.cpp
@@ -15,6 +15,7 @@
 #include <QDataStream>
 #include <QLoggingCategory>
 #include <QCommandLineParser>
+#include <QtCore/QSharedPointer>
 
 #include <PathUtils.h>
 #include <LimitedNodeList.h>
diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h
index 1642148520..bfeb1853f6 100644
--- a/tools/oven/src/DomainBaker.h
+++ b/tools/oven/src/DomainBaker.h
@@ -15,6 +15,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtCore/QUrl>
 #include <QtCore/QThread>