* Header file cleanup for ARM