Add #includes needed to permit the removal of asm/system.h