diff --git a/src/impl/collection_change_builder.cpp b/src/impl/collection_change_builder.cpp
index da0ff5ab..731e07ad 100644
--- a/src/impl/collection_change_builder.cpp
+++ b/src/impl/collection_change_builder.cpp
@@ -19,6 +19,7 @@
 #include "impl/collection_change_builder.hpp"
 
 #include <realm/util/assert.hpp>
+#include <algorithm>
 
 using namespace realm;
 using namespace realm::_impl;
diff --git a/src/impl/realm_coordinator.cpp b/src/impl/realm_coordinator.cpp
index 86b118a8..df53a2ce 100644
--- a/src/impl/realm_coordinator.cpp
+++ b/src/impl/realm_coordinator.cpp
@@ -31,6 +31,7 @@
 #include <realm/string_data.hpp>
 
 #include <unordered_map>
+#include <algorithm>
 
 using namespace realm;
 using namespace realm::_impl;
diff --git a/src/impl/transact_log_handler.cpp b/src/impl/transact_log_handler.cpp
index e0880bee..85d44bd6 100644
--- a/src/impl/transact_log_handler.cpp
+++ b/src/impl/transact_log_handler.cpp
@@ -24,6 +24,7 @@
 
 #include <realm/group_shared.hpp>
 #include <realm/lang_bind_helper.hpp>
+#include <algorithm>
 
 using namespace realm;
 
diff --git a/src/results.cpp b/src/results.cpp
index 39621e8d..f2961337 100644
--- a/src/results.cpp
+++ b/src/results.cpp
@@ -411,7 +411,7 @@ Query Results::get_query() const
             // The TableView has no associated query so create one with no conditions that is restricted
             // to the rows in the TableView.
             m_table_view.sync_if_needed();
-            return Query(*m_table, std::make_unique<TableView>(m_table_view));
+            return Query(*m_table, (std::unique_ptr<TableViewBase>)std::make_unique<TableView>(m_table_view));
         }
         case Mode::LinkView:
             return m_table->where(m_link_view);