Move some include headers to better location.