[PATCH v3 16/26] remote: Remove unused includes