Order headers in cpp files
Fix more stuffs