[PATCH v2 18/30] remote: Remove unused includes