diff --git a/Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h b/Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h
index 21b724321c..758587915d 100644
--- a/Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h
+++ b/Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h
@@ -1,88 +1,89 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef mitkCvMatFromVnlMatrix_h
 #define mitkCvMatFromVnlMatrix_h
 
 #include <mitkEndoMacros.h>
 #include <mitkEndoDebug.h>
-#include <cv.h>
 #include <vnl/vnl_matrix.h>
 #include <mitkAlgorithm.h>
 
+#include "opencv2/core.hpp"
+
 namespace mitk
 {
   ///
   /// casts a random cv::Mat to a vnl Matrix
   /// if the columns of the first row are > 1
   /// then the Matrix is filled with the values from this row
   /// otherwise the first elements of each row are used
   /// to fill the Matrix
   ///
   template <class T>
   class CvMatFromVnlMatrix:
     virtual public Algorithm
   {
   public:
     ///
     /// init default values and save references
     ///
     CvMatFromVnlMatrix(
       const vnl_matrix<T>* _VnlMatrix,
       cv::Mat* _CvMat):
         m_VnlMatrix(_VnlMatrix),
         m_CvMat(_CvMat)
     {
     }
 
     ///
     /// templated function for multiplexed cv::Mat
     ///
     template <class T_CvType, class T_VnlType>
     static void Cast( const vnl_matrix<T_VnlType>& vnlMat, cv::Mat& cvMat )
     {
       endodebugvar( vnlMat )
       cvMat = cv::Mat(vnlMat.rows(), vnlMat.cols(), cv::DataType<T_CvType>::type);
       for(unsigned int i=0; i<vnlMat.rows(); ++i)
       {
         for(unsigned int j=0; j<vnlMat.cols(); ++j)
         {
           cvMat.at<T_CvType>(i,j) = static_cast<T_CvType>( vnlMat(i,j) );
 //          endodebugvar( vnlMat(i,j) )
 //          endodebugvar( cvMat.at<T_CvType>(i,j) )
         }
       }
     }
 
     ///
     /// executes the Algorithm
     ///
     void Update() override
     {
       Cast<T, T>( *m_VnlMatrix, *m_CvMat );
     }
   private:
     ///
     /// CvMatFromVnlMatrix input member variable
     ///
     const vnl_matrix<T>* m_VnlMatrix;
     ///
     /// CvMatFromVnlMatrix output member variable
     ///
     cv::Mat* m_CvMat;
   };
 } // namespace mitk
 
 #endif // mitkCvMatFromVnlMatrix_h
diff --git a/Modules/CameraCalibration/mitkStringFromCvMat.h b/Modules/CameraCalibration/mitkStringFromCvMat.h
index d522d0390e..f0e0f13296 100644
--- a/Modules/CameraCalibration/mitkStringFromCvMat.h
+++ b/Modules/CameraCalibration/mitkStringFromCvMat.h
@@ -1,92 +1,93 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 #ifndef mitkStringFromCvMat_h
 #define mitkStringFromCvMat_h
 
-#include <cv.h>
 #include <string>
 #include <mitkObservable.h>
 #include <mitkAlgorithm.h>
 #include <mitkEndoMacros.h>
 #include <sstream>
 
+#include "opencv2/core.hpp"
+
 namespace mitk
 {
   ///
   /// create a vnl_matrix from a cv mat
   ///
   class StringFromCvMat:
     virtual public Algorithm
   {
   public:
     ///
     /// init default values and save references
     ///
     StringFromCvMat(
       const cv::Mat* _CvMat,
       std::string* _String):
         m_CvMat(_CvMat),
         m_String(_String)
     {
     }
 
 
     ///
     /// cv mat to vnl matrix with known cv type
     ///
     template <typename TCvMat, char T_Delim>
     void ToString( std::string& string, const cv::Mat& mat )
     {
       std::ostringstream s;
 
 
       for(int i=0; i<mat.rows; ++i)
       {
         for(int j=0; j<mat.cols; ++j)
         {
           s << mat.at<TCvMat>(i,j) << " ";
         }
         s << T_Delim;
       }
       string = s.str();
     }
 
     void SetMatrix(
       const cv::Mat* _CvMat )
     {
       m_CvMat = _CvMat;
     }
 
     ///
     /// executes the Algorithm
     ///
     void Update() override
     {
       endoAccessCvMat( ToString, '\n', (*m_String), (*m_CvMat) );
     }
   private:
     ///
     /// StringFromCvMat input member variable
     ///
     const cv::Mat* m_CvMat;
     ///
     /// StringFromCvMat output member variable
     ///
     std::string* m_String;
   };
 } // namespace mitk
 
 #endif // mitkStringFromCvMat_h