diff --git a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.icc b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc
similarity index 70%
rename from TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.icc
rename to TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc
index 3021e959b79b9..5542cbb7d5c31 100644
--- a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.icc
+++ b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.cc
@@ -1,19 +1,37 @@
-#include "TrackingTools/GsfTools/interface/CloseComponentsMerger.h"
-#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "TrackingTools/GsfTools/interface/CloseComponentsMerger.h"
+#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 
-#include <iostream>
+/** Provides the "CloseComponents" algorithm ("Merger") for reducing 
+ * the number of components in a multi-
+ */
 
-// #include "TrackingTools/GsfTools/interface/MultiGaussianState.h"
-// #include "TrackingTools/GsfTools/interface/SingleGaussianState.h"
-// #include "TrackingTools/GsfTools/interface/SingleGaussianState.h"
+template <unsigned int N>
+class CloseComponentsMergerESProducer : public edm::ESProducer {
+public:
+  CloseComponentsMergerESProducer(const edm::ParameterSet& p);
+  ~CloseComponentsMergerESProducer() override;
+  std::unique_ptr<MultiGaussianStateMerger<N> > produce(const TrackingComponentsRecord&);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  const int maxComp_;
+  const edm::ESGetToken<DistanceBetweenComponents<N>, TrackingComponentsRecord> distToken_;
+};
+
+#include "FWCore/Framework/interface/ModuleFactory.h"
+typedef CloseComponentsMergerESProducer<5> CloseComponentsMergerESProducer5D;
+DEFINE_FWK_EVENTSETUP_MODULE(CloseComponentsMergerESProducer5D);
 
 template <unsigned int N>
 CloseComponentsMergerESProducer<N>::CloseComponentsMergerESProducer(const edm::ParameterSet& p)
diff --git a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h
deleted file mode 100644
index b307084517d50..0000000000000
--- a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CloseComponentsMergerESProducer_h_
-#define CloseComponentsMergerESProducer_h_
-
-#include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "TrackingTools/GsfTools/interface/CloseComponentsMerger.h"
-#include <memory>
-
-/** Provides the "CloseComponents" algorithm ("Merger") for reducing 
- * the number of components in a multi-
- */
-
-template <unsigned int N>
-class CloseComponentsMergerESProducer : public edm::ESProducer {
-public:
-  CloseComponentsMergerESProducer(const edm::ParameterSet &p);
-  ~CloseComponentsMergerESProducer() override;
-  std::unique_ptr<MultiGaussianStateMerger<N> > produce(const TrackingComponentsRecord &);
-
-  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
-
-private:
-  const int maxComp_;
-  const edm::ESGetToken<DistanceBetweenComponents<N>, TrackingComponentsRecord> distToken_;
-};
-
-#include "TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.icc"
-
-#endif
diff --git a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.icc b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc
similarity index 60%
rename from TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.icc
rename to TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc
index dcc410fedf641..c22836b22fe27 100644
--- a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.icc
+++ b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.cc
@@ -1,15 +1,35 @@
-#include "TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h"
-
-#include "TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h"
-// #include "TrackingTools/GsfTools/interface/MahalanobisDistance.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
+#include "TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-#include <string>
 #include <memory>
+#include <string>
+
+/** Provides algorithms to measure the distance between  components
+ * (currently either using a Kullback-Leibler or a Mahalanobis distance)
+ */
+
+template <unsigned int N>
+class DistanceBetweenComponentsESProducer : public edm::ESProducer {
+public:
+  DistanceBetweenComponentsESProducer(const edm::ParameterSet& p);
+
+  std::unique_ptr<DistanceBetweenComponents<N> > produce(const TrackingComponentsRecord&);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  const bool useKullbackLeibler_;
+};
+
+#include "FWCore/Framework/interface/ModuleFactory.h"
+typedef DistanceBetweenComponentsESProducer<5> DistanceBetweenComponentsESProducer5D;
+DEFINE_FWK_EVENTSETUP_MODULE(DistanceBetweenComponentsESProducer5D);
 
 template <unsigned int N>
 DistanceBetweenComponentsESProducer<N>::DistanceBetweenComponentsESProducer(const edm::ParameterSet& p)
@@ -37,4 +57,4 @@ void DistanceBetweenComponentsESProducer<N>::fillDescriptions(edm::Configuration
   desc.add<std::string>("ComponentName");
 
   descriptions.addDefault(desc);
-}
\ No newline at end of file
+}
diff --git a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h
deleted file mode 100644
index 4a2455a187e15..0000000000000
--- a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef DistanceBetweenComponentsESProducer_h_
-#define DistanceBetweenComponentsESProducer_h_
-
-#include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
-#include <memory>
-
-/** Provides algorithms to measure the distance between  components
- * (currently either using a Kullback-Leibler or a Mahalanobis distance)
- */
-
-template <unsigned int N>
-class DistanceBetweenComponentsESProducer : public edm::ESProducer {
-public:
-  DistanceBetweenComponentsESProducer(const edm::ParameterSet &p);
-
-  std::unique_ptr<DistanceBetweenComponents<N> > produce(const TrackingComponentsRecord &);
-
-  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
-
-private:
-  const bool useKullbackLeibler_;
-};
-
-#include "TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.icc"
-
-#endif
diff --git a/TrackingTools/GsfTools/plugins/module.cc b/TrackingTools/GsfTools/plugins/module.cc
deleted file mode 100644
index 81eeb836783f1..0000000000000
--- a/TrackingTools/GsfTools/plugins/module.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h"
-#include "TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h"
-
-#include "FWCore/Framework/interface/ModuleFactory.h"
-
-// DEFINE_FWK_EVENTSETUP_MODULE(CloseComponentsMergerESProducer);
-// DEFINE_FWK_EVENTSETUP_MODULE(DistanceBetweenComponentsESProducer);
-
-typedef CloseComponentsMergerESProducer<5> CloseComponentsMergerESProducer5D;
-typedef DistanceBetweenComponentsESProducer<5> DistanceBetweenComponentsESProducer5D;
-
-DEFINE_FWK_EVENTSETUP_MODULE(CloseComponentsMergerESProducer5D);
-DEFINE_FWK_EVENTSETUP_MODULE(DistanceBetweenComponentsESProducer5D);
-
-//   KullbackLeiblerDistance<5> kbd;