diff --git a/CHANGES.md b/CHANGES.md
index 217ec4f78..dcbda7b70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,14 +5,17 @@
 * Re-export actix-service `ServiceFactory` in `dev` module. [#2325]
 
 ### Changed
-* Minimum supported Rust version (MSRV) is now 1.51.
 * Compress middleware will return 406 Not Acceptable when no content encoding is acceptable to the client. [#2344]
+* Move `BaseHttpResponse` to `dev::Response`. [#????]
+* Minimum supported Rust version (MSRV) is now 1.51.
 
 ### Fixed
 * Fix quality parse error in Accept-Encoding header. [#2344]
+* Re-export correct type at `web::HttpResponse`. [#????]
 
 [#2325]: https://github.com/actix/actix-web/pull/2325
 [#2344]: https://github.com/actix/actix-web/pull/2344
+[#????]: https://github.com/actix/actix-web/pull/????
 
 
 ## 4.0.0-beta.8 - 2021-06-26
diff --git a/src/dev.rs b/src/dev.rs
index 0817d902f..3a6c2d577 100644
--- a/src/dev.rs
+++ b/src/dev.rs
@@ -18,7 +18,7 @@ pub use actix_http::body::{AnyBody, Body, BodySize, MessageBody, ResponseBody, S
 
 #[cfg(feature = "__compress")]
 pub use actix_http::encoding::Decoder as Decompress;
-pub use actix_http::{Extensions, Payload, PayloadStream, RequestHead, ResponseHead};
+pub use actix_http::{Extensions, Payload, PayloadStream, RequestHead, ResponseHead, Response};
 pub use actix_router::{Path, ResourceDef, ResourcePath, Url};
 pub use actix_server::Server;
 pub use actix_service::{
diff --git a/src/lib.rs b/src/lib.rs
index e7cf46361..d008fdb7f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -96,7 +96,6 @@ pub mod test;
 pub(crate) mod types;
 pub mod web;
 
-pub use actix_http::Response as BaseHttpResponse;
 pub use actix_http::{body, HttpMessage};
 #[doc(inline)]
 pub use actix_rt as rt;
diff --git a/src/web.rs b/src/web.rs
index 65c7b95a2..40d7636cf 100644
--- a/src/web.rs
+++ b/src/web.rs
@@ -3,7 +3,6 @@
 use std::future::Future;
 
 use actix_http::http::Method;
-pub use actix_http::Response as HttpResponse;
 use actix_router::IntoPatterns;
 pub use bytes::{Buf, BufMut, Bytes, BytesMut};
 
@@ -16,6 +15,7 @@ pub use crate::config::ServiceConfig;
 pub use crate::data::Data;
 pub use crate::request::HttpRequest;
 pub use crate::request_data::ReqData;
+pub use crate::response::HttpResponse;
 pub use crate::types::*;
 
 /// Creates a new resource for a specific path.
@@ -81,22 +81,22 @@ macro_rules! method_route {
     ($method_fn:ident, $method_const:ident) => {
         paste::paste! {
             #[doc = "Creates a new route with `" $method_const "` method guard."]
-///
+            ///
             /// # Examples
             #[doc = "In this example, one `" $method_const " /{project_id}` route is set up:"]
-/// ```
-/// use actix_web::{web, App, HttpResponse};
-///
-/// let app = App::new().service(
-///     web::resource("/{project_id}")
+            /// ```
+            /// use actix_web::{web, App, HttpResponse};
+            ///
+            /// let app = App::new().service(
+            ///     web::resource("/{project_id}")
             #[doc = "         .route(web::" $method_fn "().to(|| HttpResponse::Ok()))"]
-///
-/// );
-/// ```
+            ///
+            /// );
+            /// ```
             pub fn $method_fn() -> Route {
                 method(Method::$method_const)
-}
-}
+            }
+        }
     };
 }