diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientConnection.java b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientConnection.java
index ffc7e8f99f5..d7e118f28ce 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientConnection.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientConnection.java
@@ -15,8 +15,8 @@
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.MultiMap;
-import io.vertx.core.http.HttpConnection;
import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.http.HttpConnectionInternal;
import io.vertx.core.internal.logging.Logger;
import io.vertx.core.internal.logging.LoggerFactory;
import io.vertx.core.net.HostAndPort;
@@ -24,7 +24,7 @@
/**
* @author Julien Viet
*/
-public interface HttpClientConnection extends HttpConnection {
+public interface HttpClientConnection extends HttpConnectionInternal {
Logger log = LoggerFactory.getLogger(HttpClientConnection.class);
diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerConnection.java b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerConnection.java
index 960ceb7f322..cb9774622c4 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerConnection.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerConnection.java
@@ -13,13 +13,13 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.Headers;
import io.vertx.core.Handler;
-import io.vertx.core.http.HttpConnection;
import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.http.HttpConnectionInternal;
/**
* @author Julien Viet
*/
-public interface HttpServerConnection extends HttpConnection {
+public interface HttpServerConnection extends HttpConnectionInternal {
HttpServerConnection streamHandler(Handler handler);
diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1Connection.java b/vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1Connection.java
index c06b2394fce..f35485f8f38 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1Connection.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1Connection.java
@@ -29,17 +29,20 @@
import io.vertx.core.net.impl.VertxConnection;
import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author Julien Viet
*/
-abstract class Http1Connection extends VertxConnection implements io.vertx.core.http.HttpConnection {
+abstract class Http1Connection extends VertxConnection implements HttpConnection {
protected boolean closeInitiated;
protected Duration shutdownInitiated;
protected ChannelPromise closePromise;
private Handler shutdownHandler;
+ private Map