Fix for GH #518 - Missing Error.h and int.