Fixing Conflicting Declarations in Headers