diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 236691ec4..708ffa425 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -826,7 +826,7 @@ void Tokenizer::simplifyTypedef()
             typeStart = tok->next();
             offset = 1;
 
-            if (Token::Match(typeStart, "const"))
+            while (Token::Match(tok->tokAt(offset), "const|signed|unsigned"))
                 offset++;
 
             typeEnd = tok->tokAt(offset++);