I don't see enough difference between the header files to justify splitting them in 2. Why not just combine them?