diff --git a/samples/SelfHostServer/Startup.cs b/samples/SelfHostServer/Startup.cs
index c34e761ca7..e37f198434 100644
--- a/samples/SelfHostServer/Startup.cs
+++ b/samples/SelfHostServer/Startup.cs
@@ -16,6 +16,7 @@
 // permissions and limitations under the License.
 
 using Microsoft.AspNet;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Server.WebListener;
 using Microsoft.Net.Server;
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
index 84ccb37d30..9b2f4d9697 100644
--- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
@@ -40,6 +40,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.ConfigurationModel;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting.Server;
 using Microsoft.AspNet.Logging;
 using Microsoft.Net.Server;
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs b/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs
index 3576acae05..ef9e0bdda1 100644
--- a/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/ServerInformation.cs
@@ -16,6 +16,7 @@
 // permissions and limitations under the License.
 
 using System.Reflection;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.Server.WebListener