Merge all header files into one
move trap to avr11 support code