Removed some constant allready defined warnings

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Merge pull request #7318 from jvanbaarsen/constant-warning-fix

Removed some constant allready defined warnings