Standardize include format and order

Thanks to @Leo-Wang-JL for identifying the need to use the generally-accepted standard formatting for include statements.