diff --git a/analysis/PWGC2F/flow/DataTreeCbmInterface/CMakeLists.txt b/analysis/PWGC2F/flow/DataTreeCbmInterface/CMakeLists.txt
index 3cc8dc3a395a6176a0e3db1e84bf843c51d0dfac..100acf52263b3a8703e188c0c890d8c9b17997ae 100644
--- a/analysis/PWGC2F/flow/DataTreeCbmInterface/CMakeLists.txt
+++ b/analysis/PWGC2F/flow/DataTreeCbmInterface/CMakeLists.txt
@@ -67,11 +67,7 @@ ENDIF (SSE_FOUND)
 Set(LINKDEF DataTreeCbmInterfaceLinkDef.h)
 Set(LIBRARY_NAME DataTreeCbmInterface)
 
-If(UNIX AND NOT APPLE)
-  Set(_DataTree_LIB  DataTree.so)
-  Else()
-  Set(_DataTree_LIB  DataTree.dylib)
-EndIf()
+Set(_DataTree_LIB  DataTree)
 
 Set(DEPENDENCIES 
 	${_DataTree_LIB} 
diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index 843775eda638964bf4aa51098cac10f6be491d8f..6804d422b5b5f0c04a291253080e4b35fb97b83d 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -69,11 +69,7 @@ ENDIF (SSE_FOUND)
 
 Set(LINKDEF CbmAnalysisTreeInterfaceLinkDef.h)
 
-If(UNIX AND NOT APPLE)
-  Set(_AnalysisTree_LIB  AnalysisTreeBase.so AnalysisTreeInfra.so)
-  Else()
-  Set(_AnalysisTree_LIB  AnalysisTreeBase.dylib AnalysisTreeInfra.dylib)
-EndIf()
+Set(_AnalysisTree_LIB AnalysisTreeBase AnalysisTreeInfra)
 
 Set(DEPENDENCIES 
 	${_AnalysisTree_LIB} 
diff --git a/analysis/common/at_kfpf_interface/CMakeLists.txt b/analysis/common/at_kfpf_interface/CMakeLists.txt
index bddba6c0de902f8a667021ba52e5243c282f4530..0cb156fc20927319d5c41b11845ac313ae398582 100644
--- a/analysis/common/at_kfpf_interface/CMakeLists.txt
+++ b/analysis/common/at_kfpf_interface/CMakeLists.txt
@@ -44,11 +44,7 @@ ENDIF (SSE_FOUND)
 
 Set(LINKDEF AnalysisTreeKfpfInterfaceLinkDef.h)
 
-If(UNIX AND NOT APPLE)
-  Set(_AnalysisTree_LIB  AnalysisTreeBase.so AnalysisTreeInfra.so)
-  Else()
-  Set(_AnalysisTree_LIB  AnalysisTreeBase.dylib AnalysisTreeInfra.dylib)
-EndIf()
+Set(_AnalysisTree_LIB AnalysisTreeBase AnalysisTreeInfra)
 
 Set(DEPENDENCIES 
 	${_AnalysisTree_LIB}