diff --git a/src/java/org/apache/http/conn/Scheme.java b/src/java/org/apache/http/conn/Scheme.java
index 542da3c0e..275c7d467 100644
--- a/src/java/org/apache/http/conn/Scheme.java
+++ b/src/java/org/apache/http/conn/Scheme.java
@@ -32,7 +32,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
 import org.apache.http.util.LangUtils;
 
 /**
diff --git a/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java b/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java
index cb8a30f5a..6b195d7c9 100644
--- a/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java
+++ b/src/java/org/apache/http/cookie/impl/BrowserCompatSpec.java
@@ -34,9 +34,9 @@ import org.apache.http.HeaderElement;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.io.CharArrayBuffer;
 import org.apache.http.message.BasicHeaderElement;
 import org.apache.http.message.BufferedHeader;
+import org.apache.http.util.CharArrayBuffer;
 import org.apache.http.util.DateParseException;
 import org.apache.http.util.DateUtils;
 
diff --git a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java b/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java
index 5423b1506..24d83fecf 100644
--- a/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java
+++ b/src/java/org/apache/http/cookie/impl/NetscapeDraftSpec.java
@@ -34,9 +34,9 @@ import org.apache.http.HeaderElement;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.io.CharArrayBuffer;
 import org.apache.http.message.BasicHeaderElement;
 import org.apache.http.message.BufferedHeader;
+import org.apache.http.util.CharArrayBuffer;
 
 /**
  * Netscape cookie draft compliant cookie policy
diff --git a/src/java/org/apache/http/cookie/impl/RFC2109Spec.java b/src/java/org/apache/http/cookie/impl/RFC2109Spec.java
index d3c1cd62d..a50032d51 100644
--- a/src/java/org/apache/http/cookie/impl/RFC2109Spec.java
+++ b/src/java/org/apache/http/cookie/impl/RFC2109Spec.java
@@ -37,8 +37,8 @@ import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookiePathComparator;
 import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.io.CharArrayBuffer;
 import org.apache.http.message.BufferedHeader;
+import org.apache.http.util.CharArrayBuffer;
 import org.apache.http.util.DateUtils;
 
 /**