Cleaning some includes and ISR code.