small include refactoring.
Map: new generation algorithm.
cleaning CMakeLists.txt