diff --git a/Generators/GeneratorFortranCommon/CMakeLists.txt b/Generators/GeneratorFortranCommon/CMakeLists.txt
index 9cfc352cde23774ae18bfc4b1668edd23894c55c..2f1a30a601defdb421085ab9eacb315ab969653d 100644
--- a/Generators/GeneratorFortranCommon/CMakeLists.txt
+++ b/Generators/GeneratorFortranCommon/CMakeLists.txt
@@ -8,12 +8,11 @@ atlas_subdir( GeneratorFortranCommon )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs(
    PUBLIC
-   Control/CLIDSvc
-   Control/SGTools
+   Control/AthenaKernel
    GaudiKernel )
 
 # Component(s) in the package:
 atlas_add_library( GeneratorFortranCommonLib
    src/inituser.F src/useuser.F src/getaddr.cxx
    PUBLIC_HEADERS GeneratorFortranCommon
-   LINK_LIBRARIES SGTools GaudiKernel )
+   LINK_LIBRARIES AthenaKernel GaudiKernel )
diff --git a/Generators/GeneratorFortranCommon/GeneratorFortranCommon/Gen_HEPEVT.h b/Generators/GeneratorFortranCommon/GeneratorFortranCommon/Gen_HEPEVT.h
index d0fca683067d9e4afe2cc2561f32a777b5ce54f7..f764dc70a9275c308113f0c89b6ac90c7fc7555a 100644
--- a/Generators/GeneratorFortranCommon/GeneratorFortranCommon/Gen_HEPEVT.h
+++ b/Generators/GeneratorFortranCommon/GeneratorFortranCommon/Gen_HEPEVT.h
@@ -5,7 +5,7 @@
 #ifndef GENERATORMODULES_GEN_HEPEVT_H
 #define GENERATORMODULES_GEN_HEPEVT_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 // #include "StoreGate/tools/ClassID_traits.h"
 // #include "CLHEP/Vector/LorentzVector.h"
 #include <vector>