diff --git a/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/RegisterService.cs b/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/RegisterService.cs
index 54c90d24e..774e3f4a1 100644
--- a/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/RegisterService.cs
+++ b/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/RegisterService.cs
@@ -48,7 +48,6 @@
 using System.Threading;
 using System.Runtime.InteropServices;
 using Couchbase.Lite.Util;
-using Couchbase.Lite.Unity;
 
 #if __IOS__
 using AOT = ObjCRuntime;
@@ -84,7 +83,7 @@ static RegisterService() {
         }
         #elif __UNITY_ANDROID__
         static RegisterService() {
-            UnityMainThreadScheduler.TaskFactory.StartNew(() =>
+            Couchbase.Lite.Unity.UnityMainThreadScheduler.TaskFactory.StartNew(() =>
             {
                 UnityEngine.AndroidJavaClass c = new UnityEngine.AndroidJavaClass("com.unity3d.player.UnityPlayer");
                 var context = c.GetStatic<UnityEngine.AndroidJavaObject>("currentActivity");
diff --git a/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/ServiceBrowser.cs b/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/ServiceBrowser.cs
index f4b3aa1bb..304974dfc 100644
--- a/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/ServiceBrowser.cs
+++ b/src/ListenerComponent/Bonjour/Couchbase.Lite.Listener.Bonjour.Shared/Mono.Zeroconf.Providers.Bonjour/ServiceBrowser.cs
@@ -49,7 +49,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Runtime.InteropServices;
-using Couchbase.Lite.Unity;
 
 #if __IOS__
 using AOT = ObjCRuntime;
@@ -114,7 +113,7 @@ static ServiceBrowser() {
         }
         #elif __UNITY_ANDROID__
         static ServiceBrowser() {
-            UnityMainThreadScheduler.TaskFactory.StartNew(() =>
+            Couchbase.Lite.Unity.UnityMainThreadScheduler.TaskFactory.StartNew(() =>
             {
                 UnityEngine.AndroidJavaClass c = new UnityEngine.AndroidJavaClass("com.unity3d.player.UnityPlayer");
                 var context = c.GetStatic<UnityEngine.AndroidJavaObject>("currentActivity");