Move some headers around