Finalize core headers reorganization

modules/calib3d/src/circlesgrid.hpp

@@ -47,6 +47,7 @@
 #include <set>
 #include <list>
 #include <numeric>
+#include <map>
 
 #include "precomp.hpp"
 

modules/calib3d/test/test_stereomatching.cpp

@@ -48,6 +48,7 @@
 #include "test_precomp.hpp"
 #include <limits>
 #include <cstdio>
+#include <map>
 
 using namespace std;
 using namespace cv;