[PATCH v3 03/26] ch: Remove unused includes