add missing header and sort them
add missing define