Add source factories to process includes and macros
Hook in error handler, and make error handler in scissor work right