Further modify headers for Atmega8