diff --git a/assignment-client/src/audio/AudioMixerSlavePool.h b/assignment-client/src/audio/AudioMixerSlavePool.h
index 4082ea18d9..25047faa89 100644
--- a/assignment-client/src/audio/AudioMixerSlavePool.h
+++ b/assignment-client/src/audio/AudioMixerSlavePool.h
@@ -16,10 +16,10 @@
 #include <mutex>
 #include <vector>
 
-#include <tbb/concurrent_queue.h>
-
 #include <QThread>
 
+#include <TBBHelpers.h>
+
 #include "AudioMixerSlave.h"
 
 class AudioMixerSlavePool;
diff --git a/assignment-client/src/avatars/AvatarMixerSlavePool.h b/assignment-client/src/avatars/AvatarMixerSlavePool.h
index e6ac2a1f4e..15bd681b2c 100644
--- a/assignment-client/src/avatars/AvatarMixerSlavePool.h
+++ b/assignment-client/src/avatars/AvatarMixerSlavePool.h
@@ -16,10 +16,9 @@
 #include <mutex>
 #include <vector>
 
-#include <tbb/concurrent_queue.h>
-
 #include <QThread>
 
+#include <TBBHelpers.h>
 #include <NodeList.h>
 
 #include "AvatarMixerSlave.h"
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index cba1e664ab..93ae941f1e 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -22,8 +22,6 @@
 #include <QtCore/QUrl>
 #include <QtNetwork/QHostInfo>
 
-#include <tbb/parallel_for.h>
-
 #include <LogHandler.h>
 #include <shared/NetworkUtils.h>
 #include <NumericalConstants.h>
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 056a4d16cf..554386f786 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -31,7 +31,7 @@
 #include <QtNetwork/QUdpSocket>
 #include <QtNetwork/QHostAddress>
 
-#include <tbb/concurrent_unordered_map.h>
+#include <TBBHelpers.h>
 
 #include <DependencyManager.h>
 #include <SharedUtil.h>
@@ -68,9 +68,8 @@ const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username";
 
 const QString LOCAL_SOCKET_CHANGE_STAT = "LocalSocketChanges";
 
-using namespace tbb;
 typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair;
-typedef concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
+typedef tbb::concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
 
 typedef quint8 PingType_t;
 namespace PingType {
diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h
index d1bbffd817..1092fcc7fa 100644
--- a/libraries/networking/src/Node.h
+++ b/libraries/networking/src/Node.h
@@ -24,7 +24,7 @@
 #include <QReadLocker>
 #include <UUIDHasher.h>
 
-#include <tbb/concurrent_unordered_set.h>
+#include <TBBHelpers.h>
 
 #include "HifiSockAddr.h"
 #include "NetworkPeer.h"
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index ee836fa94b..6db760b3ca 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -20,7 +20,7 @@
 #include <unistd.h> // not on windows, not needed for mac or windows
 #endif
 
-#include <tbb/concurrent_unordered_set.h>
+#include <TBBHelpers.h>
 
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QMutex>
diff --git a/libraries/shared/src/TBBHelpers.h b/libraries/shared/src/TBBHelpers.h
new file mode 100644
index 0000000000..6b5c4d416b
--- /dev/null
+++ b/libraries/shared/src/TBBHelpers.h
@@ -0,0 +1,28 @@
+//
+//  Created by Bradley Austin Davis on 2017/06/06
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#pragma once
+#ifndef hifi_TBBHelpers_h
+#define hifi_TBBHelpers_h
+
+#ifdef _WIN32
+#pragma warning( push )
+#pragma warning( disable : 4334 )
+#endif
+
+#include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_unordered_map.h>
+#include <tbb/concurrent_unordered_set.h>
+#include <tbb/concurrent_vector.h>
+#include <tbb/parallel_for.h>
+
+#ifdef _WIN32
+#pragma warning( pop )
+#endif
+
+#endif // hifi_TBBHelpers_h
diff --git a/tools/oven/src/Oven.h b/tools/oven/src/Oven.h
index 350c615ce0..569b73a3e2 100644
--- a/tools/oven/src/Oven.h
+++ b/tools/oven/src/Oven.h
@@ -14,7 +14,7 @@
 
 #include <QtWidgets/QApplication>
 
-#include <tbb/concurrent_vector.h>
+#include <TBBHelpers.h>
 
 #include <atomic>