diff --git a/DataFormats/EcalDigi/src/classes.cc b/DataFormats/EcalDigi/src/classes.cc
new file mode 100644
index 0000000000000..0df23cbb7001e
--- /dev/null
+++ b/DataFormats/EcalDigi/src/classes.cc
@@ -0,0 +1,6 @@
+#include "DataFormats/EcalDigi/interface/EcalDigiHostCollection.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiPhase2HostCollection.h"
+#include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
+
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalDigiHostCollection);
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalDigiPhase2HostCollection);
diff --git a/DataFormats/EcalDigi/src/classes_def.xml b/DataFormats/EcalDigi/src/classes_def.xml
index 539e51c5acc49..3dc84399124ab 100644
--- a/DataFormats/EcalDigi/src/classes_def.xml
+++ b/DataFormats/EcalDigi/src/classes_def.xml
@@ -149,36 +149,16 @@
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
diff --git a/DataFormats/EcalRecHit/src/classes.cc b/DataFormats/EcalRecHit/src/classes.cc
new file mode 100644
index 0000000000000..c52911f9a852d
--- /dev/null
+++ b/DataFormats/EcalRecHit/src/classes.cc
@@ -0,0 +1,4 @@
+#include "DataFormats/EcalRecHit/interface/EcalUncalibratedRecHitHostCollection.h"
+#include "DataFormats/Portable/interface/PortableHostCollectionReadRules.h"
+
+SET_PORTABLEHOSTCOLLECTION_READ_RULES(EcalUncalibratedRecHitHostCollection);
diff --git a/DataFormats/EcalRecHit/src/classes_def.xml b/DataFormats/EcalRecHit/src/classes_def.xml
index 3f880bbcf1beb..8439f27a50f64 100644
--- a/DataFormats/EcalRecHit/src/classes_def.xml
+++ b/DataFormats/EcalRecHit/src/classes_def.xml
@@ -42,19 +42,9 @@
-
-
-
-
-
+
+
+
diff --git a/DataFormats/ParticleFlowReco/src/classes_1.h b/DataFormats/ParticleFlowReco/src/classes_1.h
index 874750a6bf83f..a75b2163519c3 100644
--- a/DataFormats/ParticleFlowReco/src/classes_1.h
+++ b/DataFormats/ParticleFlowReco/src/classes_1.h
@@ -1,54 +1,55 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/Common/interface/Ref.h"
-#include
-#include
-#include "DataFormats/Common/interface/ValueMap.h"
+// C++ headers
+#include