diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake
index 5ef217004..5f79514c2 100644
--- a/OpenCVModule.cmake
+++ b/OpenCVModule.cmake
@@ -144,7 +144,8 @@ macro(define_opencv_module name)
 
     file(GLOB lib_srcs "src/*.cpp")
     file(GLOB lib_int_hdrs "src/*.h*")
-    file(GLOB lib_hdrs "include/opencv2/${name}/*.h*" "include/opencv2/${name}/detail/*.h*")
+    file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")
+    file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.h*")
 
     if(COMMAND get_module_external_sources)
        get_module_external_sources(${name})
@@ -152,6 +153,8 @@ macro(define_opencv_module name)
 
     source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
     source_group("Include" FILES ${lib_hdrs})
+    source_group("Include\\detail" FILES ${lib_hdrs_detail})    
+    list(APPEND lib_hdrs ${lib_hdrs_detail})
 
     set(the_target "opencv_${name}")
     if (${name} MATCHES "ts" AND MINGW)
diff --git a/modules/imgproc/src/phasecorr.cpp b/modules/imgproc/src/phasecorr.cpp
index f5f6e1824..8d2b5db67 100644
--- a/modules/imgproc/src/phasecorr.cpp
+++ b/modules/imgproc/src/phasecorr.cpp
@@ -83,8 +83,8 @@ static void magSpectrums( InputArray _src, OutputArray _dst)
 
                 for( j = 1; j <= rows - 2; j += 2 )
                 {
-                    dataDst[j*stepDst] = (double)dataSrc[j*stepSrc]*dataSrc[j*stepSrc] +
-                                         (double)dataSrc[(j+1)*stepSrc]*dataSrc[(j+1)*stepSrc];
+                    dataDst[j*stepDst] = (float)((double)dataSrc[j*stepSrc]*dataSrc[j*stepSrc] +
+                                         (double)dataSrc[(j+1)*stepSrc]*dataSrc[(j+1)*stepSrc]);
                 }
 
                 if( k == 1 )
@@ -103,7 +103,7 @@ static void magSpectrums( InputArray _src, OutputArray _dst)
 
             for( j = j0; j < j1; j += 2 )
             {
-                dataDst[j] = (double)dataSrc[j]*dataSrc[j] + (double)dataSrc[j+1]*dataSrc[j+1];
+                dataDst[j] = (float)((double)dataSrc[j]*dataSrc[j] + (double)dataSrc[j+1]*dataSrc[j+1]);
             }
         }
     }