diff --git a/core/base/test/TBitsTests.cxx b/core/base/test/TBitsTests.cxx
index 00de4a18a000e..2ccbbe26b909f 100644
--- a/core/base/test/TBitsTests.cxx
+++ b/core/base/test/TBitsTests.cxx
@@ -1,5 +1,4 @@
 #include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
 #include "TBits.h"
 
diff --git a/core/base/test/TNamedTests.cxx b/core/base/test/TNamedTests.cxx
index 3bc800beed3e2..bd47038db1652 100644
--- a/core/base/test/TNamedTests.cxx
+++ b/core/base/test/TNamedTests.cxx
@@ -1,5 +1,4 @@
 #include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
 #include "TNamed.h"
 
diff --git a/core/base/test/TQObjectTests.cxx b/core/base/test/TQObjectTests.cxx
index 54cd7f7efa335..2f1e8d8b749c3 100644
--- a/core/base/test/TQObjectTests.cxx
+++ b/core/base/test/TQObjectTests.cxx
@@ -1,5 +1,4 @@
 #include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
 #include "Rtypes.h"
 #include "TQObject.h"
diff --git a/core/meta/test/testTEnum.cxx b/core/meta/test/testTEnum.cxx
index acae01edb36e0..60445b21f1823 100644
--- a/core/meta/test/testTEnum.cxx
+++ b/core/meta/test/testTEnum.cxx
@@ -2,8 +2,8 @@
 #include "TInterpreter.h"
 
 #include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
+#include <climits>
 #include <type_traits>
 
 TEST(TEnum, UnderlyingType)
diff --git a/core/thread/test/testRWLock.cxx b/core/thread/test/testRWLock.cxx
index 48c76a39641d6..7e2eb80814846 100644
--- a/core/thread/test/testRWLock.cxx
+++ b/core/thread/test/testRWLock.cxx
@@ -12,7 +12,6 @@
 #include "TError.h"
 
 #include "gtest/gtest.h"
-#include "gmock/gmock.h"
 
 using namespace ROOT;
 
diff --git a/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPass.cxx b/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPass.cxx
index d29f12595eff7..cdebcf6919011 100644
--- a/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPass.cxx
+++ b/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPass.cxx
@@ -17,7 +17,6 @@
 #include "TMVA/DNN/Architectures/Reference.h"
 #include "TestRecurrentForwardPass.h"
 //#include "gtest/gtest.h"
-//#include "gmock/gmock.h"
 
 using namespace TMVA::DNN;
 using namespace TMVA::DNN::RNN;
diff --git a/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPassCpu.cxx b/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPassCpu.cxx
index 7cee82bcaa22d..aa9d5ce9a2533 100644
--- a/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPassCpu.cxx
+++ b/tmva/tmva/test/DNN/RNN/TestRecurrentForwardPassCpu.cxx
@@ -18,7 +18,6 @@
 #include "TestRecurrentForwardPass.h"
 #include "TMath.h"
 //#include "gtest/gtest.h"
-//#include "gmock/gmock.h"
 
 using namespace TMVA::DNN;
 using namespace TMVA::DNN::RNN;