diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index 52d20d32b..2199075ca 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -46,8 +46,8 @@
 
 /* Map a generator function and its attributes to a token */
 typedef struct {
-    unsigned char Tok;	     		/* Token to map to */
-    unsigned char Flags;  		/* Flags for generator function */
+    token_t       Tok;	     		/* Token to map to */
+    unsigned      Flags;  		/* Flags for generator function */
     void       	  (*Func) (unsigned, unsigned long); 	/* Generator func */
 } GenDesc;