diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index 142c43860863ebf2f12cf7f5622c1acd53cf3997..6671f55ab5b47feb3e9ccfed1089474b32b96170 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -46,11 +46,10 @@ include_directories(${INCLUDE_DIRECTORIES})
 include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-  ${Vc_LIB_DIR}
-  ${ROOT_LIBRARY_DIR}
-  ${FAIRROOT_LIBRARY_DIR}
   ${KFParticle_LIB_DIR}
   ${FAIRMQ_LIBRARY_DIR}
+  ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
 )
 
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt
index 53efc9d7f828f8e1a6272a2cb59a8b228afee5a3..ae254d76eda35f834fbbfbfe40552e0475efb65f 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/CMakeLists.txt
@@ -9,7 +9,6 @@ set(KF_HEADERS
 	${CBMROOT_SOURCE_DIR}/L1/ParticleFinder
 	${CLHEP_INCLUDE_DIR}
 	${Boost_INCLUDE_DIRS}
-	${VC_INCLUDE_DIRS}
 	${KFParticle_INCLUDE_DIR}
 	${CBMROOT_SOURCE_DIR}/KF
 	${CBMROOT_SOURCE_DIR}/KF/Interface
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
index 85ee30f4d51a9f74498b27d3fc4c413d57f17897..68cb30bb7a683bb2d5077f3f65539339ff514dc1 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/cuts/CMakeLists.txt
@@ -22,11 +22,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 )
 
 Set(LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
+  ${KFParticle_LIB_DIR}
   ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
-  ${Vc_LIB_DIR}
-  ${KFParticle_LIB_DIR}
 )
 
 Include_Directories(${INCLUDE_DIRECTORIES})
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
index 18c33724107504cb5ede3c599604ef1a2fe4b968..ff78d2a8dfbc2f1285fb7d772a2f11927901dd36 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/CMakeLists.txt
@@ -21,12 +21,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 )
 
 Set(LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
-  ${FAIRROOT_LIBRARY_DIR}
-  ${Boost_LIBRARY_DIRS}
-  ${Vc_LIB_DIR}
   ${KFParticle_LIB_DIR}
   ${AnalysisTree_LIBRARY_DIR}
+  ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
+  ${Boost_LIBRARY_DIRS}
 )
 
 Include_Directories(${INCLUDE_DIRECTORIES})
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
index c93514cbf49c2eac41aad1e933e8226f574e2a5e..67598ce8c573cd4dcf59b050c2e659b8b75187d1 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/helpers/CMakeLists.txt
@@ -20,11 +20,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 )
 
 Set(LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
+  ${KFParticle_LIB_DIR}
   ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
-  ${Vc_LIB_DIR}
-  ${KFParticle_LIB_DIR}
 )
 
 Include_Directories(${INCLUDE_DIRECTORIES})
diff --git a/analysis/PWGCHA/jpsi/CMakeLists.txt b/analysis/PWGCHA/jpsi/CMakeLists.txt
index ac46855dd71ec2d891a1ad9a771c934f194233d2..f60e7e1fbeffd2ae0880b7f6c84ab70c045ced54 100644
--- a/analysis/PWGCHA/jpsi/CMakeLists.txt
+++ b/analysis/PWGCHA/jpsi/CMakeLists.txt
@@ -31,17 +31,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
-  ${VC_INCLUDE_DIRS}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
@@ -72,7 +70,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
 
 Set(LINKDEF CbmJPsiAnalysisLinkDef.h)
 Set(LIBRARY_NAME CbmJPsiAnalysis)
-Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack Vc.a)
+Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmBase CbmData Littrack)
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
 GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
index a5cc6297a93f1c106da06a4b17086b74cfdab8b8..f6efb53ed7d129192a4d7cc910404a3c79959fc5 100644
--- a/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/conversion/CMakeLists.txt
@@ -29,7 +29,6 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils
 Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${VC_INCLUDE_DIRS}
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
   ${KFParticle_INCLUDE_DIR}
@@ -38,10 +37,9 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${Vc_LIB_DIR}
 ${KFParticle_LIB_DIR}
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
  
@@ -75,7 +73,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
 
 Set(LINKDEF CbmConversionAnalysisLinkDef.h)
 Set(LIBRARY_NAME CbmConversionAnalysis)
-Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack Vc.a)
+Set(DEPENDENCIES KF L1 CbmRichReco CbmRichBase CbmRecoBase CbmData Littrack)
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
 GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
index 7ec28d9e68e64b4fa3cd35e19b16fd61951d14d4..5ecd75cdc07c7a2f91a44bc61012d7dc28be8c0a 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/lmvm/CMakeLists.txt
@@ -33,17 +33,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
-  ${VC_INCLUDE_DIRS}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 7112ea394259c87fac00bdb061cd2ed134fcc4b4..6b139f3be8a431723101217acccd1840b600be8a 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -49,17 +49,15 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
-  ${VC_INCLUDE_DIRS}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
 
 #Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Weffc++ -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-ignored-qualifiers -Wno-overloaded-virtual")
@@ -147,7 +145,7 @@ EndIf()
 Set(LINKDEF CbmPapaLinkDef.h)
 Set(LIBRARY_NAME CbmPapa)
 Set(DEPENDENCIES
-    L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base Vc.a)
+    L1 KF Littrack CbmRichReco CbmRichBase CbmBase CbmData CbmSimGenerators Base)
 
 GENERATE_LIBRARY()
 
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt
index 443e972086fe49825f8bc5ea07e9c6502018aba6..bc48b0bdc22d7ac4d02bc25b09b3172c888a7a8d 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CMakeLists.txt
@@ -12,14 +12,13 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR}
-  ${VC_INCLUDE_DIRS}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
 
@@ -38,7 +37,7 @@ Set(HEADERS )
 Set(LINKDEF CbmFastSimLinkDef.h)
 Set(LIBRARY_NAME CbmFastSim)
 Set(DEPENDENCIES
-    CbmPapa CbmBase CbmData CbmSimGenerators Base VMC Vc.a
+    CbmPapa CbmBase CbmData CbmSimGenerators Base VMC
 )
 
 GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
index fcc883df5bb8578cbce487c4303451202f8e577b..33cf2f1406026b5488871e9becb5de533c396e19 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/pi0eta/CMakeLists.txt
@@ -31,20 +31,18 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/utils
 Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
+  ${KFParticle_INCLUDE_DIR}
   ${BASE_INCLUDE_DIRECTORIES} 
   ${Boost_INCLUDE_DIR}
-  ${VC_INCLUDE_DIRS}
-  ${KFParticle_INCLUDE_DIR}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
@@ -89,7 +87,7 @@ ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -D
 
 Set(LINKDEF CbmConversion2AnalysisLinkDef.h)
 Set(LIBRARY_NAME CbmConversion2Analysis)
-Set(DEPENDENCIES KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData Vc.a)
+Set(DEPENDENCIES KF L1 CbmRichBase CbmRichReco CbmRecoBase CbmData)
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
 GENERATE_LIBRARY()
diff --git a/analysis/PWGDIL/dimuon/CMakeLists.txt b/analysis/PWGDIL/dimuon/CMakeLists.txt
index d7797712412e68d61624b7341bd0dfdf1a7ce9f4..cbeb15e577e7a6c8d51a34471fd6f503584712fa 100644
--- a/analysis/PWGDIL/dimuon/CMakeLists.txt
+++ b/analysis/PWGDIL/dimuon/CMakeLists.txt
@@ -28,11 +28,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
diff --git a/analysis/PWGHAD/hadron/CMakeLists.txt b/analysis/PWGHAD/hadron/CMakeLists.txt
index 498f195731e14f744ac900c88960aec47bfef89a..8337fe7c374b22e560d901635e618af4d900c40b 100644
--- a/analysis/PWGHAD/hadron/CMakeLists.txt
+++ b/analysis/PWGHAD/hadron/CMakeLists.txt
@@ -32,11 +32,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index a4b18142c2e0101b34d62926a5da8e12159b7cd9..8783ee87288ab0ba0585d75e89b8847fdadf622d 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -45,7 +45,6 @@ Set(INCLUDE_DIRECTORIES
 Include_Directories (${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${VC_INCLUDE_DIRS}
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR} 
 )
@@ -53,12 +52,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set (LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
+  ${AnalysisTree_LIBRARY_DIR}
+  ${KFParticle_LIB_DIR}
   ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
-  ${Vc_LIB_DIR}
-  ${KFParticle_LIB_DIR}
-  ${AnalysisTree_LIBRARY_DIR}
 )
  
 link_directories(${LINK_DIRECTORIES})
@@ -83,7 +81,8 @@ Set(DEPENDENCIES
 	KF 
 	L1 
 	CbmSimGenerators
-	Vc.a)
+)
+
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
 ADD_DEFINITIONS(${DEFINITIONS})
diff --git a/analysis/common/at_kfpf_interface/CMakeLists.txt b/analysis/common/at_kfpf_interface/CMakeLists.txt
index 6f21eab0bfaff1b2c9c6609940d71d728708f2fd..572a1bb4426668215a747e8cbe1f6f206d12f8c3 100644
--- a/analysis/common/at_kfpf_interface/CMakeLists.txt
+++ b/analysis/common/at_kfpf_interface/CMakeLists.txt
@@ -15,7 +15,6 @@ Set(INCLUDE_DIRECTORIES
 Include_Directories (${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${VC_INCLUDE_DIRS}
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR} 
 )
@@ -23,12 +22,11 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set (LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
+  ${AnalysisTree_LIBRARY_DIR}
+  ${KFParticle_LIB_DIR}
   ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
-  ${Vc_LIB_DIR}
-  ${KFParticle_LIB_DIR}
-  ${AnalysisTree_LIBRARY_DIR}
 )
  
 link_directories(${LINK_DIRECTORIES})
@@ -48,8 +46,7 @@ Set(_AnalysisTree_LIB AnalysisTreeBase AnalysisTreeInfra)
 
 Set(DEPENDENCIES 
 	${_AnalysisTree_LIB} 
-	KFParticle
-	Vc.a)
+	KFParticle)
 Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
 
 ADD_DEFINITIONS(${DEFINITIONS})
diff --git a/core/detectors/trd/CMakeLists.txt b/core/detectors/trd/CMakeLists.txt
index e4e8f8886edcdd57c7465c05360a9ca5482f64a8..dd935037423e57682ede5c6be2f8f89a443894e6 100644
--- a/core/detectors/trd/CMakeLists.txt
+++ b/core/detectors/trd/CMakeLists.txt
@@ -13,16 +13,14 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
-  ${Boost_INCLUDE_DIR}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
 )
 
 link_directories( ${LINK_DIRECTORIES})
diff --git a/external/InstallVC.cmake b/external/InstallVC.cmake
index af4399be6d59675b572361343e5c3024bb340825..03ca1a1456ae793d42893e80dee8cf9e90ee1939 100644
--- a/external/InstallVC.cmake
+++ b/external/InstallVC.cmake
@@ -7,8 +7,8 @@ set(Vc_ROOTDIR "${Vc_DESTDIR}/${CMAKE_BINARY_DIR}")
 set(Vc_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}Vc${CMAKE_STATIC_LIBRARY_SUFFIX}")
 set(Vc_LIBRARY "${Vc_ROOTDIR}/${_LIBDIR_DEFAULT}/${Vc_LIBNAME}")
 
-set(Vc_VERSION f8a18751dcb001c8d9820a6c90a1f605e27ca692) # Hash for tag 1.4.1, Need hash for tests 
-#set(Vc_VERSION fc2d75d0f23f33c2224d546acb965c535a45454a) # Hash for tag 1.4.2, Need hash for tests
+#set(Vc_VERSION f8a18751dcb001c8d9820a6c90a1f605e27ca692) # Hash for tag 1.4.1, Need hash for tests
+set(Vc_VERSION fc2d75d0f23f33c2224d546acb965c535a45454a) # Hash for tag 1.4.2, Need hash for tests
 set(Vc_SRC_URL "https://github.com/VcDevel/Vc")
 
 download_project_if_needed(PROJECT         vc_source
diff --git a/reco/KF/CMakeLists.txt b/reco/KF/CMakeLists.txt
index b57a8a25cd4ef17c3d28408daf29436efb8a221f..da9d382369fc442d297757a76b1cb4b1f0aeb5b0 100644
--- a/reco/KF/CMakeLists.txt
+++ b/reco/KF/CMakeLists.txt
@@ -43,12 +43,12 @@ Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 set(LINK_DIRECTORIES
 ${Vc_LIB_DIR}
 ${KFParticle_LIB_DIR}
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
  
-link_directories( ${LINK_DIRECTORIES})
+link_directories(BEFORE ${LINK_DIRECTORIES})
 
 set(SRCS
 CbmKF.cxx 
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index b9a745afa33ccf6abfb18285fa0afe336a52aa37..dc4a135e20731a2bf665ad272558db278c5979b9 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -63,7 +63,6 @@ ${CBMROOT_SOURCE_DIR}/mvd
 Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
-  ${VC_INCLUDE_DIRS}
   ${BASE_INCLUDE_DIRECTORIES} 
   ${KFParticle_INCLUDE_DIR}
 )
@@ -80,10 +79,9 @@ endif()
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${Vc_LIB_DIR}
 ${KFParticle_LIB_DIR}
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
 
diff --git a/reco/base/CMakeLists.txt b/reco/base/CMakeLists.txt
index fc222c674bfc02f261521db48c4ea1582ca8a275..befd16ee0045fce999ef02ce4c83bd03e19d4b66 100644
--- a/reco/base/CMakeLists.txt
+++ b/reco/base/CMakeLists.txt
@@ -55,8 +55,8 @@ ${IPC_INCLUDE_DIRECTORY}
 
 # ----  Link directories ----------------------------------
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
 # ---------------------------------------------------------
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index a1d2c7b217548c2eccfb0c9d50525bbec5025801..16bdb2b2153c2131d23a4fc71977bfc280f364fe 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -54,11 +54,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
 
 link_directories( ${LINK_DIRECTORIES})
diff --git a/reco/detectors/rich/qa/mirrors/CMakeLists.txt b/reco/detectors/rich/qa/mirrors/CMakeLists.txt
index fd58853ee8ba8ece8596bb748280a58e3b117efc..04ae8facac76614a43dd2900c434b7f6fcf41fa9 100644
--- a/reco/detectors/rich/qa/mirrors/CMakeLists.txt
+++ b/reco/detectors/rich/qa/mirrors/CMakeLists.txt
@@ -26,10 +26,9 @@ Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 get_filename_component(TIFF_LIBRARY_DIR ${TIFF_LIBRARY} DIRECTORY)
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
 ${TIFF_LIBRARY_DIR}
 )
 
diff --git a/reco/eventbuilder/CMakeLists.txt b/reco/eventbuilder/CMakeLists.txt
index 9473646a6df9dbec5e2f4b65e55152414569cb68..6f713d1f9147986f273ea73b5f019b8e051a4cfa 100644
--- a/reco/eventbuilder/CMakeLists.txt
+++ b/reco/eventbuilder/CMakeLists.txt
@@ -48,18 +48,17 @@ ${CBMROOT_SOURCE_DIR}/core/data/raw
 Include_Directories( ${INCLUDE_DIRECTORIES})
 
 set(SYSTEM_INCLUDE_DIRECTORIES
-  ${VC_INCLUDE_DIRS}
   ${KFParticle_INCLUDE_DIR}
   ${BASE_INCLUDE_DIRECTORIES} 
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
+
 set(LINK_DIRECTORIES
-${Vc_LIB_DIR}
 ${KFParticle_LIB_DIR}
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
  
diff --git a/reco/global/CMakeLists.txt b/reco/global/CMakeLists.txt
index faa112fda04b2e5d5666728dfbe7afae76bf77c5..f4a1470d6b2d6dd8ed71cbb463bb31c66f907573 100644
--- a/reco/global/CMakeLists.txt
+++ b/reco/global/CMakeLists.txt
@@ -26,11 +26,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
diff --git a/reco/littrack/CMakeLists.txt b/reco/littrack/CMakeLists.txt
index 10d92ac4cc89c1c454e9974fa35e6ff7fcb9a092..18e945027ebe8efc4317eb5abbae5ea769b550d5 100644
--- a/reco/littrack/CMakeLists.txt
+++ b/reco/littrack/CMakeLists.txt
@@ -64,11 +64,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
 
 link_directories( ${LINK_DIRECTORIES})
diff --git a/reco/qa/CMakeLists.txt b/reco/qa/CMakeLists.txt
index 4b237c1c5187f7f7d483d0264dbe9aae1c8dc34a..8fb6c18950b4961efefb8ec26ebe1994c240d3cc 100644
--- a/reco/qa/CMakeLists.txt
+++ b/reco/qa/CMakeLists.txt
@@ -14,7 +14,6 @@ ${CBMDATA_DIR}/tof
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
-  ${VC_INCLUDE_DIRS}
   ${ROOT_INCLUDE_DIR}
 )
 
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index 14a50d7cf1427273eb1d5dbe383967e2e353489f..e5f21ecf09d5e367d65a47026f7756359814287c 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -62,10 +62,10 @@ ${IPC_INCLUDE_DIRECTORY}
 
 # ----  Link directories ----------------------------------
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
+${KFParticle_LIB_DIR} # for rich reco
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${KFParticle_LIB_DIR} # for rich reco
 )
 # ---------------------------------------------------------
 
diff --git a/reco/tracking/global/CMakeLists.txt b/reco/tracking/global/CMakeLists.txt
index 64cdd31b27c01b877e175a922245fdf65c2cb163..71f75c1275f7b7447cfa4fd3ee7c2813b2bba083 100755
--- a/reco/tracking/global/CMakeLists.txt
+++ b/reco/tracking/global/CMakeLists.txt
@@ -37,11 +37,10 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 Set(LINK_DIRECTORIES
-  ${ROOT_LIBRARY_DIR}
+  ${KFParticle_LIB_DIR}
   ${FAIRROOT_LIBRARY_DIR}
+  ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
-  ${KFParticle_LIB_DIR}
-  ${Vc_LIB_DIR}
 )
  
 Link_Directories( ${LINK_DIRECTORIES})
diff --git a/reco/tracking/vector/CMakeLists.txt b/reco/tracking/vector/CMakeLists.txt
index 65835452ce7d0683c4051a6f51b36597d1949b62..b86da8460303f02b4ee71d0c499c46eb18ea46e8 100644
--- a/reco/tracking/vector/CMakeLists.txt
+++ b/reco/tracking/vector/CMakeLists.txt
@@ -41,8 +41,6 @@ set(LINK_DIRECTORIES
 ${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 )
  
 link_directories( ${LINK_DIRECTORIES})
diff --git a/sim/detectors/trd/CMakeLists.txt b/sim/detectors/trd/CMakeLists.txt
index 69f2d62c37adc77bcfbb37ce28d9be9c5e1ac0fd..afb0dda8bd321e1db00ea174e6b8faa8e8f2e108 100644
--- a/sim/detectors/trd/CMakeLists.txt
+++ b/sim/detectors/trd/CMakeLists.txt
@@ -24,16 +24,14 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
 
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES} 
-  ${Boost_INCLUDE_DIR}
 )
 
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
 ) 
 
 link_directories( ${LINK_DIRECTORIES})
diff --git a/sim/transport/geosetup/CMakeLists.txt b/sim/transport/geosetup/CMakeLists.txt
index f512c2191320016e17a87a9af362f7222a7397cc..bbcb1e011d0ccc4758a891d64d36f2ce7881ce0d 100644
--- a/sim/transport/geosetup/CMakeLists.txt
+++ b/sim/transport/geosetup/CMakeLists.txt
@@ -76,10 +76,8 @@ set(SYSTEM_INCLUDE_DIRECTORIES
 Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
 
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
 )
 
diff --git a/sim/transport/steer/CMakeLists.txt b/sim/transport/steer/CMakeLists.txt
index 45856dd6cdf83dd7a050a4487154942dc6c33a0a..d119b821f10c57b6b63c9c3db55eba5528e0d2d6 100644
--- a/sim/transport/steer/CMakeLists.txt
+++ b/sim/transport/steer/CMakeLists.txt
@@ -47,11 +47,9 @@ ${BASE_INCLUDE_DIRECTORIES}
 
 # ----  Link directories ----------------------------------
 set(LINK_DIRECTORIES
-${ROOT_LIBRARY_DIR}
 ${FAIRROOT_LIBRARY_DIR}
+${ROOT_LIBRARY_DIR}
 ${Boost_LIBRARY_DIRS}
-${Vc_LIB_DIR}
-${KFParticle_LIB_DIR}
 ${SIMPATH}/lib
 )