Move some headers to be implementation only.