diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
index 2739a13e35..03bd6fbf90 100644
--- a/Release/include/cpprest/asyncrt_utils.h
+++ b/Release/include/cpprest/asyncrt_utils.h
@@ -13,20 +13,17 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
+#include <chrono>
 #include <cstdint>
-#include <system_error>
 #include <random>
+#include <string>
+#include <system_error>
+#include <vector>
 #include <locale.h>
 #include <limits.h>
 #include "pplx/pplxtasks.h"
 #include "cpprest/details/basic_types.h"
 
-#if !defined(_WIN32) || (_MSC_VER >= 1700)
-#include <chrono>
-#endif
-
 #ifndef _WIN32
 #include <sys/time.h>
 #if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269
diff --git a/Release/src/http/client/http_client_asio.cpp b/Release/src/http/client/http_client_asio.cpp
index 7ee22133fe..645b45466c 100644
--- a/Release/src/http/client/http_client_asio.cpp
+++ b/Release/src/http/client/http_client_asio.cpp
@@ -14,6 +14,7 @@
  ****/
 
 #include "stdafx.h"
+#include <sstream>
 
 #include "../common/internal_http_helpers.h"
 #include "cpprest/asyncrt_utils.h"
diff --git a/Release/src/http/common/http_msg.cpp b/Release/src/http/common/http_msg.cpp
index 44870f5420..91da2c2c3e 100644
--- a/Release/src/http/common/http_msg.cpp
+++ b/Release/src/http/common/http_msg.cpp
@@ -11,7 +11,9 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include <sstream>
 #include "../common/internal_http_helpers.h"
+#include "cpprest/producerconsumerstream.h"
 
 using namespace web;
 using namespace utility;
diff --git a/Release/src/http/listener/http_server_asio.cpp b/Release/src/http/listener/http_server_asio.cpp
index 5ab3086954..591e623d82 100644
--- a/Release/src/http/listener/http_server_asio.cpp
+++ b/Release/src/http/listener/http_server_asio.cpp
@@ -14,6 +14,8 @@
 */
 #include "stdafx.h"
 
+#include <sstream>
+#include <set>
 #include <boost/algorithm/string/find.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/read_until.hpp>
diff --git a/Release/src/http/listener/http_server_httpsys.cpp b/Release/src/http/listener/http_server_httpsys.cpp
index 242dae4800..9cde3f522e 100644
--- a/Release/src/http/listener/http_server_httpsys.cpp
+++ b/Release/src/http/listener/http_server_httpsys.cpp
@@ -14,6 +14,7 @@
 ****/
 
 #include "stdafx.h"
+#include "cpprest/rawptrstream.h"
 
 #if _WIN32_WINNT >= _WIN32_WINNT_VISTA
 
diff --git a/Release/src/http/oauth/oauth2.cpp b/Release/src/http/oauth/oauth2.cpp
index c85cf44c2f..f37f876dbc 100644
--- a/Release/src/http/oauth/oauth2.cpp
+++ b/Release/src/http/oauth/oauth2.cpp
@@ -13,6 +13,8 @@
 
 #include "stdafx.h"
 
+#include <sstream>
+
 using web::http::client::http_client;
 using web::http::client::http_client_config;
 using web::http::oauth2::details::oauth2_strings;
diff --git a/Release/src/pch/stdafx.h b/Release/src/pch/stdafx.h
index 93ad966509..dc909d5afd 100644
--- a/Release/src/pch/stdafx.h
+++ b/Release/src/pch/stdafx.h
@@ -49,8 +49,6 @@
 #include <stdint.h>
 #include <cstdint>
 #include <string>
-#include <sstream>
-#include <thread>
 #include <atomic>
 #include <signal.h>
 #include "pthread.h"
@@ -75,19 +73,14 @@
 // This is to help track how many developers are directly building from source themselves.
 #define _CASA_BUILD_FROM_SRC
 
-#include <iostream>
-#include <fstream>
 #include <algorithm>
 #include <exception>
 #include <assert.h>
-#include <streambuf>
 #include <atomic>
 #include <mutex>
 #include <array>
 #include <vector>
 #include <memory>
-#include <thread>
-#include <set>
 
 #include "cpprest/details/cpprest_compat.h"
 #include "cpprest/details/basic_types.h"
@@ -95,13 +88,6 @@
 #include "pplx/pplxtasks.h"
 #include "cpprest/version.h"
 
-// streams
-#include "cpprest/streams.h"
-#include "cpprest/astreambuf.h"
-#include "cpprest/rawptrstream.h"
-#include "cpprest/interopstream.h"
-#include "cpprest/producerconsumerstream.h"
-
 // json
 #include "cpprest/json.h"
 
@@ -124,10 +110,6 @@
 #endif
 #include "cpprest/oauth2.h"
 
-// websockets
-#include "cpprest/ws_client.h"
-#include "cpprest/ws_msg.h"
-
 #if !defined(__cplusplus_winrt)
 #if _WIN32_WINNT >= _WIN32_WINNT_VISTA
 #include "cpprest/details/http_server.h"
diff --git a/Release/src/pplx/pplxlinux.cpp b/Release/src/pplx/pplxlinux.cpp
index b2dc524c86..50365794a3 100644
--- a/Release/src/pplx/pplxlinux.cpp
+++ b/Release/src/pplx/pplxlinux.cpp
@@ -15,6 +15,7 @@
 #include "pplx/pplx.h"
 #include "pplx/threadpool.h"
 #include "sys/syscall.h"
+#include <thread>
 
 #ifdef _WIN32
 #error "ERROR: This file should only be included in non-windows Build"
diff --git a/Release/src/uri/uri.cpp b/Release/src/uri/uri.cpp
index fac048c9da..eaacb5ccfd 100644
--- a/Release/src/uri/uri.cpp
+++ b/Release/src/uri/uri.cpp
@@ -13,6 +13,8 @@
 
 #include "stdafx.h"
 
+#include <sstream>
+
 using namespace utility::conversions;
 
 namespace web { namespace details
diff --git a/Release/src/uri/uri_builder.cpp b/Release/src/uri/uri_builder.cpp
index 02dd024b9b..f99923c487 100644
--- a/Release/src/uri/uri_builder.cpp
+++ b/Release/src/uri/uri_builder.cpp
@@ -13,6 +13,8 @@
 
 #include "stdafx.h"
 
+#include <sstream>
+
 namespace web
 {
 
@@ -120,8 +122,8 @@ bool uri_builder::is_valid()
     return uri::validate(m_uri.join());
 }
 
-void uri_builder::append_query_encode_impl(const utility::string_t & name, const utf8string & value)
-{
+void uri_builder::append_query_encode_impl(const utility::string_t & name, const utf8string & value)
+{
     utility::string_t encodedQuery = uri::encode_query_impl(utility::conversions::to_utf8string(name));
     encodedQuery.append(_XPLATSTR("="));
     encodedQuery.append(uri::encode_query_impl(value));
@@ -130,8 +132,8 @@ void uri_builder::append_query_encode_impl(const utility::string_t & name, const
     append_query(encodedQuery, false);
 }
 
-void uri_builder::append_query_no_encode_impl(const utility::string_t & name, const utility::string_t & value)
-{
+void uri_builder::append_query_no_encode_impl(const utility::string_t & name, const utility::string_t & value)
+{
     append_query(name + _XPLATSTR("=") + value, false);
 }
 
diff --git a/Release/src/utilities/asyncrt_utils.cpp b/Release/src/utilities/asyncrt_utils.cpp
index 3903ce9ca7..eb20f91f0e 100644
--- a/Release/src/utilities/asyncrt_utils.cpp
+++ b/Release/src/utilities/asyncrt_utils.cpp
@@ -15,6 +15,7 @@
 #include <cpprest/asyncrt_utils.h>
 #include <algorithm>
 #include <string>
+#include <sstream>
 
 #ifndef _WIN32
 #if defined(__clang__)
diff --git a/Release/src/websockets/client/ws_client.cpp b/Release/src/websockets/client/ws_client.cpp
index 4caceb3b2e..1d829eb746 100644
--- a/Release/src/websockets/client/ws_client.cpp
+++ b/Release/src/websockets/client/ws_client.cpp
@@ -9,6 +9,7 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include "cpprest/ws_client.h"
 
 #if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
@@ -91,4 +92,4 @@ pplx::task<websocket_incoming_message> websocket_client_task_impl::receive()
 
 }}}}
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
index c4c46941ba..5ba93d25eb 100644
--- a/Release/src/websockets/client/ws_client_wspp.cpp
+++ b/Release/src/websockets/client/ws_client_wspp.cpp
@@ -12,6 +12,7 @@
 ****/
 
 #include "stdafx.h"
+#include <thread>
 
 #if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
diff --git a/Release/src/websockets/client/ws_msg.cpp b/Release/src/websockets/client/ws_msg.cpp
index ee27cde01f..c9a5bea8ae 100644
--- a/Release/src/websockets/client/ws_msg.cpp
+++ b/Release/src/websockets/client/ws_msg.cpp
@@ -13,6 +13,9 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include <sstream>
+#include "cpprest/ws_client.h"
+#include "cpprest/ws_msg.h"
 #include "../../http/common/internal_http_helpers.h"
 
 #if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d984c4094e..f40964713a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ jobs:
         cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
     - script: |
         cd build.debug
-        ninja -j 4
+        ninja
       displayName: 'Run ninja'
     - script: |
         cd build.debug/Release/Binaries
@@ -41,7 +41,7 @@ jobs:
         cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
     - script: |
         cd build.release
-        ninja -j 4
+        ninja
       displayName: 'Run ninja'
     - script: |
         cd build.release/Release/Binaries
@@ -61,7 +61,7 @@ jobs:
         cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
     - script: |
         cd build.debug
-        ninja -j 4
+        ninja
       displayName: 'Run ninja'
     - script: |
         cd build.debug/Release/Binaries
@@ -81,7 +81,7 @@ jobs:
         cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
     - script: |
         cd build.release
-        ninja -j 4
+        ninja
       displayName: 'Run ninja'
     - script: |
         cd build.release/Release/Binaries