more includes/declarations

once again to help the Jenkins build.