diff --git a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java b/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
index a1e5a9304..9656c6a70 100644
--- a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
+++ b/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
@@ -31,9 +31,9 @@ package org.apache.httpclient.impl;
 
 import java.io.IOException;
 
+import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpConnection;
 import org.apache.http.HttpResponse;
-import org.apache.http.impl.ConnectionReuseStrategy;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 
 /**
diff --git a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java b/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
index 0a39a5b66..6acf339d1 100644
--- a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
+++ b/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
@@ -32,7 +32,7 @@ import java.io.ByteArrayInputStream;
 
 import org.apache.http.Header;
 import org.apache.http.HttpConnection;
-import org.apache.http.HttpMutableResponse;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.StatusLine;
 import org.apache.http.entity.BasicHttpEntity;
@@ -87,7 +87,7 @@ public class TestDefaultResponseConsumedWatcher extends TestCase {
         entity.setContent(new ByteArrayInputStream(data));
         
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.setHeader(new Header("Connection", "Close"));
         response.setParams(new DefaultHttpParams(null));
         response.setEntity(entity);
@@ -110,7 +110,7 @@ public class TestDefaultResponseConsumedWatcher extends TestCase {
         entity.setContent(new ByteArrayInputStream(data));
         
         StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK");
-        HttpMutableResponse response = new BasicHttpResponse(statusline);
+        HttpResponse response = new BasicHttpResponse(statusline);
         response.setHeader(new Header("Connection", "Keep-alive"));
         response.setParams(new DefaultHttpParams(null));
         response.setEntity(entity);