diff --git a/bindings/pyroot/cppyy/cppyy/test/stltypes.h b/bindings/pyroot/cppyy/cppyy/test/stltypes.h
index def1dad181089..31fbaf7a2a77e 100644
--- a/bindings/pyroot/cppyy/cppyy/test/stltypes.h
+++ b/bindings/pyroot/cppyy/cppyy/test/stltypes.h
@@ -78,7 +78,7 @@ class stl_like_class2 {
     value_type fData[sz];
 
 public:
-    static const size_t size() { return sz; }
+    static size_t size() { return sz; }
     value_type& operator[](ptrdiff_t i) { return fData[i]; }
 };
 
diff --git a/math/mathcore/inc/Fit/FitData.h b/math/mathcore/inc/Fit/FitData.h
index ad63437a152af..7f4eeaa9ffd22 100644
--- a/math/mathcore/inc/Fit/FitData.h
+++ b/math/mathcore/inc/Fit/FitData.h
@@ -26,10 +26,9 @@ Classes for describing the input data for fitting
 #include "Fit/DataRange.h"
 #include "Math/Types.h"
 
+#include <algorithm>
 #include <vector>
 #include <cassert>
-#include <iostream>
-
 
 namespace ROOT {
 
diff --git a/math/mathmore/inc/Math/GSLSimAnnealing.h b/math/mathmore/inc/Math/GSLSimAnnealing.h
index 22a0ff9686f27..9e91bbedf9534 100644
--- a/math/mathmore/inc/Math/GSLSimAnnealing.h
+++ b/math/mathmore/inc/Math/GSLSimAnnealing.h
@@ -29,6 +29,7 @@
 
 #include "Math/IFunctionfwd.h"
 
+#include <algorithm>
 #include <vector>
 
 namespace ROOT {