diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 4218ced85..a2d5283a6 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1443,7 +1443,8 @@ void Tokenizer::simplifyTypedef()
                         }
 
                         // skip over variable name
-                        tok2 = tok2->next();
+                        if (!inCast)
+                            tok2 = tok2->next();
 
                         if (tok4 && functionPtrRetFuncPtr)
                         {
@@ -1950,9 +1951,6 @@ bool Tokenizer::tokenize(std::istream &code, const char FileName[], const std::s
     // typedef..
     simplifyTypedef();
 
-    // Fix #1887 - the links are invalid after simplifyTypedef
-    createLinks();
-
     // enum..
     simplifyEnum();