[PATCH v2 03/30] ch: Remove unused includes