diff --git a/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt b/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
index 1d0f1309c14308c5db37522189351a40a32ade6d..fa0f10628622dfe4e1d4e249003fb5826b8bf9f6 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
+++ b/InnerDetector/InDetG4/BCM_G4_SD/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( BCM_G4_SD )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
-                          Control/CLIDSvc
+                          Control/AthenaKernel
                           Control/CxxUtils
-                          Control/SGTools
                           Control/StoreGate
                           GaudiKernel
                           InnerDetector/InDetSimEvent
@@ -27,7 +26,7 @@ atlas_add_component( BCM_G4_SD
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils SGTools StoreGateLib SGtests GaudiKernel InDetSimEvent G4AtlasToolsLib MCTruth )
+                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils AthenaKernel StoreGateLib SGtests GaudiKernel InDetSimEvent G4AtlasToolsLib MCTruth )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/BCMExtra.h b/InnerDetector/InDetG4/BCM_G4_SD/src/BCMExtra.h
index bdb230f7d39a87b1d8b91c1a43b4ea79b5799282..668f4ae0627cc1d2618a5df4ddfd2d3d137b3fd5 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/BCMExtra.h
+++ b/InnerDetector/InDetG4/BCM_G4_SD/src/BCMExtra.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef BCMEXTRA_H
@@ -21,7 +21,7 @@ private:
   double m_vertexZ;
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(BCMExtra, 207661756, 1)
 
 #endif