diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java
index 76d136acc9d..9c16c7b3f66 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/Session.java
@@ -22,6 +22,8 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+
 /**
  * Session represents an active link of communications with a Remote WebSocket Endpoint.
  */
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
index a70981e815d..898734125b8 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java
@@ -109,8 +109,6 @@ public interface UpgradeRequest
 
     /**
      * The host of the Upgrade Request URI
-     * <p>
-     * Equivalent to {@link #getRequestURI()#getHost()}
      *
      * @return host of the request URI
      */
@@ -140,7 +138,7 @@ public interface UpgradeRequest
      * <p>
      * See <a href="http://tools.ietf.org/html/rfc6455#section-10.2">RFC6455: Section 10.2</a> for details.
      * <p>
-     * Equivalent to {@link #getHeader("Origin")}
+     * Equivalent to {@link #getHeader(String)} passed the "Origin" header.
      *
      * @return the Origin header
      */
@@ -165,8 +163,6 @@ public interface UpgradeRequest
 
     /**
      * Get the Query String of the request URI.
-     * <p>
-     * Equivalent to {@link #getRequestURI()#getQueryString()}
      *
      * @return the request uri query string
      */