diff --git a/modules/ocl/src/initialization.cpp b/modules/ocl/src/initialization.cpp
index fab81fd46d..096b9790de 100644
--- a/modules/ocl/src/initialization.cpp
+++ b/modules/ocl/src/initialization.cpp
@@ -44,9 +44,9 @@
 //M*/
 
 #include "precomp.hpp"
-#include "Threadsafe.h"
+#include "threadsafe.h"
 #include <iomanip>
-#include "binaryCaching.hpp"
+#include "binarycaching.hpp"
 
 using namespace cv;
 using namespace cv::ocl;
@@ -775,7 +775,7 @@ namespace cv
         {
             if(val == 0)
             {
-                AutoLock al(&cs);
+                myAutoLock al(&cs);
                 if( NULL == clCxt.get())
                     clCxt.reset(new Context);
 
diff --git a/modules/ocl/src/threadsafe.cpp b/modules/ocl/src/threadsafe.cpp
index 9d952d328c..25b3773e04 100644
--- a/modules/ocl/src/threadsafe.cpp
+++ b/modules/ocl/src/threadsafe.cpp
@@ -43,8 +43,8 @@
 //
 //M*/
 
-#include "precomp.hpp"
-#include "Threadsafe.h"
+//#include "precomp.hpp"
+#include "threadsafe.h"
 
 CriticalSection::CriticalSection()
 {
diff --git a/modules/ocl/src/threadsafe.h b/modules/ocl/src/threadsafe.h
index b7954fdcdd..5905a55172 100644
--- a/modules/ocl/src/threadsafe.h
+++ b/modules/ocl/src/threadsafe.h
@@ -65,15 +65,15 @@ protected:
 #endif
 };
 
-class AutoLock
+class myAutoLock
 {
 public:
-    explicit AutoLock(CriticalSection *lock)
+    explicit myAutoLock(CriticalSection *lock)
     {
         m_lock = lock;
         m_lock->Lock();
     };
-    ~AutoLock()
+    ~myAutoLock()
     {
         m_lock->Unlock();
     };