Move more overlay struct definitions to overlay header