added includes for sonar analysis