Remove convenience header files