diff --git a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
index 55f2fc9fa1069c0efcd25442e725541ef898ae81..47932075cde8c873fabfba7a6b20ecfc3100b642 100644
--- a/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
+++ b/modules/ocl/include/opencv2/ocl/matrix_operations.hpp
@@ -41,8 +41,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
-#define __OPENCV_GPU_MATRIX_OPERATIONS_HPP__
+#ifndef __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
+#define __OPENCV_OCL_MATRIX_OPERATIONS_HPP__
 
 namespace cv
 {
@@ -514,4 +514,4 @@ namespace cv
 
 } /* end of namespace cv */
 
-#endif /* __OPENCV_GPU_MATRIX_OPERATIONS_HPP__ */
+#endif /* __OPENCV_OCL_MATRIX_OPERATIONS_HPP__ */
diff --git a/modules/ocl/include/opencv2/ocl/ocl.hpp b/modules/ocl/include/opencv2/ocl/ocl.hpp
index 5b3642d034fdb2fb8fd3eac091bb77b57295c865..d12e1ac4ba5d9a0a5d85e7193327cb6d40e34079 100644
--- a/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp
@@ -1709,4 +1709,4 @@ namespace cv
 #  pragma warning( pop)
 #endif
 
-#endif /* __OPENCV_GPU_HPP__ */
+#endif /* __OPENCV_OCL_HPP__ */
diff --git a/modules/ocl/src/precomp.hpp b/modules/ocl/src/precomp.hpp
index 8050b909b71692f663b60ced65bbf6458c139180..a50ab900ab79862067db101946be43b2342ec5c5 100644
--- a/modules/ocl/src/precomp.hpp
+++ b/modules/ocl/src/precomp.hpp
@@ -70,7 +70,6 @@
 #include "opencv2/ocl/ocl.hpp"
 
 #include "opencv2/core/internal.hpp"
-//#include "opencv2/highgui/highgui.hpp"
 
 #define __ATI__