gpp -> gcc
Resolve type mismatches.
Fix more 'undeclared identifier' errors.
Revert changes to koch.
Merge pull request #1196 from EXetoC/cpp-target-fixes

C++ target fixes