fix regressions from r7336, remove unneeded header dependency