`<config.h>` should always be included first (it may `#define` things which affect other headers).

Also, for consistency, `<ostream>` should really be lower down, just above `<stdexcept>`.

Don't worry about updating the patch for this - I'll fix this as a merge it.