diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index e735a078fc1..fa6aacb7aa1 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -2537,11 +2537,12 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     tok2 = skipRedundantPtrOp(tok2, tok2->astParent());
 
     if (tok2->astParent() && tok2->astParent()->isAssignmentOp()) {
-        if (tok2 == tok2->astParent()->astOperand1())
+        if ((indirect == 0 || tok2 != tok) && tok2 == tok2->astParent()->astOperand1())
             return true;
         // Check if assigning to a non-const lvalue
         const Variable * var = getLHSVariable(tok2->astParent());
-        if (var && var->isReference() && !var->isConst() && var->nameToken() && var->nameToken()->next() == tok2->astParent()) {
+        if (var && var->isReference() && !var->isConst() &&
+            ((var->nameToken() && var->nameToken()->next() == tok2->astParent()) || var->isPointer())) {
             if (!var->isLocal() || isVariableChanged(var, settings, cpp, depth - 1))
                 return true;
         }
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index d937e625b97..418c9f06bc2 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1705,6 +1705,8 @@ void CheckOther::checkConstPointer()
                 continue;
             if (p->isArgument() && p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
                 continue;
+            if (p->typeStartToken() && !p->typeStartToken()->originalName().empty())
+                continue;
             constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
         }
     }
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index b4bba09cdaa..805741fd00b 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -992,7 +992,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
 
         mData->enumValue = 0;
         Token *enumtok = addtoken(tokenList, "enum");
-        Token *nametok = nullptr;
+        const Token *nametok = nullptr;
         {
             int nameIndex = mExtTokens.size() - 1;
             while (nameIndex > colIndex && mExtTokens[nameIndex][0] == '\'')
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 2827b3cc7d0..0b892cc98e1 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -1914,6 +1914,7 @@ void TokenList::simplifyPlatformTypes()
                 tok = tok->previous();
                 tok->deleteThis();
             }
+            tok->originalName(tok->str());
             Token *typeToken;
             if (platformtype->mConstPtr) {
                 tok->str("const");
@@ -1930,7 +1931,6 @@ void TokenList::simplifyPlatformTypes()
                 tok->insertToken("*");
                 tok->insertToken("*");
             } else {
-                tok->originalName(tok->str());
                 tok->str(platformtype->mType);
                 typeToken = tok;
             }
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 74c947a596b..b7e4f21485d 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -269,7 +269,7 @@ void g_new_if_test()
         int b;
     };
 
-    struct a * pNew3;
+    const struct a * pNew3;
     if (pNew3 = g_new(struct a, 6)) {
         printf("%p", pNew3);
     }
diff --git a/test/testother.cpp b/test/testother.cpp
index b3d0fc0d2b3..6eb18a14215 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -8915,14 +8915,14 @@ class TestOther : public TestFixture {
               "  state_t *x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());
 
         check("void f() {\n"
               "  state_t *x;\n"
               "  x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());
 
         check("int foo() {\n" // #4420
               "    int x;\n"
@@ -9055,7 +9055,8 @@ class TestOther : public TestFixture {
               "        barney(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n",
+        ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n"
+                      "test.cpp:2:style:Variable 'p' can be declared as pointer to const\n",
                       errout.str());
 
         check("void foo() {\n"
@@ -9147,14 +9148,14 @@ class TestOther : public TestFixture {
               "   a = (void*)0;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0U;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());
     }
 
     void redundantVarAssignment_struct() {
@@ -9411,7 +9412,7 @@ class TestOther : public TestFixture {
               "    int *p = NULL;\n"
               "    p = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("test.cpp:2:style:Variable 'p' can be declared as pointer to const\n", errout.str());
 
         // "trivial" initialization => do not warn
         check("void f() {\n"