[jhc] darcs patch: Use cpphs, because gcc-4.8.1's cpp has e... (and 1 more)