Removed repeated includes in Map.cpp and Cell.cpp