Clean up top-level header files