issue #2790: Fix wrong include.
issue #2790: Bug fix in CCMap.h