diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp
index f194878e18..cb58f193ea 100644
--- a/modules/core/src/gpumat.cpp
+++ b/modules/core/src/gpumat.cpp
@@ -706,7 +706,7 @@ cv::Mat::Mat(const GpuMat& m) : flags(0), dims(0), rows(0), cols(0), data(0), re
 
 namespace
 {
-    class CV_EXPORTS GpuFuncTable
+    class GpuFuncTable
     {
     public:
         virtual ~GpuFuncTable() {}
diff --git a/modules/flann/src/miniflann.cpp b/modules/flann/src/miniflann.cpp
index 55bb8b6e64..e1dbe5b314 100644
--- a/modules/flann/src/miniflann.cpp
+++ b/modules/flann/src/miniflann.cpp
@@ -7,6 +7,11 @@ static cvflann::IndexParams& get_params(const cv::flann::IndexParams& p)
     return *(cvflann::IndexParams*)(p.params);
 }
 
+cv::flann::IndexParams::~IndexParams()
+{
+    delete &get_params(*this);
+}
+
 namespace cv
 {
     
@@ -19,11 +24,6 @@ IndexParams::IndexParams()
 {
     params = new ::cvflann::IndexParams();
 }
-    
-IndexParams::~IndexParams()
-{
-    delete &get_params(*this);
-}
 
 template<typename T>
 T getParam(const IndexParams& _p, const std::string& key, const T& defaultVal=T())