Reorganize cppsupport a bit and remove its header file.