diff --git a/src/internal/toksvc_daemon_impl.h b/src/internal/toksvc_daemon_impl.h
index 04934c3..52d5e99 100644
--- a/src/internal/toksvc_daemon_impl.h
+++ b/src/internal/toksvc_daemon_impl.h
@@ -38,9 +38,9 @@ struct toks_client_ctx {
 };
 
 struct toks_token {
-	struct _nt_port_keys	keys;
-	struct toks_client_ctx	client;
 	struct toks_token *	self;
+	struct toks_client_ctx	client;
+	struct _nt_port_keys	keys;
 };
 
 struct toks_waiter {