Clean up unneeded header declarations