Fix build errors after forward declaration change.