diff --git a/core/qa/CMakeLists.txt b/core/qa/CMakeLists.txt
index 7bfffef6770249b0c3df4dc1313c8a35de372d09..80589aa5a5b4d8f53d9b6f9b0fb8c649922fd885 100644
--- a/core/qa/CMakeLists.txt
+++ b/core/qa/CMakeLists.txt
@@ -26,6 +26,6 @@ CbmQaHist.cxx
 
 set(LINKDEF CbmQaBaseLinkDef.h)
 Set(LIBRARY_NAME CbmQaBase)
-Set(DEPENDENCIES)
+Set(DEPENDENCIES Hist Gpad)
 
 GENERATE_LIBRARY()
diff --git a/reco/base/CMakeLists.txt b/reco/base/CMakeLists.txt
index 43b1f114849deea53a6d7385a68d474dc60cc72e..1193800963e6e1c8b08b4af33c5cf5a3b827310f 100644
--- a/reco/base/CMakeLists.txt
+++ b/reco/base/CMakeLists.txt
@@ -67,7 +67,7 @@ ${Boost_LIBRARY_DIRS}
 Set(DEPENDENCIES
 fles_ipc
 Base
-#CbmBase
+CbmBase
 #CbmData
 )
 # ---------------------------------------------------------
diff --git a/reco/calibration/CMakeLists.txt b/reco/calibration/CMakeLists.txt
index f06b141c8014c6af6dbf0636ca2b376c96f11b00..0224ba9a41f67e7a3361db7c69bd4ce90482352e 100644
--- a/reco/calibration/CMakeLists.txt
+++ b/reco/calibration/CMakeLists.txt
@@ -51,7 +51,7 @@ ${Boost_LIBRARY_DIRS}
 
 # -----   Library dependences   ---------------------------
 Set(DEPENDENCIES
-#CbmBase
+CbmBase
 CbmData
 CbmRecoBase
 )
diff --git a/reco/calibration/CbmRecoCalLinkDef.h b/reco/calibration/CbmRecoCalLinkDef.h
index 41ba59cf27bf40f9534e0333a92d2ec0b82b2d66..50a1b994beb35c56ef4cb585f91d8f933d8810af 100644
--- a/reco/calibration/CbmRecoCalLinkDef.h
+++ b/reco/calibration/CbmRecoCalLinkDef.h
@@ -10,6 +10,8 @@
 // --- calibration templates
 #pragma link C++ class CbmOffsetDigiTime                                       \
   < CbmStsDigi> + ;  // <= Template specialization
+#pragma link C++ class CbmOffsetDigiTime                                       \
+  < CbmTofDigi> + ;  // <= Template specialization
 #pragma link C++ class CbmOffsetDigiTime                                       \
   < CbmMuchBeamTimeDigi> + ;  // <= Template specialization
 
diff --git a/reco/tracking/global/CMakeLists.txt b/reco/tracking/global/CMakeLists.txt
index 36a24441e7ed8f4bd9cbb66986000acac26493b3..2a5921fa9ce962db42e31f73a4ebf3536e722548 100755
--- a/reco/tracking/global/CMakeLists.txt
+++ b/reco/tracking/global/CMakeLists.txt
@@ -40,6 +40,7 @@ Set(LINK_DIRECTORIES
   ${ROOT_LIBRARY_DIR}
   ${FAIRROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
+  ${KFParticle_LIB_DIR}
 )
  
 Link_Directories( ${LINK_DIRECTORIES})
@@ -56,7 +57,7 @@ Set(NO_DICT_SRCS
 set(LINKDEF GlobalLinkDef.h)
 Set(LIBRARY_NAME CbmGlobalTracking)
 Set(DEPENDENCIES
-    CbmBase CbmData Base CbmMuchBase 
+    CbmBase CbmData Base CbmMuchBase KF
 #   CbmLitTrack CbmKF CbmRun ????
 )
 
diff --git a/sim/detectors/psd/CMakeLists.txt b/sim/detectors/psd/CMakeLists.txt
index abf64bfc45aa56e0ae0295413246f46261f43123..bd1f96661d1f131ba465bdd462728097e5b9d74c 100644
--- a/sim/detectors/psd/CMakeLists.txt
+++ b/sim/detectors/psd/CMakeLists.txt
@@ -33,7 +33,7 @@ set(SRCS
 set(LINKDEF CbmPsdSimLinkDef.h)
 set(LIBRARY_NAME CbmPsdSim)
 set(DEPENDENCIES
-    CbmData CbmBase Base 
+    CbmSimBase CbmData CbmBase Base
 )
 
 GENERATE_LIBRARY()