Remove duplicate declarations

This causes 'redefinition of typedef ...' errors on GCC 4.5.3

Merge request reports