use the new-style headers in the samples to improve OpenCV build time.

samples/cpp/3calibration.cpp

@@ -2,7 +2,10 @@
  * 3calibration.cpp -- Calibrate 3 cameras in a horizontal line together.
  */
 
-#include "opencv2/opencv.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/highgui/highgui.hpp"
+
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

samples/cpp/brief_match_test.cpp

@@ -4,7 +4,10 @@
  *  Created on: Oct 17, 2010
  *      Author: ethan
  */
-#include <opencv2/opencv.hpp>
+#include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/features2d/features2d.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui/highgui.hpp>
 #include <vector>
 #include <iostream>
 

samples/cpp/connected_components.cpp

@@ -1,8 +1,10 @@
-#include "cv.h"
-#include "highgui.h"
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui/highgui.hpp>
 #include <iostream>
 
 using namespace cv;
+using namespace std;
+
 Mat img;
 int threshval = 100;
 

samples/cpp/contours2.cpp

@@ -1,9 +1,10 @@
-#include "cv.h"
-#include "highgui.h"
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui/highgui.hpp>
 #include <math.h>
 #include <iostream>
 
 using namespace cv;
+using namespace std;
 
 void help()
 {

samples/cpp/generic_descriptor_match.cpp

@@ -1,6 +1,7 @@
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/features2d/features2d.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 
 #include <cstdio>
 

samples/cpp/morphology2.cpp

@@ -1,7 +1,7 @@
 #define CV_NO_BACKWARD_COMPATIBILITY
 
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui/highgui.hpp>
 #include <stdlib.h>
 #include <stdio.h>
 

samples/cpp/segment_objects.cpp

@@ -1,5 +1,6 @@
-#include "cvaux.h"
-#include "highgui.h"
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/video/background_segm.hpp>
 #include <stdio.h>
 #include <string>
 

samples/cpp/starter_imagelist.cpp

@@ -8,7 +8,8 @@
  * that was generated with imagelist_creator.cpp
  * easy as CV_PI right?
  */
-#include <opencv2/opencv.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <iostream>
 #include <vector>
 
 using namespace cv;

samples/cpp/starter_video.cpp

@@ -7,7 +7,8 @@
  * A starter sample for using opencv, get a video stream and display the images
  * easy as CV_PI right?
  */
-#include <opencv2/opencv.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <iostream>
 #include <vector>
 
 using namespace cv;

samples/cpp/video_homography.cpp

@@ -5,7 +5,10 @@
  *      Author: erublee
  */
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/features2d/features2d.hpp>
 #include <iostream>
 #include <list>
 #include <vector>