diff --git a/src/js_init.h b/src/js_init.h
index fdc70d1f..26401799 100644
--- a/src/js_init.h
+++ b/src/js_init.h
@@ -2,7 +2,7 @@
  * Proprietary and Confidential
  */
 
-#import <JavaScriptCore/JSBase.h>
+#include <JavaScriptCore/JSBase.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/js_list.cpp b/src/js_list.cpp
index e3bce0c9..9b01c15e 100644
--- a/src/js_list.cpp
+++ b/src/js_list.cpp
@@ -6,7 +6,7 @@
 #include "js_object.hpp"
 #include "js_util.hpp"
 #include "object_accessor.hpp"
-laksdlasd
+
 using RJSAccessor = realm::NativeAccessor<JSValueRef, JSContextRef>;
 using namespace realm;
 
diff --git a/src/js_object.cpp b/src/js_object.cpp
index 0938b493..df9973b1 100644
--- a/src/js_object.cpp
+++ b/src/js_object.cpp
@@ -2,15 +2,15 @@
  * Proprietary and Confidential
  */
 
-#import "js_util.hpp"
-#import "js_object.hpp"
-#import "js_results.hpp"
-#import "js_schema.hpp"
-#import "js_list.hpp"
-#import "js_realm.hpp"
+#include "js_util.hpp"
+#include "js_object.hpp"
+#include "js_results.hpp"
+#include "js_schema.hpp"
+#include "js_list.hpp"
+#include "js_realm.hpp"
 
-#import "object_store.hpp"
-#import "object_accessor.hpp"
+#include "object_store.hpp"
+#include "object_accessor.hpp"
 
 using RJSAccessor = realm::NativeAccessor<JSValueRef, JSContextRef>;
 using namespace realm;
diff --git a/src/js_realm.cpp b/src/js_realm.cpp
index bc72d7ae..0cc32ae8 100644
--- a/src/js_realm.cpp
+++ b/src/js_realm.cpp
@@ -2,18 +2,18 @@
  * Proprietary and Confidential
  */
 
-#import "js_realm.hpp"
-#import "js_object.hpp"
-#import "js_results.hpp"
-#import "js_list.hpp"
-#import "js_schema.hpp"
-#import "platform.hpp"
+#include "js_realm.hpp"
+#include "js_object.hpp"
+#include "js_results.hpp"
+#include "js_list.hpp"
+#include "js_schema.hpp"
+#include "platform.hpp"
 
-#import "shared_realm.hpp"
-#import "object_accessor.hpp"
-#import "binding_context.hpp"
+#include "shared_realm.hpp"
+#include "object_accessor.hpp"
+#include "binding_context.hpp"
 
-#import <set>
+#include <set>
 
 using namespace realm;
 
diff --git a/src/js_results.cpp b/src/js_results.cpp
index 30b4ae14..cd6b06ab 100644
--- a/src/js_results.cpp
+++ b/src/js_results.cpp
@@ -2,12 +2,12 @@
  * Proprietary and Confidential
  */
 
-#import "js_results.hpp"
-#import "js_object.hpp"
-#import "object_accessor.hpp"
-#import "results.hpp"
-#import "parser.hpp"
-#import "query_builder.hpp"
+#include "js_results.hpp"
+#include "js_object.hpp"
+#include "object_accessor.hpp"
+#include "results.hpp"
+#include "parser.hpp"
+#include "query_builder.hpp"
 
 using namespace realm;
 
diff --git a/src/js_schema.cpp b/src/js_schema.cpp
index 3bf95747..6392c86d 100644
--- a/src/js_schema.cpp
+++ b/src/js_schema.cpp
@@ -2,8 +2,8 @@
  * Proprietary and Confidential
  */
 
-#import "js_schema.hpp"
-#import "object_store.hpp"
+#include "js_schema.hpp"
+#include "object_store.hpp"
 
 namespace realm {
     struct SchemaWrapper {
diff --git a/src/js_util.cpp b/src/js_util.cpp
index 98862bdf..2cd1f68f 100644
--- a/src/js_util.cpp
+++ b/src/js_util.cpp
@@ -2,7 +2,7 @@
  * Proprietary and Confidential
  */
 
-#import "js_util.hpp"
+#include "js_util.hpp"
 
 using namespace realm;
 
diff --git a/src/js_util.hpp b/src/js_util.hpp
index 14ef431e..4cac1c3a 100644
--- a/src/js_util.hpp
+++ b/src/js_util.hpp
@@ -2,7 +2,8 @@
  * Proprietary and Confidential
  */
 
-#include <JavaScriptCore/JSBase.h>
+#include <JavaScriptCore/JSObjectRef.h>
+
 #include <string>
 #include <stdexcept>
 #include "property.hpp"
diff --git a/src/rpc.cpp b/src/rpc.cpp
index ce270d5a..fd176d7c 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -2,7 +2,7 @@
  * Proprietary and Confidential
  */
 
-#import "rpc.hpp"
+#include "rpc.hpp"
 
 #include <dlfcn.h>
 #include <map>
diff --git a/src/rpc.hpp b/src/rpc.hpp
index be57c36a..e2b895dc 100644
--- a/src/rpc.hpp
+++ b/src/rpc.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#import "json.hpp"
-#import <JavaScriptCore/JSBase.h>
+#include "json.hpp"
+#include <JavaScriptCore/JSBase.h>
 
 namespace realm {
     class ObjectSchema;
diff --git a/tests/react-test-app/android/app/src/main/jni/binding_context.hpp b/tests/react-test-app/android/app/src/main/jni/binding_context.hpp
new file mode 120000
index 00000000..c5cda76e
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/binding_context.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/binding_context.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/index_set.cpp b/tests/react-test-app/android/app/src/main/jni/index_set.cpp
new file mode 120000
index 00000000..e59b0f52
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/index_set.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/index_set.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/index_set.hpp b/tests/react-test-app/android/app/src/main/jni/index_set.hpp
new file mode 120000
index 00000000..c1b02c7f
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/index_set.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/index_set.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/list.cpp b/tests/react-test-app/android/app/src/main/jni/list.cpp
new file mode 120000
index 00000000..c1a7432e
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/list.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/list.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/list.hpp b/tests/react-test-app/android/app/src/main/jni/list.hpp
new file mode 120000
index 00000000..ca3672b5
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/list.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/list.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/object_accessor.hpp b/tests/react-test-app/android/app/src/main/jni/object_accessor.hpp
new file mode 120000
index 00000000..998ea825
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/object_accessor.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/object_accessor.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/object_schema.cpp b/tests/react-test-app/android/app/src/main/jni/object_schema.cpp
new file mode 120000
index 00000000..d2552190
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/object_schema.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/object_schema.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/object_schema.hpp b/tests/react-test-app/android/app/src/main/jni/object_schema.hpp
new file mode 120000
index 00000000..2fca9fe8
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/object_schema.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/object_schema.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/object_store.cpp b/tests/react-test-app/android/app/src/main/jni/object_store.cpp
new file mode 120000
index 00000000..c920e6c6
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/object_store.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/object_store.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/object_store.hpp b/tests/react-test-app/android/app/src/main/jni/object_store.hpp
new file mode 120000
index 00000000..4ec89882
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/object_store.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/object_store.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/property.hpp b/tests/react-test-app/android/app/src/main/jni/property.hpp
new file mode 120000
index 00000000..13a97feb
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/property.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/property.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/results.cpp b/tests/react-test-app/android/app/src/main/jni/results.cpp
new file mode 120000
index 00000000..e88f81e1
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/results.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/results.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/results.hpp b/tests/react-test-app/android/app/src/main/jni/results.hpp
new file mode 120000
index 00000000..fbbea38f
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/results.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/results.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/schema.cpp b/tests/react-test-app/android/app/src/main/jni/schema.cpp
new file mode 120000
index 00000000..27fd2c49
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/schema.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/schema.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/schema.hpp b/tests/react-test-app/android/app/src/main/jni/schema.hpp
new file mode 120000
index 00000000..dd6ee90b
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/schema.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/schema.hpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/shared_realm.cpp b/tests/react-test-app/android/app/src/main/jni/shared_realm.cpp
new file mode 120000
index 00000000..60d694a0
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/shared_realm.cpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/shared_realm.cpp
\ No newline at end of file
diff --git a/tests/react-test-app/android/app/src/main/jni/shared_realm.hpp b/tests/react-test-app/android/app/src/main/jni/shared_realm.hpp
new file mode 120000
index 00000000..727de551
--- /dev/null
+++ b/tests/react-test-app/android/app/src/main/jni/shared_realm.hpp
@@ -0,0 +1 @@
+../../../../../../../src/object-store/shared_realm.hpp
\ No newline at end of file