revert to earlier header file names