diff --git a/ssh-message-types.rkt b/ssh-message-types.rkt
index afd4ab3..a9a7e10 100644
--- a/ssh-message-types.rkt
+++ b/ssh-message-types.rkt
@@ -20,7 +20,8 @@
 	 mpint-width
 	 t:name-list)
 
-(provide (struct-out ssh-msg-kexinit)
+(provide (struct-out ssh-msg)
+	 (struct-out ssh-msg-kexinit)
 	 (struct-out ssh-msg-kexdh-init)
 	 (struct-out ssh-msg-kexdh-reply)
 	 (struct-out ssh-msg-disconnect)
@@ -29,6 +30,8 @@
 	 (struct-out ssh-msg-debug)
 	 (struct-out ssh-msg-ignore))
 
+(struct ssh-msg () #:transparent)
+
 (define decoder-map (make-hasheqv))
 
 (define-values (prop:ssh-message-encoder ssh-message-encoder? ssh-message-encoder)
@@ -48,7 +51,7 @@
   (syntax-rules ()
     ((_ name type-byte-value (field-type field-name) ...)
      (begin
-       (struct name (field-name ...)
+       (struct name ssh-msg (field-name ...)
 	       #:transparent
 	       #:property prop:ssh-message-encoder
 	       (compute-ssh-message-encoder type-byte-value field-type ...))