diff --git a/Reconstruction/PFA/Arbor/CMakeLists.txt b/Reconstruction/PFA/Arbor/CMakeLists.txt
index eb4468bd61180dea7e8e9dba8d3c0bf9e41ace6c..6508c401d98b504e4f462baaaff87302ef95619d 100644
--- a/Reconstruction/PFA/Arbor/CMakeLists.txt
+++ b/Reconstruction/PFA/Arbor/CMakeLists.txt
@@ -25,6 +25,9 @@ gaudi_add_module(Arbor
                       EDM4HEP::edm4hep EDM4HEP::edm4hepDict
 )
 
+target_include_directories(Arbor
+  PUBLIC ${LCIO_INCLUDE_DIRS}
+)
 
 install(TARGETS Arbor
   EXPORT CEPCSWTargets
diff --git a/Reconstruction/PFA/Arbor/src/BushConnect.hh b/Reconstruction/PFA/Arbor/src/BushConnect.hh
index e0f23ba8ca625d4ef32d9ad62ca3c78b3e260e05..80403feb8bff907a7697dd577e11a9540288707e 100644
--- a/Reconstruction/PFA/Arbor/src/BushConnect.hh
+++ b/Reconstruction/PFA/Arbor/src/BushConnect.hh
@@ -60,7 +60,7 @@ class BushConnect  : public GaudiAlgorithm
 		std::map<edm4hep::ConstTrack, float> Track_Phi;	
 
 		std::map<edm4hep::ConstCluster, int> ClusterType_1stID;
-		std::map<edm4hep::ReconstructedParticle, int> ChCoreID; 
+		std::map<edm4hep::ConstReconstructedParticle, int> ChCoreID; 
 
 		std::vector<edm4hep::ConstCluster> ecalchcore_tight;         //TightCores
 		std::vector<edm4hep::ConstCluster> ecalchcore_medium;
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
index 80307e39ad0df371f0a6fd107cf04155a8571136..82163d59885262cbc8ca009f70e9eca9ad811e48 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt
@@ -26,7 +26,11 @@ gaudi_add_module(GaudiPandora
 
 target_include_directories(GaudiPandora PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  ${GEAR_INCLUDE_DIRS}
+  ${PandoraSDK_INCLUDE_DIRS}
+  ${LCContent_INCLUDE_DIRS}
+)
 
 install(TARGETS GaudiPandora
   EXPORT CEPCSWTargets
diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt
index a70dae702f0d31a63bd831d083bde979ad2e31eb..ec9a930b28063238baf3d34f60e4615f602b14c5 100644
--- a/Service/GearSvc/CMakeLists.txt
+++ b/Service/GearSvc/CMakeLists.txt
@@ -11,6 +11,10 @@ gaudi_add_module(GearSvcPlugins
 		      DetSegmentation
 )
 
+target_include_directories(GeomSvc
+  PUBLIC ${GEAR_INCLUDE_DIRS}
+)
+
 install(TARGETS GearSvc GearSvcPlugins
   EXPORT CEPCSWTargets
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin