Merge pull request #1843 from uh-sem-blee/development fixing headers with bad values for objective-c