diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 97884825b..ab4a0d06c 100644
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -16,16 +16,17 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
   ocv_include_directories("${OpenCV_SOURCE_DIR}/include")#for opencv.hpp
   ocv_include_modules(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 
-  if(HAVE_opencv_gpu)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuarithm/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuwarping/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuimgproc/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufeatures2d/include")
+  if(HAVE_opencv_gpuoptflow)
     ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuoptflow/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpubgsegm/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpustereo/include")
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/include")
+  endif()
+  if(HAVE_opencv_gpuimgproc)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuimgproc/include")
+  endif()
+  if(HAVE_opencv_gpuarithm)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpuarithm/include")
+  endif()
+  if(HAVE_opencv_gpufilters)
+    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include")
   endif()
 
   if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
@@ -51,8 +52,8 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     add_executable(${the_target} ${srcs})
     target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 
-    if(HAVE_opencv_gpu)
-      target_link_libraries(${the_target} opencv_gpu)
+    if("${srcs}" MATCHES "gpu/")
+      target_link_libraries(${the_target} opencv_gpuarithm opencv_gpufilters)
     endif()
 
     set_target_properties(${the_target} PROPERTIES
@@ -78,7 +79,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     ocv_list_filterout(cpp_samples Qt_sample)
   endif()
 
-  if(NOT HAVE_opencv_gpu)
+  if(NOT HAVE_opencv_gpuarithm OR NOT HAVE_opencv_gpufilters)
     ocv_list_filterout(cpp_samples "/gpu/")
   endif()
 
diff --git a/samples/gpu/bgfg_segm.cpp b/samples/gpu/bgfg_segm.cpp
index 63552c250..4e8284835 100644
--- a/samples/gpu/bgfg_segm.cpp
+++ b/samples/gpu/bgfg_segm.cpp
@@ -6,6 +6,12 @@
 #include "opencv2/gpu.hpp"
 #include "opencv2/highgui.hpp"
 
+#include "opencv2/opencv_modules.hpp"
+
+#ifdef HAVE_OPENCV_NONFREE
+#  include "opencv2/nonfree/gpu.hpp"
+#endif
+
 using namespace std;
 using namespace cv;
 using namespace cv::gpu;
diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp
index f8dd60d76..3e9b668b6 100644
--- a/samples/gpu/cascadeclassifier_nvidia_api.cpp
+++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp
@@ -8,6 +8,7 @@
 #include <cstdio>
 #include "opencv2/gpu/gpu.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/objdetect/objdetect_c.h"
 
 #ifdef HAVE_CUDA
diff --git a/samples/gpu/hog.cpp b/samples/gpu/hog.cpp
index 4e7ae5fe2..a6a1c0b2a 100644
--- a/samples/gpu/hog.cpp
+++ b/samples/gpu/hog.cpp
@@ -7,6 +7,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/gpu.hpp"
 #include "opencv2/highgui.hpp"
+#include "opencv2/objdetect.hpp"
 
 using namespace std;
 using namespace cv;