diff --git a/src/object_schema.cpp b/src/object_schema.cpp
index 3be3953f..65dc7e85 100644
--- a/src/object_schema.cpp
+++ b/src/object_schema.cpp
@@ -17,7 +17,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "object_schema.hpp"
-
 #include "object_store.hpp"
 #include "property.hpp"
 
diff --git a/src/object_schema.hpp b/src/object_schema.hpp
index 058b83ff..4ab2abf1 100644
--- a/src/object_schema.hpp
+++ b/src/object_schema.hpp
@@ -19,8 +19,6 @@
 #ifndef REALM_OBJECT_SCHEMA_HPP
 #define REALM_OBJECT_SCHEMA_HPP
 
-#include "property.hpp"
-
 #include <realm/string_data.hpp>
 
 #include <string>
@@ -28,6 +26,7 @@
 
 namespace realm {
     class Group;
+    class Property;
 
     class ObjectSchema {
     public:
diff --git a/src/object_store.hpp b/src/object_store.hpp
index b5596ffc..d7c78ac0 100644
--- a/src/object_store.hpp
+++ b/src/object_store.hpp
@@ -20,6 +20,7 @@
 #define REALM_OBJECT_STORE_HPP
 
 #include "schema.hpp"
+#include "property.hpp"
 
 #include <functional>
 
diff --git a/src/schema.hpp b/src/schema.hpp
index 65a806ec..52c03975 100644
--- a/src/schema.hpp
+++ b/src/schema.hpp
@@ -20,6 +20,7 @@
 #define REALM_SCHEMA_HPP
 
 #include "object_schema.hpp"
+#include "property.hpp"
 
 #include <string>
 #include <vector>