Add fix_include_order, small fixes.