header-file-fixes
