Merge "Remove unnecessary header file includes for drmserver"