diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index cd98f3370..e0b8f4cb4 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -312,8 +312,7 @@ macro(ocv_glob_modules)
     list(APPEND __directories_observed "${__path}")
 
     # TODO: Undo this change to build all modules
-    #file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/*")
-    file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/core" "${__path}/imgproc" "${__path}/ml" "${__path}/highgui" "${__path}/matlab")
+    file(GLOB __ocvmodules RELATIVE "${__path}" "${__path}/*")
     if(__ocvmodules)
       list(SORT __ocvmodules)
       foreach(mod ${__ocvmodules})
diff --git a/modules/matlab/CMakeLists.txt b/modules/matlab/CMakeLists.txt
index 3bcc80f9d..0b422a0af 100644
--- a/modules/matlab/CMakeLists.txt
+++ b/modules/matlab/CMakeLists.txt
@@ -43,9 +43,12 @@ endif()
 set(the_description "The Matlab/Octave bindings")
 ocv_add_module(matlab   BINDINGS #TODO: does it actually NEED to depend on core?
                         OPTIONAL opencv_core
-                                 opencv_objdetect opencv_features2d opencv_video
-                                 opencv_highgui opencv_ml opencv_calib3d opencv_photo
-                                 opencv_nonfree opencv_calib opencv_imgproc)
+                                 opencv_imgproc opencv_ml opencv_highgui
+                                 #opencv_objdetect opencv_features2d
+                                 opencv_video opencv_photo
+                                 #opencv_calib opencv_calib3d
+                                 #opencv_nonfree
+)
 
 # TODO: Undo this when building all modules to find python properly
 #set(HDR_PARSER_PATH ${OPENCV_MODULE_opencv_python_LOCATION}/src2)
diff --git a/modules/matlab/include/bridge.hpp b/modules/matlab/include/bridge.hpp
index 597092ba7..6d25da76c 100644
--- a/modules/matlab/include/bridge.hpp
+++ b/modules/matlab/include/bridge.hpp
@@ -149,6 +149,11 @@ public:
   double toDouble() { return 0; }
   operator double() { return toDouble(); }
 
+  // --------------------------- float  --------------------------------------
+  Bridge& operator=(const float& obj) { return *this; }
+  float toFloat() { return 0; }
+  operator float() { return toFloat(); }
+
   // --------------------------   Point  --------------------------------------
   Bridge& operator=(const cv::Point& obj) { return *this; }
   cv::Point toPoint() { return cv::Point(); }