[PATCH 03/29] ch: Remove unused includes