diff --git a/analysis/common/analysis_tree_converter/CMakeLists.txt b/analysis/common/analysis_tree_converter/CMakeLists.txt
index 1fee3b851286f2cf22e5d96e8c60f9c1bcfc8652..6b4ab3bf7048d997b6a5e9656bc5d4907af25446 100644
--- a/analysis/common/analysis_tree_converter/CMakeLists.txt
+++ b/analysis/common/analysis_tree_converter/CMakeLists.txt
@@ -36,8 +36,6 @@ Set(INCLUDE_DIRECTORIES
   ${CBMROOT_SOURCE_DIR}/reco/KF
   ${CBMROOT_SOURCE_DIR}/reco/L1
   ${CBMROOT_SOURCE_DIR}/reco/L1/L1Algo
-  ${KFParticle_INCLUDE_DIR}
-  ${AnalysisTree_INCLUDE_DIR}
   ${CBMROOT_SOURCE_DIR}/sim/transport/generators/unigen
 )
 
@@ -46,6 +44,8 @@ Include_Directories (${INCLUDE_DIRECTORIES})
 Set(SYSTEM_INCLUDE_DIRECTORIES
   ${BASE_INCLUDE_DIRECTORIES}
   ${Boost_INCLUDE_DIR} 
+  ${KFParticle_INCLUDE_DIR}
+  ${AnalysisTree_INCLUDE_DIR}
 )
 
 Include_Directories (SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})