diff --git a/include/Hcal/HcalDoubleEndRecProducer.h b/include/Hcal/HcalDoubleEndRecProducer.h
index 64cfc9d..f3505b0 100644
--- a/include/Hcal/HcalDoubleEndRecProducer.h
+++ b/include/Hcal/HcalDoubleEndRecProducer.h
@@ -6,10 +6,11 @@
 #include "DetDescr/HcalDigiID.h"
 #include "DetDescr/HcalGeometry.h"
 #include "DetDescr/HcalID.h"
-#include "Framework/EventDef.h"
 #include "Framework/EventProcessor.h"
 #include "Hcal/HcalReconConditions.h"
 #include "Recon/Event/HgcrocDigiCollection.h"
+#include "Hcal/Event/HcalHit.h"
+
 namespace hcal {
 
 class HcalDoubleEndRecProducer : public framework::Producer {
diff --git a/include/Hcal/HcalRecProducer.h b/include/Hcal/HcalRecProducer.h
index 5110fd8..e4c3542 100644
--- a/include/Hcal/HcalRecProducer.h
+++ b/include/Hcal/HcalRecProducer.h
@@ -22,8 +22,8 @@
 #include "DetDescr/HcalDigiID.h"
 #include "DetDescr/HcalGeometry.h"
 #include "DetDescr/HcalID.h"
-#include "Framework/EventDef.h"
 #include "Framework/EventProcessor.h"
+#include "Recon/Event/HgcrocDigiCollection.h"
 
 //---------//
 //  ROOT   //
diff --git a/include/Hcal/HcalSingleEndRecProducer.h b/include/Hcal/HcalSingleEndRecProducer.h
index 75e036e..de5b649 100644
--- a/include/Hcal/HcalSingleEndRecProducer.h
+++ b/include/Hcal/HcalSingleEndRecProducer.h
@@ -6,10 +6,11 @@
 #include "DetDescr/HcalDigiID.h"
 #include "DetDescr/HcalGeometry.h"
 #include "DetDescr/HcalID.h"
-#include "Framework/EventDef.h"
 #include "Framework/EventProcessor.h"
 #include "Hcal/HcalReconConditions.h"
 #include "Recon/Event/HgcrocDigiCollection.h"
+#include "Hcal/Event/HcalHit.h"
+
 namespace hcal {
 class HcalSingleEndRecProducer : public framework::Producer {
   /// name of pass of digis to use
diff --git a/src/Hcal/HcalRecProducer.cxx b/src/Hcal/HcalRecProducer.cxx
index ecf00f1..e002b1c 100644
--- a/src/Hcal/HcalRecProducer.cxx
+++ b/src/Hcal/HcalRecProducer.cxx
@@ -8,6 +8,9 @@
 #include "Hcal/HcalRecProducer.h"
 
 #include "Hcal/HcalReconConditions.h"
+#include "Hcal/Event/HcalHit.h"
+#include "Recon/Event/HgcrocDigiCollection.h"
+#include "SimCore/Event/SimCalorimeterHit.h"
 
 namespace hcal {