this patch fixes redundant declarations in 2.5.24
 (same as sent yesterday, but this time automacially splitted
 into several mails)