Invert header order to avoid warnings