Move some types to global types header