diff --git a/apps/interactive-calibration/CMakeLists.txt b/apps/interactive-calibration/CMakeLists.txt
index b28300b3f8..657a2ed64e 100644
--- a/apps/interactive-calibration/CMakeLists.txt
+++ b/apps/interactive-calibration/CMakeLists.txt
@@ -1,3 +1,3 @@
-set(DEPS opencv_core opencv_imgproc opencv_features opencv_highgui opencv_3d opencv_calib opencv_videoio opencv_objdetect)
+set(DEPS opencv_core opencv_imgproc opencv_features opencv_highgui opencv_geometry opencv_calib opencv_videoio opencv_objdetect)
 file(GLOB SRCS *.cpp)
 ocv_add_application(opencv_interactive-calibration MODULES ${DEPS} SRCS ${SRCS})
diff --git a/apps/interactive-calibration/calibController.cpp b/apps/interactive-calibration/calibController.cpp
index a80232327e..1981e18d09 100644
--- a/apps/interactive-calibration/calibController.cpp
+++ b/apps/interactive-calibration/calibController.cpp
@@ -8,7 +8,7 @@
 #include <cmath>
 #include <ctime>
 
-#include <opencv2/3d.hpp>
+#include <opencv2/geometry.hpp>
 #include <opencv2/calib.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgcodecs.hpp>
diff --git a/apps/interactive-calibration/frameProcessor.cpp b/apps/interactive-calibration/frameProcessor.cpp
index 5ef950757c..b45aaf8ef3 100644
--- a/apps/interactive-calibration/frameProcessor.cpp
+++ b/apps/interactive-calibration/frameProcessor.cpp
@@ -5,7 +5,7 @@
 #include "frameProcessor.hpp"
 #include "rotationConverters.hpp"
 
-#include <opencv2/3d.hpp>
+#include <opencv2/geometry.hpp>
 #include <opencv2/calib.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/highgui.hpp>
diff --git a/apps/interactive-calibration/main.cpp b/apps/interactive-calibration/main.cpp
index 1d67514601..5845bbb48c 100644
--- a/apps/interactive-calibration/main.cpp
+++ b/apps/interactive-calibration/main.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include <opencv2/core.hpp>
-#include <opencv2/3d.hpp>
+#include <opencv2/geometry.hpp>
 #include <opencv2/calib.hpp>
 #include <opencv2/cvconfig.h>
 #include <opencv2/highgui.hpp>
diff --git a/apps/interactive-calibration/rotationConverters.cpp b/apps/interactive-calibration/rotationConverters.cpp
index c9dfdf3989..5f5de2c82b 100644
--- a/apps/interactive-calibration/rotationConverters.cpp
+++ b/apps/interactive-calibration/rotationConverters.cpp
@@ -6,7 +6,7 @@
 
 #include <cmath>
 
-#include <opencv2/3d.hpp>
+#include <opencv2/geometry.hpp>
 #include <opencv2/calib.hpp>
 #include <opencv2/core.hpp>
 
diff --git a/platforms/js/build_js.py b/platforms/js/build_js.py
index baa6f084bf..e4336c2898 100755
--- a/platforms/js/build_js.py
+++ b/platforms/js/build_js.py
@@ -120,7 +120,7 @@ class Builder:
                "-DWITH_ITT=OFF",
                "-DBUILD_ZLIB=ON",
                "-DBUILD_opencv_apps=OFF",
-               "-DBUILD_opencv_3d=ON",
+               "-DBUILD_opencv_geometry=ON",
                "-DBUILD_opencv_dnn=ON",
                "-DBUILD_opencv_features=ON",
                "-DBUILD_opencv_flann=ON",  # No bindings provided. This module is used as a dependency for other modules.