diff --git a/Database/CondDBObjects/CMakeLists.txt b/Database/CondDBObjects/CMakeLists.txt
index 3a72213d54d0d9b3feee06541c1d2e2ef9356f27..ca3b434aa4aa15de4f7ca0c753b1f4cfaa17c77c 100644
--- a/Database/CondDBObjects/CMakeLists.txt
+++ b/Database/CondDBObjects/CMakeLists.txt
@@ -7,13 +7,12 @@ atlas_subdir( CondDBObjects )
 
 # 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( CondDBObjects
                    src/*.cxx
                    PUBLIC_HEADERS CondDBObjects
-                   LINK_LIBRARIES SGTools GaudiKernel )
+                   LINK_LIBRARIES GaudiKernel )
 
diff --git a/Database/CondDBObjects/CondDBObjects/GenericDbTableClassDef.h b/Database/CondDBObjects/CondDBObjects/GenericDbTableClassDef.h
index 1ed8138cc93b9921a8a1d59813d60515c0c731d3..5d2de6ae22a7838af4ca0b4a5efbae7be03bdad4 100755
--- a/Database/CondDBObjects/CondDBObjects/GenericDbTableClassDef.h
+++ b/Database/CondDBObjects/CondDBObjects/GenericDbTableClassDef.h
@@ -5,7 +5,7 @@
 #ifndef CONDDBOBJECTS_GENERICDBTABLE_CLASSDEF_H
 #define CONDDBOBJECTS_GENERICDBTABLE_CLASSDEF_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CondDBObjects/GenericDbTable.h"
 CLASS_DEF(GenericDbTable, 94049889, 1)