Issue #467 (C++ headers misidentified as Objective C)

I've taken samples from everyone complaining in #467 -- so at least they should be OK now.

The samples database was out of date on master so I updated it before and after the "real change" in commit 226e629.