Minor cleanup in includes.