diff --git a/awc/src/error.rs b/awc/src/error.rs
index c1d85505..aa9dc4d9 100644
--- a/awc/src/error.rs
+++ b/awc/src/error.rs
@@ -1,5 +1,6 @@
 //! HTTP client errors
 
+// TODO: figure out how best to expose http::Error vs actix_http::Error
 pub use actix_http::{
     error::{HttpError, PayloadError},
     header::HeaderValue,
diff --git a/awc/src/lib.rs b/awc/src/lib.rs
index 348d9312..970ca2d9 100644
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -105,6 +105,11 @@
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
 
+pub use actix_http::body;
+
+#[cfg(feature = "cookies")]
+pub use cookie;
+
 mod any_body;
 mod builder;
 mod client;
@@ -118,10 +123,14 @@ mod sender;
 pub mod test;
 pub mod ws;
 
-// TODO: hmmmmmm
-pub use actix_http as http;
-#[cfg(feature = "cookies")]
-pub use cookie;
+pub mod http {
+    //! Various HTTP related types.
+
+    // TODO: figure out how best to expose http::Error vs actix_http::Error
+    pub use actix_http::{
+        header, uri, ConnectionType, Error, Method, StatusCode, Uri, Version,
+    };
+}
 
 pub use self::builder::ClientBuilder;
 pub use self::client::{Client, Connector};
diff --git a/src/http/mod.rs b/src/http/mod.rs
index bbd94a60..2581532c 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -2,4 +2,5 @@
 
 pub mod header;
 
+// TODO: figure out how best to expose http::Error vs actix_http::Error
 pub use actix_http::{uri, ConnectionType, Error, Method, StatusCode, Uri, Version};