Consolidate header files; add RPM SPEC file