diff --git a/src/HttpContextData.h b/src/HttpContextData.h
index 2ee56d9..aa2387e 100644
--- a/src/HttpContextData.h
+++ b/src/HttpContextData.h
@@ -23,7 +23,7 @@
 
 namespace uWS {
 template<bool> struct HttpResponse;
-struct HttpRequest;
+class HttpRequest;
 
 template <bool SSL>
 struct HttpContextData {
diff --git a/src/WebSocketContext.h b/src/WebSocketContext.h
index d034aae..03e4647 100644
--- a/src/WebSocketContext.h
+++ b/src/WebSocketContext.h
@@ -28,7 +28,7 @@ namespace uWS {
 template <bool SSL, bool isServer>
 struct WebSocketContext : StaticDispatch<SSL> {
     template <bool> friend struct TemplatedApp;
-    template <bool, class> friend struct WebSocketProtocol;
+    template <bool, class> friend class WebSocketProtocol;
 private:
     using SOCKET_CONTEXT_TYPE = typename StaticDispatch<SSL>::SOCKET_CONTEXT_TYPE;
     using SOCKET_TYPE = typename StaticDispatch<SSL>::SOCKET_TYPE;