diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 6cf9ff27..e8920874 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,6 +1,19 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+### Added
+* Re-export `http` crate's `Error` type as `error::HttpError`. [#2171]
+* Re-export `StatusCode`, `Method`, `Version` and `Uri` at the crate root. [#2171]
+* Re-export `ContentEncoding` and `ConnectionType` at the crate root. [#2171]
+
+### Changed
+* `header` mod is now public. [#2171]
+* `uri` mod is now public. [#2171]
+
+### Removed
+* Stop re-exporting `http` crate's `HeaderMap` types in addition to ours. [#2171]
+
+[#2171]: https://github.com/actix/actix-web/pull/2171
 
 
 ## 3.0.0-beta.6 - 2021-04-17
diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index 68ad709a..cd2917c9 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -10,12 +10,13 @@ use std::{
 
 use bytes::BytesMut;
 use derive_more::{Display, Error, From};
-use http::uri::InvalidUri;
-use http::{header, Error as HttpError, StatusCode};
+use http::{header, uri::InvalidUri, StatusCode};
 use serde::de::value::Error as DeError;
 
 use crate::{body::Body, helpers::Writer, Response, ResponseBuilder};
 
+pub use http::Error as HttpError;
+
 /// A specialized [`std::result::Result`]
 /// for actix web operations
 ///
diff --git a/actix-http/src/header/mod.rs b/actix-http/src/header/mod.rs
index a6056ace..18494f55 100644
--- a/actix-http/src/header/mod.rs
+++ b/actix-http/src/header/mod.rs
@@ -1,9 +1,33 @@
-//! Typed HTTP headers, pre-defined `HeaderName`s, traits for parsing and conversion, and other
-//! header utility methods.
+//! Pre-defined `HeaderName`s, traits for parsing and conversion, and other header utility methods.
 
 use percent_encoding::{AsciiSet, CONTROLS};
 
-pub use http::header::*;
+// re-export from http except header map related items
+pub use http::header::{
+    HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue, ToStrError,
+};
+
+// re-export const header names
+pub use http::header::{
+    ACCEPT, ACCEPT_CHARSET, ACCEPT_ENCODING, ACCEPT_LANGUAGE, ACCEPT_RANGES,
+    ACCESS_CONTROL_ALLOW_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS,
+    ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
+    ACCESS_CONTROL_EXPOSE_HEADERS, ACCESS_CONTROL_MAX_AGE,
+    ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, AGE, ALLOW, ALT_SVC,
+    AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_DISPOSITION, CONTENT_ENCODING,
+    CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_RANGE,
+    CONTENT_SECURITY_POLICY, CONTENT_SECURITY_POLICY_REPORT_ONLY, CONTENT_TYPE, COOKIE,
+    DATE, DNT, ETAG, EXPECT, EXPIRES, FORWARDED, FROM, HOST, IF_MATCH,
+    IF_MODIFIED_SINCE, IF_NONE_MATCH, IF_RANGE, IF_UNMODIFIED_SINCE, LAST_MODIFIED,
+    LINK, LOCATION, MAX_FORWARDS, ORIGIN, PRAGMA, PROXY_AUTHENTICATE,
+    PROXY_AUTHORIZATION, PUBLIC_KEY_PINS, PUBLIC_KEY_PINS_REPORT_ONLY, RANGE, REFERER,
+    REFERRER_POLICY, REFRESH, RETRY_AFTER, SEC_WEBSOCKET_ACCEPT,
+    SEC_WEBSOCKET_EXTENSIONS, SEC_WEBSOCKET_KEY, SEC_WEBSOCKET_PROTOCOL,
+    SEC_WEBSOCKET_VERSION, SERVER, SET_COOKIE, STRICT_TRANSPORT_SECURITY, TE, TRAILER,
+    TRANSFER_ENCODING, UPGRADE, UPGRADE_INSECURE_REQUESTS, USER_AGENT, VARY, VIA,
+    WARNING, WWW_AUTHENTICATE, X_CONTENT_TYPE_OPTIONS, X_DNS_PREFETCH_CONTROL,
+    X_FRAME_OPTIONS, X_XSS_PROTECTION,
+};
 
 use crate::error::ParseError;
 use crate::HttpMessage;
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 4547f3ef..82d0415c 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -35,7 +35,7 @@ mod config;
 #[cfg(feature = "compress")]
 pub mod encoding;
 mod extensions;
-mod header;
+pub mod header;
 mod helpers;
 mod http_message;
 mod message;
@@ -56,7 +56,9 @@ pub use self::builder::HttpServiceBuilder;
 pub use self::config::{KeepAlive, ServiceConfig};
 pub use self::error::{Error, ResponseError, Result};
 pub use self::extensions::Extensions;
+pub use self::header::ContentEncoding;
 pub use self::http_message::HttpMessage;
+pub use self::message::ConnectionType;
 pub use self::message::{Message, RequestHead, RequestHeadType, ResponseHead};
 pub use self::payload::{Payload, PayloadStream};
 pub use self::request::Request;
@@ -64,6 +66,10 @@ pub use self::response::Response;
 pub use self::response_builder::ResponseBuilder;
 pub use self::service::HttpService;
 
+pub use ::http::{uri, uri::Uri};
+pub use ::http::{Method, StatusCode, Version};
+
+// TODO: deprecate this mish-mash of random items
 pub mod http {
     //! Various HTTP related types.
 
diff --git a/actix-http/src/message.rs b/actix-http/src/message.rs
index c89f5311..8cb99d43 100644
--- a/actix-http/src/message.rs
+++ b/actix-http/src/message.rs
@@ -1,12 +1,15 @@
-use std::cell::{Ref, RefCell, RefMut};
-use std::net;
-use std::rc::Rc;
+use std::{
+    cell::{Ref, RefCell, RefMut},
+    net,
+    rc::Rc,
+};
 
 use bitflags::bitflags;
 
-use crate::extensions::Extensions;
-use crate::header::HeaderMap;
-use crate::http::{header, Method, StatusCode, Uri, Version};
+use crate::{
+    header::{self, HeaderMap},
+    Extensions, Method, StatusCode, Uri, Version,
+};
 
 /// Represents various types of connection
 #[derive(Copy, Clone, PartialEq, Debug)]
diff --git a/actix-http/src/response_builder.rs b/actix-http/src/response_builder.rs
index 4d8cb442..0105f70c 100644
--- a/actix-http/src/response_builder.rs
+++ b/actix-http/src/response_builder.rs
@@ -14,12 +14,10 @@ use futures_core::Stream;
 
 use crate::{
     body::{Body, BodyStream, ResponseBody},
-    error::Error,
-    extensions::Extensions,
-    header::{IntoHeaderPair, IntoHeaderValue},
-    http::{header, Error as HttpError, StatusCode},
+    error::{Error, HttpError},
+    header::{self, IntoHeaderPair, IntoHeaderValue},
     message::{BoxedResponseHead, ConnectionType, ResponseHead},
-    Response,
+    Extensions, Response, StatusCode,
 };
 
 /// An HTTP response builder.
@@ -291,7 +289,7 @@ impl ResponseBuilder {
             return None;
         }
 
-        self.head.as_mut().map(|r| &mut **r)
+        self.head.as_deref_mut()
     }
 }
 
diff --git a/actix-test/CHANGES.md b/actix-test/CHANGES.md
index d57f8bf4..2276fe74 100644
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -4,7 +4,7 @@
 
 
 ## 0.1.0-beta.2 - 2021-04-17
-* * No significant changes from `0.1.0-beta.1`.
+* No significant changes from `0.1.0-beta.1`.
 
 
 ## 0.1.0-beta.1 - 2021-04-02
diff --git a/src/http/header/content_disposition.rs b/src/http/header/content_disposition.rs
index bff4e49a..71c61015 100644
--- a/src/http/header/content_disposition.rs
+++ b/src/http/header/content_disposition.rs
@@ -553,7 +553,7 @@ impl fmt::Display for ContentDisposition {
 mod tests {
     use super::{ContentDisposition, DispositionParam, DispositionType};
     use crate::http::header::{Charset, ExtendedValue, HeaderValue};
-    
+
     #[test]
     fn test_from_raw_basic() {
         assert!(ContentDisposition::from_raw(&HeaderValue::from_static("")).is_err());
diff --git a/src/service.rs b/src/service.rs
index dd3597ef..f6d1f9eb 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -9,6 +9,7 @@ use actix_http::{
 };
 use actix_router::{IntoPattern, Path, Resource, ResourceDef, Url};
 use actix_service::{IntoServiceFactory, ServiceFactory};
+#[cfg(feature = "cookies")]
 use cookie::{Cookie, ParseError as CookieParseError};
 
 use crate::dev::insert_slash;