Apply stylistic changes to the #includes

Sponsored-by: EMC / Isilon Storage Division
Merge branch 'more-tools-regression-integration' of https://github.com/yaneurabeya/freebsd into more-tools-regression-integration