Match declaration with definition
Use existing named constants
Merge branch 'master' of github.com:wesnoth/wesnoth