Redo inclusion of header files through-out source tree