fixes

Author: AleksandrPanov

modules/aruco/include/opencv2/aruco.hpp

@@ -1,8 +1,8 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
-#ifndef __OPENCV_ARUCO_HPP__
-#define __OPENCV_ARUCO_HPP__
+#ifndef OPENCV_ARUCO_HPP
+#define OPENCV_ARUCO_HPP
 
 #include "opencv2/objdetect/aruco_detector.hpp"
 #include "opencv2/aruco/aruco_calib.hpp"

modules/aruco/include/opencv2/aruco/aruco_calib.hpp

@@ -1,8 +1,8 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
-#ifndef __OPENCV_ARUCO_CALIB_POSE_HPP__
-#define __OPENCV_ARUCO_CALIB_POSE_HPP__
+#ifndef OPENCV_ARUCO_CALIB_POSE_HPP
+#define OPENCV_ARUCO_CALIB_POSE_HPP
 #include <opencv2/objdetect/aruco_board.hpp>
 
 namespace cv {

modules/aruco/include/opencv2/aruco/charuco.hpp

@@ -1,8 +1,8 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
-#ifndef __OPENCV_CHARUCO_HPP__
-#define __OPENCV_CHARUCO_HPP__
+#ifndef OPENCV_CHARUCO_HPP
+#define OPENCV_CHARUCO_HPP
 
 #include <opencv2/core.hpp>
 #include <vector>

modules/aruco/src/aruco.cpp

@@ -2,7 +2,9 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
 
+#include "precomp.hpp"
 #include "opencv2/aruco.hpp"
+#include <opencv2/calib3d.hpp>
 
 namespace cv {
 namespace aruco {

modules/aruco/src/aruco_calib.cpp

@@ -3,6 +3,7 @@
 // of this distribution and at http://opencv.org/license.html
 
 #include <opencv2/aruco/aruco_calib.hpp>
+#include <opencv2/calib3d.hpp>
 
 namespace cv {
 namespace aruco {

modules/aruco/src/charuco.cpp

@@ -3,8 +3,8 @@
 // of this distribution and at http://opencv.org/license.html
 
 #include "precomp.hpp"
+#include <opencv2/calib3d.hpp>
 #include "opencv2/aruco/charuco.hpp"
-#include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 
 namespace cv {