eliminate install of duplicate headers (take 2)
Patch by Ryuta Suzuki
Fix missing C++ mode comment