Various #include file cosmetic fixes.