Add proper include files to quiesce warnings around error_report