diff --git a/LHCbG4PhysLists/CMakeLists.txt b/LHCbG4PhysLists/CMakeLists.txt
index d229a1b7b0f07370b400612ead8357d1e7c59386..bf11a79a8e4a3519fb625413ed118960a80ecbfc 100644
--- a/LHCbG4PhysLists/CMakeLists.txt
+++ b/LHCbG4PhysLists/CMakeLists.txt
@@ -4,7 +4,7 @@ gaudi_depends_on_subdirs(Geant4/G4config)
 
 find_package(CLHEP REQUIRED COMPONENTS Vector)
 
-include_directories(${CMAKE_INSTALL_PREFIX}/include)
+include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
 set(Geant4_LIBRARIES
@@ -22,6 +22,3 @@ gaudi_add_library(G4LHCblists
                   LINK_LIBRARIES ${Geant4_LIBRARIES} CLHEP)
 
 add_dependencies(G4LHCblists Geant4)
-
-# Dirty fix to disable the pesky warning
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")
diff --git a/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_LHCbTest.h b/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_LHCbTest.h
index 1bedfd7351fbd513b209c3015afeac90144fa968..da42817564d9a41d6b8693b53f15255f7f930222 100644
--- a/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_LHCbTest.h
+++ b/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_LHCbTest.h
@@ -59,8 +59,8 @@ public:
 
   virtual ~G4EmStandardPhysics_LHCbTest();
 
-  virtual void ConstructParticle();
-  virtual void ConstructProcess();
+  void ConstructParticle() override;
+  void ConstructProcess() override;
 
 private:
   G4int  verbose;
diff --git a/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_option1NoApplyCuts.h b/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_option1NoApplyCuts.h
index 2eef1f7e31903f1fbfe4405db03aaeec7a2f766a..d46b7585c6069dadb8eb6e934b0e407432bb053f 100644
--- a/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_option1NoApplyCuts.h
+++ b/LHCbG4PhysLists/LHCbG4PhysLists/G4EmStandardPhysics_option1NoApplyCuts.h
@@ -62,8 +62,8 @@ public:
 
   virtual ~G4EmStandardPhysics_option1NoApplyCuts();
 
-  virtual void ConstructParticle();
-  virtual void ConstructProcess();
+  void ConstructParticle() override;
+  void ConstructProcess() override;
 
 private:
   G4int  verbose;