diff --git a/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java b/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java
index b31435a10..c96a83344 100644
--- a/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java
+++ b/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.httpclient.impl;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -37,7 +37,7 @@ import java.io.InputStream;
  * Closes an underlying stream as soon as the end of the stream is reached, and
  * notifies a client when it has done so.
  *
- * @author Ortwin Glück
+ * @author Ortwin Gl�ck
  * @author Eric Johnson
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
  *
diff --git a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java b/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
index 4d7b57058..8cc13c9ba 100644
--- a/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
+++ b/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java
@@ -27,12 +27,14 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.httpclient.impl;
 
 import java.io.IOException;
 
 import org.apache.http.HttpConnection;
 import org.apache.http.HttpResponse;
+import org.apache.http.impl.ConnectionReuseStrategy;
+import org.apache.http.impl.DefaultConnectionReuseStrategy;
 
 /**
  * <p>
diff --git a/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java b/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java
index 256c0da73..fc760eb9a 100644
--- a/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java
+++ b/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.httpclient.impl;
 
 /**
  * When a response stream has been consumed, various parts of the HttpClient
diff --git a/src/java/org/apache/httpclient/impl/io/SSLSocketFactory.java b/src/java/org/apache/httpclient/impl/io/SSLSocketFactory.java
index 8a98c0ec0..7f95f3020 100644
--- a/src/java/org/apache/httpclient/impl/io/SSLSocketFactory.java
+++ b/src/java/org/apache/httpclient/impl/io/SSLSocketFactory.java
@@ -27,7 +27,7 @@
  *
  */
 
-package org.apache.http.impl.io;
+package org.apache.httpclient.impl.io;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java b/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java
index ee80197a2..164f5fa44 100644
--- a/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java
+++ b/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java
@@ -26,7 +26,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.httpclient.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java b/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
index 9211d8e2a..4cf75ca3b 100644
--- a/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
+++ b/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java
@@ -26,7 +26,7 @@
  *
  */
 
-package org.apache.http.impl;
+package org.apache.httpclient.impl;
 
 import java.io.ByteArrayInputStream;
 
@@ -37,6 +37,7 @@ import org.apache.http.HttpMutableResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.StatusLine;
 import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.impl.DefaultHttpParams;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.mockup.HttpConnectionMockup;