Reduce load on the header files; take unnecessary includes out; Add missing includes to the cxx files