diff --git a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs
index e203c98d47..cc410ae96b 100644
--- a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs
+++ b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs
@@ -30,9 +30,10 @@ using OpenSim.Data;
 
 namespace OpenSim.Grid.MessagingServer
 {
+    /*
     public interface IMessageRegionService
     {
         int ClearRegionCache();
         RegionProfileData GetRegionInfo(ulong regionhandle);
-    }
+    }*/
 }
diff --git a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs
index 2abbc41984..7647117029 100644
--- a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs
+++ b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs
@@ -28,8 +28,9 @@
 using System;
 namespace OpenSim.Grid.MessagingServer
 {
+    /*
     public interface IMessageUserServerService
     {
         bool SendToUserServer(System.Collections.Hashtable request, string method);
-    }
+    }*/
 }
diff --git a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs
index 4428205c2a..158c46339a 100644
--- a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs
+++ b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs
@@ -32,11 +32,12 @@ using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.MessagingServer
 {
+    /*
     public interface IUGAIMCore
     {
         T Get<T>();
         void RegisterInterface<T>(T iface);
         bool TryGet<T>(out T iface);
         BaseHttpServer GetHttpServer();
-    }
+    }*/
 }
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index e64d0cacb9..43d1af9dc1 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -34,6 +34,7 @@ using log4net.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
+using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.MessagingServer
 {
diff --git a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs
index a2a7ade009..063774ceeb 100644
--- a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs
+++ b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs
@@ -37,6 +37,7 @@ using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Grid.Framework;
 using Timer = System.Timers.Timer;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 75fb9696ff..a301732f76 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -37,6 +37,7 @@ using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Grid.Framework;
 using Timer=System.Timers.Timer;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs
index c6bf9e7cc9..a97107c4bb 100644
--- a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs
@@ -37,6 +37,7 @@ using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
+using OpenSim.Grid.Framework;
 using Timer = System.Timers.Timer;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 87647cd232..395c4bf99a 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.MessagingServer
-{
+{/*
     public class XMPPHTTPStreamHandler : BaseStreamHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -106,5 +106,5 @@ namespace OpenSim.Grid.MessagingServer
 
         }
 
-    }
+    }*/
 }
diff --git a/prebuild.xml b/prebuild.xml
index 238c99d80d..010e836eb5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -981,6 +981,7 @@
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Grid.Framework"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>