diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index feff7fd5d2e1530edefda31b9eeb00cb4926a0c4..b74e25a7d09ceedc61a8ea105597bcfa32e18009 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ set(EXENAME hcana)
 #----------------------------------------------------------------------------
 # Sources and headers
 file(GLOB src "*.cxx")
-file(GLOB allheaders "*.h")
+file(GLOB allheaders RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
 list(REMOVE_ITEM allheaders
   "${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}_LinkDef.h"
   )
@@ -94,9 +94,9 @@ install(FILES ${allheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 #----------------------------------------------------------------------------
 # libHallCDict
 build_root_dictionary(${LIBNAME} ${headers}
-  INCLUDEDIRS -I${CMAKE_CURRENT_SOURCE_DIR}
+  INCLUDEDIRS -I${CMAKE_CURRENT_SOURCE_DIR} -I${Podd_DIR}/../../include
   TARGETS ${LIBNAME}
-  LINKDEF ${linkdef}
+  LINKDEF include/HallC_LinkDef.h 
   )
 
 #----------------------------------------------------------------------------
diff --git a/src/include/HallC_LinkDef.h b/src/include/HallC_LinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..36bbc62da68ae38a4bc7c8918f715495433f35a3
--- /dev/null
+++ b/src/include/HallC_LinkDef.h
@@ -0,0 +1,70 @@
+// Preamble to HallC_LinkDef.h file
+
+#ifdef __CINT__
+ 
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+ 
+#pragma link C++ global gHcParms;
+#pragma link C++ global gHcDetectorMap;
+ 
+#pragma link C++ class Decoder::Scaler9001+;
+#pragma link C++ class Decoder::Scaler9250+;
+#pragma link C++ class THcAerogel+;
+#pragma link C++ class THcAerogelHit+;
+#pragma link C++ class THcAnalyzer+;
+#pragma link C++ class THcBCMCurrent+;
+#pragma link C++ class THcCherenkov+;
+#pragma link C++ class THcCherenkovHit+;
+#pragma link C++ class THcCoinTime+;
+#pragma link C++ class THcConfigEvtHandler+;
+#pragma link C++ class THcDC+;
+#pragma link C++ class THcDCHit+;
+#pragma link C++ class THcDCLookupTTDConv+;
+#pragma link C++ class THcDCTimeToDistConv+;
+#pragma link C++ class THcDCTrack+;
+#pragma link C++ class THcDCWire+;
+#pragma link C++ class THcDetectorMap+;
+#pragma link C++ class THcDriftChamber+;
+#pragma link C++ class THcDriftChamberPlane+;
+#pragma link C++ class THcDummySpectrometer+;
+#pragma link C++ class THcExtTarCor+;
+#pragma link C++ class THcFormula+;
+#pragma link C++ class THcHallCSpectrometer+;
+#pragma link C++ class THcHitList+;
+#pragma link C++ class THcHodoEff+;
+#pragma link C++ class THcHodoHit+;
+#pragma link C++ class THcHodoscope+;
+#pragma link C++ class THcInterface+;
+#pragma link C++ class THcParmList+;
+#pragma link C++ class THcPeriodicReport+;
+#pragma link C++ class THcPrimaryKine+;
+#pragma link C++ class THcRaster+;
+#pragma link C++ class THcRasteredBeam+;
+#pragma link C++ class THcRasterRawHit+;
+#pragma link C++ class THcRawAdcHit+;
+#pragma link C++ class THcRawDCHit+;
+#pragma link C++ class THcRawHit+;
+#pragma link C++ class THcRawHodoHit+;
+#pragma link C++ class THcRawShowerHit+;
+#pragma link C++ class THcRawTdcHit+;
+#pragma link C++ class THcReactionPoint+;
+#pragma link C++ class THcRun+;
+#pragma link C++ class THcRunParameters+;
+#pragma link C++ class THcScalerEvtHandler+;
+#pragma link C++ class THcScintillatorPlane+;
+#pragma link C++ class THcSecondaryKine+;
+#pragma link C++ class THcShowerArray+;
+#pragma link C++ class THcShower+;
+#pragma link C++ class THcShowerHit+;
+#pragma link C++ class THcShowerPlane+;
+#pragma link C++ class THcSignalHit+;
+#pragma link C++ class THcSpacePoint+;
+#pragma link C++ class THcTimeSyncEvtHandler+;
+#pragma link C++ class THcTrigApp+;
+#pragma link C++ class THcTrigDet+;
+#pragma link C++ class THcTrigRawHit+;
+#pragma link C++ class Decoder::TIBlobModule+;
+// Postamble for HallC_Linkdef.h file
+#endif