Clean up includes and forward declarations a bit

src/collection_notifications.hpp

@@ -23,6 +23,9 @@
 #include "util/atomic_shared_ptr.hpp"
 
 #include <exception>
+#include <functional>
+#include <memory>
+#include <vector>
 
 namespace realm {
 namespace _impl {

src/impl/background_collection.hpp

@@ -23,8 +23,10 @@
 
 #include <realm/group_shared.hpp>
 
-#include <mutex>
+#include <atomic>
+#include <exception>
 #include <functional>
+#include <mutex>
 #include <thread>
 #include <unordered_map>
 

src/impl/list_notifier.cpp

@@ -18,7 +18,6 @@
 
 #include "impl/list_notifier.hpp"
 
-#include "impl/realm_coordinator.hpp"
 #include "shared_realm.hpp"
 
 #include <realm/link_view.hpp>

src/impl/realm_coordinator.cpp

@@ -28,9 +28,8 @@
 #include <realm/commit_log.hpp>
 #include <realm/group_shared.hpp>
 #include <realm/lang_bind_helper.hpp>
+#include <realm/string_data.hpp>
 
-#include <cassert>
-#include <set>
 #include <unordered_map>
 
 using namespace realm;

src/impl/realm_coordinator.hpp

@@ -19,25 +19,19 @@
 #ifndef REALM_COORDINATOR_HPP
 #define REALM_COORDINATOR_HPP
 
-#include "index_set.hpp"
 #include "shared_realm.hpp"
 
-#include <realm/string_data.hpp>
-
-#include <map>
+#include <mutex>
 
 namespace realm {
 class Replication;
-class Results;
 class Schema;
 class SharedGroup;
-class Table;
-struct CollectionChangeIndices;
+class StringData;
 
 namespace _impl {
 class BackgroundCollection;
 class ExternalCommitHelper;
-class ListNotifier;
 class WeakRealmNotifier;
 
 // RealmCoordinator manages the weak cache of Realm instances and communication

src/impl/results_notifier.cpp

@@ -18,7 +18,6 @@
 
 #include "impl/results_notifier.hpp"
 
-#include "impl/realm_coordinator.hpp"
 #include "results.hpp"
 
 using namespace realm;

src/impl/results_notifier.hpp

@@ -24,13 +24,8 @@
 
 #include <realm/group_shared.hpp>
 
-#include <mutex>
-#include <functional>
-
 namespace realm {
 namespace _impl {
-struct TransactionChangeInfo;
-
 class ResultsNotifier : public BackgroundCollection {
 public:
     ResultsNotifier(Results& target);

src/impl/transact_log_handler.cpp

@@ -20,8 +20,8 @@
 
 #include "binding_context.hpp"
 #include "impl/background_collection.hpp"
+#include "index_set.hpp"
 
-#include <realm/commit_log.hpp>
 #include <realm/group_shared.hpp>
 #include <realm/lang_bind_helper.hpp>
 

src/impl/transact_log_handler.hpp

@@ -21,11 +21,8 @@
 
 #include <realm/group_shared.hpp>
 
-#include "index_set.hpp"
-
 namespace realm {
 class BindingContext;
-class SharedGroup;
 
 namespace _impl {
 struct TransactionChangeInfo;

src/index_set.hpp

@@ -19,14 +19,15 @@
 #ifndef REALM_INDEX_SET_HPP
 #define REALM_INDEX_SET_HPP
 
+#include <cstddef>
 #include <cstdlib>
+#include <initializer_list>
 #include <iterator>
+#include <type_traits>
+#include <utility>
 #include <vector>
-#include <stddef.h>
 
 namespace realm {
-class IndexSet;
-
 namespace _impl {
 template<typename OuterIterator>
 class MutableChunkedRangeVectorIterator;

src/list.cpp

@@ -22,6 +22,7 @@
 #include "impl/realm_coordinator.hpp"
 #include "results.hpp"
 
+#include <realm/link_view.hpp>
 #include <realm/util/to_string.hpp>
 #include <stdexcept>
 

src/list.hpp

@@ -21,15 +21,17 @@
 
 #include "collection_notifications.hpp"
 
-#include <realm/link_view.hpp>
+#include <realm/link_view_fwd.hpp>
+#include <realm/row.hpp>
 
+#include <functional>
 #include <memory>
 
 namespace realm {
-template<typename T> class BasicRowExpr;
 using RowExpr = BasicRowExpr<Table>;
 
 class ObjectSchema;
+class Query;
 class Realm;
 class Results;
 struct SortOrder;

src/object_accessor.hpp

@@ -25,7 +25,7 @@
 #include "schema.hpp"
 #include "shared_realm.hpp"
 
-#include <string>
+#include <realm/link_view.hpp>
 
 namespace realm {
 

src/object_store.hpp

@@ -22,14 +22,12 @@
 #include "schema.hpp"
 #include "property.hpp"
 
+#include <realm/table_ref.hpp>
+
 #include <functional>
 
-#include <realm/group.hpp>
-#include <realm/link_view.hpp>
-
-#include <sstream>
-
 namespace realm {
+    class Group;
     class ObjectSchemaValidationException;
     class Schema;
 

src/results.hpp

@@ -23,7 +23,6 @@
 #include "shared_realm.hpp"
 
 #include <realm/table_view.hpp>
-#include <realm/table.hpp>
 #include <realm/util/optional.hpp>
 #include <realm/util/to_string.hpp>
 
@@ -31,7 +30,6 @@ namespace realm {
 template<typename T> class BasicRowExpr;
 using RowExpr = BasicRowExpr<Table>;
 class Mixed;
-class Results;
 class ObjectSchema;
 
 namespace _impl {

src/schema.cpp

@@ -18,10 +18,11 @@
 
 #include "schema.hpp"
 
-#include "object_schema.hpp"
 #include "object_store.hpp"
 #include "property.hpp"
 
+#include <algorithm>
+
 using namespace realm;
 
 static bool compare_by_name(ObjectSchema const& lft, ObjectSchema const& rgt) {

src/schema.hpp

@@ -20,14 +20,11 @@
 #define REALM_SCHEMA_HPP
 
 #include "object_schema.hpp"
-#include "property.hpp"
 
 #include <string>
 #include <vector>
 
 namespace realm {
-class ObjectSchema;
-
 class Schema : private std::vector<ObjectSchema> {
 private:
     using base = std::vector<ObjectSchema>;

src/shared_realm.cpp

@@ -19,7 +19,6 @@
 #include "shared_realm.hpp"
 
 #include "binding_context.hpp"
-#include "impl/external_commit_helper.hpp"
 #include "impl/realm_coordinator.hpp"
 #include "impl/transact_log_handler.hpp"
 #include "object_store.hpp"
@@ -28,8 +27,6 @@
 #include <realm/commit_log.hpp>
 #include <realm/group_shared.hpp>
 
-#include <mutex>
-
 using namespace realm;
 using namespace realm::_impl;
 

src/shared_realm.hpp

@@ -21,20 +21,15 @@
 
 #include "schema.hpp"
 
-#include <realm/handover_defs.hpp>
-
 #include <memory>
-#include <mutex>
 #include <string>
 #include <thread>
 #include <vector>
-#include <mutex>
 
 namespace realm {
     class BindingContext;
     class Group;
     class Realm;
-    class RealmDelegate;
     class Replication;
     class SharedGroup;
     typedef std::shared_ptr<Realm> SharedRealm;