1 files changed, 6 insertions, 3 deletions

diff --git a/src/WixToolset.Extensibility/IUnbindContext.cs b/src/WixToolset.Extensibility/IUnbindContext.cs
index 82364652..beaa5491 100644
--- a/src/WixToolset.Extensibility/IUnbindContext.cs
+++ b/src/WixToolset.Extensibility/IUnbindContext.cs
@@ -2,10 +2,15 @@
 
 namespace WixToolset.Extensibility
 {
-    using WixToolset.Data;
+    using System;
+    using WixToolset.Extensibility.Services;
 
     public interface IUnbindContext
     {
+        IServiceProvider ServiceProvider { get; }
+
+        IMessaging Messaging { get; set; }
+
         string ExportBasePath { get; set; }
 
         string InputFilePath { get; set; }
@@ -14,8 +19,6 @@ namespace WixToolset.Extensibility
 
         bool IsAdminImage { get; set; }
 
-        Messaging Messaging { get; }
-
         bool SuppressDemodularization { get; set; }
 
         bool SuppressExtractCabinets { get; set; }