diff --git a/Framework/Geometry/src/Rendering/ShapeInfo.cpp b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
index db425f775ef576d6ca3e2bdfeb56dcdc2d1780a7..3c80a043d0ecb7e1e61d70081ab9d87530f7e401 100644
--- a/Framework/Geometry/src/Rendering/ShapeInfo.cpp
+++ b/Framework/Geometry/src/Rendering/ShapeInfo.cpp
@@ -1,6 +1,7 @@
 #include "MantidGeometry/Rendering/ShapeInfo.h"
 #include "MantidKernel/Tolerance.h"
 #include "MantidKernel/V3D.h"
+#include <cmath>
 
 namespace Mantid {
 using Kernel::V3D;
@@ -67,11 +68,11 @@ void ShapeInfo::setCone(const V3D &c, const V3D &a, double r, double h) {
 
 bool ShapeInfo::operator==(const ShapeInfo &other) {
   return m_shape == other.m_shape &&
-         abs(m_height - other.m_height) < Kernel::Tolerance &&
-         abs(m_radius - other.m_radius) < Kernel::Tolerance &&
+         std::abs(m_height - other.m_height) < Kernel::Tolerance &&
+         std::abs(m_radius - other.m_radius) < Kernel::Tolerance &&
          m_points == other.m_points;
 }
 
 } // namespace detail
 } // namespace Geometry
-} // namespace Mantid
\ No newline at end of file
+} // namespace Mantid
diff --git a/Framework/Geometry/test/MeshObject2DTest.h b/Framework/Geometry/test/MeshObject2DTest.h
index 96f2b75f9a062d5e4dfa203efd1322635f2e5240..732b51e7c5843b77525a8bfb108c7abca4970b05 100644
--- a/Framework/Geometry/test/MeshObject2DTest.h
+++ b/Framework/Geometry/test/MeshObject2DTest.h
@@ -41,7 +41,7 @@ MeshObject2D makeTrapezoidMesh(const V3D &a, const V3D &b, const V3D &c,
 // -----------------------------------------------------------------------------
 class MockRNG : public Mantid::Kernel::PseudoRandomNumberGenerator {
 public:
-  GCC_DIAG_OFF_SUGGEST_OVERRIDE
+  GNU_DIAG_OFF_SUGGEST_OVERRIDE
   MOCK_METHOD0(nextValue, double());
   MOCK_METHOD2(nextValue, double(double, double));
   MOCK_METHOD2(nextInt, int(int, int));
@@ -52,7 +52,7 @@ public:
   MOCK_METHOD2(setRange, void(const double, const double));
   MOCK_CONST_METHOD0(min, double());
   MOCK_CONST_METHOD0(max, double());
-  GCC_DIAG_ON_SUGGEST_OVERRIDE
+  GNU_DIAG_ON_SUGGEST_OVERRIDE
 };
 } // namespace
 
diff --git a/Framework/NexusGeometry/test/NexusGeometryParserTest.h b/Framework/NexusGeometry/test/NexusGeometryParserTest.h
index 48ffc3bc57659c6fab6b6796e2dae4183203ab2f..2ebeb707e995ed3af515d5d04eb011d0f3df3bf0 100644
--- a/Framework/NexusGeometry/test/NexusGeometryParserTest.h
+++ b/Framework/NexusGeometry/test/NexusGeometryParserTest.h
@@ -18,6 +18,7 @@
 #include <H5Cpp.h>
 #include <chrono>
 #include <string>
+#include <Poco/Glob.h>
 
 using namespace Mantid;
 using namespace NexusGeometry;