diff --git a/DataFormats/ParticleFlowReco/BuildFile.xml b/DataFormats/ParticleFlowReco/BuildFile.xml
index 70e9023625204..86714bb001c71 100644
--- a/DataFormats/ParticleFlowReco/BuildFile.xml
+++ b/DataFormats/ParticleFlowReco/BuildFile.xml
@@ -17,8 +17,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="rootcore"/>
 <use name="rootmath"/>
-<flags LCG_DICT_HEADER="classes_1.h classes_2.h"/>
-<flags LCG_DICT_XML="classes_def_1.xml classes_def_2.xml"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/ParticleFlowReco/src/classes_2.h b/DataFormats/ParticleFlowReco/src/classes.h
similarity index 100%
rename from DataFormats/ParticleFlowReco/src/classes_2.h
rename to DataFormats/ParticleFlowReco/src/classes.h
diff --git a/DataFormats/ParticleFlowReco/src/classes_1.h b/DataFormats/ParticleFlowReco/src/classes_1.h
deleted file mode 100644
index 874750a6bf83f..0000000000000
--- a/DataFormats/ParticleFlowReco/src/classes_1.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "DataFormats/Common/interface/Ref.h"
-#include <DataFormats/Common/interface/OwnVector.h>
-#include <DataFormats/Common/interface/ClonePolicy.h>
-#include "DataFormats/Common/interface/ValueMap.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "Math/Cartesian3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
-#include "Math/Polar3D.h"
-#include "Math/CylindricalEta3D.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
-#include "Math/GenVector/PositionVector3D.h"
-#include "DataFormats/Math/interface/Point3D.h"
-#include "Rtypes.h"
-#include "DataFormats/Math/interface/Vector3D.h"
-#include "Math/PxPyPzE4D.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrackExtra.h"
-#include "DataFormats/ParticleFlowReco/interface/PFSimParticle.h"
-#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"      //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"          //Daniele
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"  //Florian
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h"
-#include "DataFormats/ParticleFlowReco/interface/PFNuclearInteraction.h"
-#include "DataFormats/ParticleFlowReco/interface/PFConversion.h"
-#include "DataFormats/ParticleFlowReco/interface/PFConversionFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeed.h"
-#include "DataFormats/ParticleFlowReco/interface/ConvBremSeedFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/ParticleFiltrationDecision.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidate.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeed.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertex.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexCandidateFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexSeedFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexFwd.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PreId.h"
-#include "DataFormats/ParticleFlowReco/interface/PreIdFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
-#include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"
-
-#include <map>
diff --git a/DataFormats/ParticleFlowReco/src/classes_def_2.xml b/DataFormats/ParticleFlowReco/src/classes_def.xml
similarity index 76%
rename from DataFormats/ParticleFlowReco/src/classes_def_2.xml
rename to DataFormats/ParticleFlowReco/src/classes_def.xml
index 6c40541360768..4dae11a0fa8c6 100644
--- a/DataFormats/ParticleFlowReco/src/classes_def_2.xml
+++ b/DataFormats/ParticleFlowReco/src/classes_def.xml
@@ -1,6 +1,7 @@
 <lcgdict>
 <selection>
 
+  <!-- from classes_def_2.xml -->
   <class name="reco::PFCluster" ClassVersion="17">
    <version ClassVersion="17" checksum="3021111509"/>
    <version ClassVersion="16" checksum="1786894710"/>
@@ -303,8 +304,67 @@
 
   <class name="edm::Wrapper<edm::RefVector<std::vector<reco::RecoPFClusterRefCandidate>,reco::RecoPFClusterRefCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::RecoPFClusterRefCandidate>,reco::RecoPFClusterRefCandidate> > >" />
 
+  <!-- from classes_def_1.xml -->
+  <class name="reco::PFNuclearInteraction"  ClassVersion="10">
+   <version ClassVersion="10" checksum="1573561360"/>
+  </class>
+  <class name="std::vector<reco::PFNuclearInteraction>" />
+  <class name="edm::Wrapper<std::vector<reco::PFNuclearInteraction> >" />
+  <class name="edm::Ref<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" />
+  <class name="edm::RefProd<std::vector<reco::PFNuclearInteraction> >" />
+  <class name="edm::RefVector<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" />
+
+
+  <class name="reco::PFDisplacedTrackerVertex"  ClassVersion="10">
+   <version ClassVersion="10" checksum="2059737151"/>
+  </class>
+  <class name="std::vector<reco::PFDisplacedTrackerVertex>" />
+  <class name="edm::Wrapper<std::vector<reco::PFDisplacedTrackerVertex> >" />
+  <class name="edm::Ref<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" />
+  <class name="edm::RefProd<std::vector<reco::PFDisplacedTrackerVertex> >" />
+  <class name="edm::RefVector<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" />
+
+  <class name="reco::PFConversion" ClassVersion="10">
+   <version ClassVersion="10" checksum="2417207933"/>
+  </class>
+  <class name="std::vector<reco::PFConversion>"/>
+  <class name="edm::Wrapper<std::vector<reco::PFConversion> >"/>
+  <class name="edm::Ref<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/>
+  <class name="edm::RefProd<std::vector<reco::PFConversion> >"/>
+  <class name="edm::RefVector<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/>
+  <class name="std::vector<edm::Ref<std::vector<reco::PFRecTrack>,reco::PFRecTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecTrack>,reco::PFRecTrack> > >"/>
+
+ <class name="reco::PFV0"  ClassVersion="10">
+  <version ClassVersion="10" checksum="40832700"/>
+ </class>
+  <class name="std::vector<reco::PFV0>" />
+  <class name="edm::Wrapper<std::vector<reco::PFV0> >" />
+  <class name="edm::Ref<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" />
+  <class name="edm::RefProd<std::vector<reco::PFV0> >" />
+  <class name="edm::RefVector<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" />
+<class name="edm::Ref<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate> >" />
+
+
+  <class name="reco::ConvBremSeed" ClassVersion="12">
+   <version ClassVersion="10" checksum="2980747190"/>
+   <version ClassVersion="11" checksum="637662266"/>
+   <version ClassVersion="12" checksum="2604169839"/>
+  </class>
+  <class name="std::vector<reco::ConvBremSeed>"/>
+  <class name="edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/>
+  <class name="edm::RefProd<std::vector<reco::ConvBremSeed> >"/>
+  <class name="edm::Wrapper<std::vector<reco::ConvBremSeed> >"/>
+  <class name="edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/>
+  <class name="edm::Wrapper<edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
+  <class name="edm::RefToBase<reco::ConvBremSeed>"/>
+  <class name="edm::reftobase::BaseHolder<reco::ConvBremSeed>" />
+  <class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
+  <class name="edm::reftobase::Holder<reco::ConvBremSeed,edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
+
 </selection>
+
 <exclusion>
+  <!-- from classes_def_2.xml -->
   <class name="edm::OwnVector<reco::PFBlockElement, edm::ClonePolicy<reco::PFBlockElement> >">
     <method name="sort"/>
   </class>
diff --git a/DataFormats/ParticleFlowReco/src/classes_def_1.xml b/DataFormats/ParticleFlowReco/src/classes_def_1.xml
deleted file mode 100644
index 58b21e59e3c35..0000000000000
--- a/DataFormats/ParticleFlowReco/src/classes_def_1.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<lcgdict>
-<selection>
-
-
-  <class name="reco::PFNuclearInteraction"  ClassVersion="10">
-   <version ClassVersion="10" checksum="1573561360"/>
-  </class>
-  <class name="std::vector<reco::PFNuclearInteraction>" />
-  <class name="edm::Wrapper<std::vector<reco::PFNuclearInteraction> >" />
-  <class name="edm::Ref<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" />
-  <class name="edm::RefProd<std::vector<reco::PFNuclearInteraction> >" />
-  <class name="edm::RefVector<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction, edm::refhelper::FindUsingAdvance<std::vector<reco::PFNuclearInteraction>, reco::PFNuclearInteraction> >" />
-
-
-  <class name="reco::PFDisplacedTrackerVertex"  ClassVersion="10">
-   <version ClassVersion="10" checksum="2059737151"/>
-  </class>
-  <class name="std::vector<reco::PFDisplacedTrackerVertex>" />
-  <class name="edm::Wrapper<std::vector<reco::PFDisplacedTrackerVertex> >" />
-  <class name="edm::Ref<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" />
-  <class name="edm::RefProd<std::vector<reco::PFDisplacedTrackerVertex> >" />
-  <class name="edm::RefVector<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex, edm::refhelper::FindUsingAdvance<std::vector<reco::PFDisplacedTrackerVertex>, reco::PFDisplacedTrackerVertex> >" />
-
-  <class name="reco::PFConversion" ClassVersion="10">
-   <version ClassVersion="10" checksum="2417207933"/>
-  </class>
-  <class name="std::vector<reco::PFConversion>"/>
-  <class name="edm::Wrapper<std::vector<reco::PFConversion> >"/>
-  <class name="edm::Ref<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/>
-  <class name="edm::RefProd<std::vector<reco::PFConversion> >"/>
-  <class name="edm::RefVector<std::vector<reco::PFConversion>,reco::PFConversion,edm::refhelper::FindUsingAdvance<std::vector<reco::PFConversion>,reco::PFConversion> >"/>
-  <class name="std::vector<edm::Ref<std::vector<reco::PFRecTrack>,reco::PFRecTrack,edm::refhelper::FindUsingAdvance<std::vector<reco::PFRecTrack>,reco::PFRecTrack> > >"/>
-
- <class name="reco::PFV0"  ClassVersion="10">
-  <version ClassVersion="10" checksum="40832700"/>
- </class>
-  <class name="std::vector<reco::PFV0>" />
-  <class name="edm::Wrapper<std::vector<reco::PFV0> >" />
-  <class name="edm::Ref<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" />
-  <class name="edm::RefProd<std::vector<reco::PFV0> >" />
-  <class name="edm::RefVector<std::vector<reco::PFV0>, reco::PFV0, edm::refhelper::FindUsingAdvance<std::vector<reco::PFV0>, reco::PFV0> >" />
-<class name="edm::Ref<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate,edm::refhelper::FindUsingAdvance<std::vector<reco::VertexCompositeCandidate>,reco::VertexCompositeCandidate> >" />
-
-
-  <class name="reco::ConvBremSeed" ClassVersion="12">
-   <version ClassVersion="10" checksum="2980747190"/>
-   <version ClassVersion="11" checksum="637662266"/>
-   <version ClassVersion="12" checksum="2604169839"/>
-  </class>
-  <class name="std::vector<reco::ConvBremSeed>"/>
-  <class name="edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/>
-  <class name="edm::RefProd<std::vector<reco::ConvBremSeed> >"/>
-  <class name="edm::Wrapper<std::vector<reco::ConvBremSeed> >"/>
-  <class name="edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> >"/>
-  <class name="edm::Wrapper<edm::RefVector<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
-  <class name="edm::RefToBase<reco::ConvBremSeed>"/>
-  <class name="edm::reftobase::BaseHolder<reco::ConvBremSeed>" />
-  <class name="edm::reftobase::RefHolder<edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
-  <class name="edm::reftobase::Holder<reco::ConvBremSeed,edm::Ref<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed,edm::refhelper::FindUsingAdvance<std::vector<reco::ConvBremSeed>,reco::ConvBremSeed> > >"/>
-
-
-</selection>
-</lcgdict>
-