diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseException.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseException.cs
index fa70323f8e..d87bc6f633 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseException.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseException.cs
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
+using Microsoft.AspNet.Mvc;
 using System.Net;
 using System.Net.Http;
+using ShimResources = Microsoft.AspNet.Mvc.WebApiCompatShim.Resources;
 
-namespace Microsoft.AspNet.Mvc.WebApiCompatShim
+namespace System.Web.Http
 {
     public class HttpResponseException : Exception
     {
@@ -23,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim
         /// </summary>
         /// <param name="response">The response message.</param>
         public HttpResponseException([NotNull] HttpResponseMessage response)
-            : base(Resources.HttpResponseExceptionMessage)
+            : base(ShimResources.HttpResponseExceptionMessage)
         {
             Response = response;
         }
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
index 1ab0817042..1e6a9b1bce 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Net.Http;
+using System.Web.Http;
 
 namespace Microsoft.AspNet.Mvc.WebApiCompatShim
 {
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
index 0fc6689f64..9731f8b23d 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+#if !ASPNETCORE50
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
+using System.Web.Http;
 using Microsoft.AspNet.PipelineCore;
 using Microsoft.AspNet.Routing;
-#if !ASPNETCORE50
 using Moq;
 #endif
 using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
index 0289f2c960..6c2a68a779 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionTest.cs
@@ -3,6 +3,7 @@
 
 using System.Net;
 using System.Net.Http;
+using System.Web.Http;
 using Microsoft.AspNet.Testing;
 using Xunit;