Fix order of including header options