Simplify.
Sort.
Clean up header files and #includes.