Re-generate single-file include with latest client changes.

Includes a re-ordering of the error classes, to deal with #52