Avoid typedef redefinitions (issue #18)