Restore error codes macros and constants