Merge "Coverity: remove unnecessary header file includes" into integration