Add BOM removal, really pesky in the includes.