diff --git a/src/dmd/tokens.d b/src/dmd/tokens.d
index ecf0ef5694..f304072dcc 100644
--- a/src/dmd/tokens.d
+++ b/src/dmd/tokens.d
@@ -22,7 +22,7 @@ import dmd.root.outbuffer;
 import dmd.root.rmem;
 import dmd.utf;
 
-enum TOK : int
+enum TOK : ubyte
 {
     reserved,
 
diff --git a/src/dmd/tokens.h b/src/dmd/tokens.h
index 34eb59ceb7..d04764ce18 100644
--- a/src/dmd/tokens.h
+++ b/src/dmd/tokens.h
@@ -31,7 +31,8 @@ class Identifier;
         ?       &&      ||
  */
 
-enum TOK
+typedef unsigned char TOK;
+enum
 {
         TOKreserved,