Add include migration and de-squelching of includes