diff --git a/tonic-build/src/server.rs b/tonic-build/src/server.rs
index 105494321..b9e687b61 100644
--- a/tonic-build/src/server.rs
+++ b/tonic-build/src/server.rs
@@ -49,7 +49,12 @@ pub fn generate<'a, T: Service<'a>>(service: &'a T, context: &T::Context) -> Tok
                 }
             }
 
-            impl<T: #server_trait> Service<http::Request<HyperBody>> for #server_service<T> {
+            impl<T, B> Service<http::Request<B>> for #server_service<T>
+                where
+                    T: #server_trait,
+                    B: HttpBody + Send + Sync + 'static,
+                    B::Error: Into<StdError> + Send + 'static,
+            {
                 type Response = http::Response<tonic::body::BoxBody>;
                 type Error = Never;
                 type Future = BoxFuture<Self::Response, Self::Error>;
@@ -58,7 +63,7 @@ pub fn generate<'a, T: Service<'a>>(service: &'a T, context: &T::Context) -> Tok
                     Poll::Ready(Ok(()))
                 }
 
-                fn call(&mut self, req: http::Request<HyperBody>) -> Self::Future {
+                fn call(&mut self, req: http::Request<B>) -> Self::Future {
                     let inner = self.inner.clone();
 
                     match req.uri().path() {
diff --git a/tonic/src/codegen.rs b/tonic/src/codegen.rs
index e5eea9b91..4f0509ad0 100644
--- a/tonic/src/codegen.rs
+++ b/tonic/src/codegen.rs
@@ -13,9 +13,6 @@ pub use tower_service::Service;
 pub type StdError = Box<dyn std::error::Error + Send + Sync + 'static>;
 pub use crate::body::Body;
 
-#[cfg(feature = "transport")]
-pub use hyper::Body as HyperBody;
-
 pub type BoxFuture<T, E> = self::Pin<Box<dyn self::Future<Output = Result<T, E>> + Send + 'static>>;
 pub type BoxStream<T> =
     self::Pin<Box<dyn futures_core::Stream<Item = Result<T, crate::Status>> + Send + 'static>>;