diff --git a/guilib/src/DatabaseViewer.cpp b/guilib/src/DatabaseViewer.cpp
index efa62995..4b0c57d8 100644
--- a/guilib/src/DatabaseViewer.cpp
+++ b/guilib/src/DatabaseViewer.cpp
@@ -7321,8 +7321,8 @@ bool DatabaseViewer::addConstraint(int from, int to, bool silent)
 										"the database has images, it is recommended to use %2=2 instead so that "
 										"the guess can be found visually.")
 										.arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()),
-										QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No,
-										QMessageBox::StandardButton::Yes) == QMessageBox::StandardButton::Yes)
+										QMessageBox::Yes | QMessageBox::No,
+										QMessageBox::Yes) == QMessageBox::Yes)
 							{
 								guess = fromIter->second.inverse() * toIter->second;
 							}
@@ -7345,8 +7345,8 @@ bool DatabaseViewer::addConstraint(int from, int to, bool silent)
 							"\n\nOtherwise, if the database has images, it is recommended to use %2=2 "
 							"instead so that the guess can be found visually.")
 							.arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()),
-							QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::Abort,
-							QMessageBox::StandardButton::Abort) == QMessageBox::StandardButton::Yes)
+							QMessageBox::Yes | QMessageBox::Abort,
+							QMessageBox::Abort) == QMessageBox::Yes)
 				{
 					guess.setIdentity();
 				}
diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp
index 8fb21f11..2537072f 100644
--- a/guilib/src/utilite/UPlot.cpp
+++ b/guilib/src/utilite/UPlot.cpp
@@ -48,6 +48,7 @@
 #include <QtSvg/QSvgGenerator>
 #endif
 #include <cmath>
+#include <limits>
 
 #define PRINT_DEBUG 0
 
diff --git a/tools/Matcher/main.cpp b/tools/Matcher/main.cpp
index 6023e53e..c131f5dc 100644
--- a/tools/Matcher/main.cpp
+++ b/tools/Matcher/main.cpp
@@ -47,8 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <QHBoxLayout>
 #include <QMultiMap>
 #include <QString>
-#include <opencv2/core.hpp>
-#include <opencv2/imgcodecs.hpp>
+#include <opencv2/core/core.hpp>
 
 using namespace rtabmap;