Fix related to RedMine issue #1669 - already define constant notice is
fixed;