Simplify the coding standards for #include ordering. The ordering is now