More missing includes fixed