More header and forward declaration cleanup.