Merge pull request #12957 from Dentomologist/adjust_include_order_and_spacing Adjust order and spacing of various #includes