With the removal of unused colormac.h macros 2ad8af1a0c319c83e4a8e00db3a9b9cb0ae029eb, several unused includes were eliminated. This patch set removes the remaining places where colormac.h is included but not used.