Move some headers