diff --git a/CommonTools/RecoAlgos/src/CandidateProducer.h b/CommonTools/RecoAlgos/interface/CandidateProducer.h
similarity index 100%
rename from CommonTools/RecoAlgos/src/CandidateProducer.h
rename to CommonTools/RecoAlgos/interface/CandidateProducer.h
diff --git a/CommonTools/RecoAlgos/src/MassiveCandidateConverter.h b/CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h
similarity index 100%
rename from CommonTools/RecoAlgos/src/MassiveCandidateConverter.h
rename to CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h
diff --git a/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h b/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h
index 394f9aae48cf6..224c9ec603cf1 100644
--- a/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h
+++ b/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_TrackToRefCandidate_h
 #define RecoAlgos_TrackToRefCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidateFwd.h"
diff --git a/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc b/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc
index 35ed449396ee0..12018c6de5d0f 100644
--- a/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc
+++ b/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc
@@ -1,5 +1,5 @@
 #include "CommonTools/RecoAlgos/src/RecoChargedRefCandidateToTrackRef.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
diff --git a/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc b/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc
index fdbbdb645c852..9f2733b32d829 100644
--- a/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc
+++ b/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HepPDT/ParticleData.hh"
 #include "FWCore/Framework/interface/ESHandle.h"
diff --git a/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h b/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h
index e4d69d8d750a2..e8c99a1287aef 100644
--- a/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h
+++ b/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_PFClusterToRefCandidate_h
 #define RecoAlgos_PFClusterToRefCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"
diff --git a/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h b/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h
index dc33670a700d2..0a00f7f809f7f 100644
--- a/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h
+++ b/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_StandAloneMuonTrackToCandidate_h
 #define RecoAlgos_StandAloneMuonTrackToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidateFwd.h"
diff --git a/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h b/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h
index 5f473303cc282..54bc8652ec80d 100644
--- a/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h
+++ b/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_SuperClusterToCandidate_h
 #define RecoAlgos_SuperClusterToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
diff --git a/CommonTools/RecoAlgos/src/TrackToCandidate.h b/CommonTools/RecoAlgos/src/TrackToCandidate.h
index 4764c0d8c6b2a..593772ef97157 100644
--- a/CommonTools/RecoAlgos/src/TrackToCandidate.h
+++ b/CommonTools/RecoAlgos/src/TrackToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_TrackToCandidate_h
 #define RecoAlgos_TrackToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
diff --git a/CommonTools/Utils/src/AnyMethodArgument.h b/CommonTools/Utils/interface/AnyMethodArgument.h
similarity index 100%
rename from CommonTools/Utils/src/AnyMethodArgument.h
rename to CommonTools/Utils/interface/AnyMethodArgument.h
diff --git a/CommonTools/Utils/src/BinaryCutSetter.h b/CommonTools/Utils/interface/BinaryCutSetter.h
similarity index 86%
rename from CommonTools/Utils/src/BinaryCutSetter.h
rename to CommonTools/Utils/interface/BinaryCutSetter.h
index 98a3881561e9b..b0ddcc8e785d5 100644
--- a/CommonTools/Utils/src/BinaryCutSetter.h
+++ b/CommonTools/Utils/interface/BinaryCutSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/LogicalBinaryOperator.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/LogicalBinaryOperator.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/BinarySelector.h b/CommonTools/Utils/interface/BinarySelector.h
similarity index 94%
rename from CommonTools/Utils/src/BinarySelector.h
rename to CommonTools/Utils/interface/BinarySelector.h
index acfe31fdf62fe..08e789945c626 100644
--- a/CommonTools/Utils/src/BinarySelector.h
+++ b/CommonTools/Utils/interface/BinarySelector.h
@@ -12,7 +12,7 @@
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/BinarySelectorSetter.h b/CommonTools/Utils/interface/BinarySelectorSetter.h
similarity index 87%
rename from CommonTools/Utils/src/BinarySelectorSetter.h
rename to CommonTools/Utils/interface/BinarySelectorSetter.h
index 60602ea43a23f..13dc51209c0c4 100644
--- a/CommonTools/Utils/src/BinarySelectorSetter.h
+++ b/CommonTools/Utils/interface/BinarySelectorSetter.h
@@ -10,10 +10,10 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ComparisonStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/BinarySelector.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ComparisonStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/BinarySelector.h"
 #include "CommonTools/Utils/interface/Exception.h"
 
 namespace reco {
diff --git a/CommonTools/Utils/src/Comparison.h b/CommonTools/Utils/interface/Comparison.h
similarity index 90%
rename from CommonTools/Utils/src/Comparison.h
rename to CommonTools/Utils/interface/Comparison.h
index 36b93d10600a6..c9e551f133d86 100644
--- a/CommonTools/Utils/src/Comparison.h
+++ b/CommonTools/Utils/interface/Comparison.h
@@ -10,7 +10,7 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ComparisonBase.h b/CommonTools/Utils/interface/ComparisonBase.h
similarity index 100%
rename from CommonTools/Utils/src/ComparisonBase.h
rename to CommonTools/Utils/interface/ComparisonBase.h
diff --git a/CommonTools/Utils/src/ComparisonSetter.h b/CommonTools/Utils/interface/ComparisonSetter.h
similarity index 90%
rename from CommonTools/Utils/src/ComparisonSetter.h
rename to CommonTools/Utils/interface/ComparisonSetter.h
index d939b5af68671..37359abed80fc 100644
--- a/CommonTools/Utils/src/ComparisonSetter.h
+++ b/CommonTools/Utils/interface/ComparisonSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ComparisonStack.h"
-#include "CommonTools/Utils/src/Comparison.h"
+#include "CommonTools/Utils/interface/ComparisonStack.h"
+#include "CommonTools/Utils/interface/Comparison.h"
 #ifdef BOOST_SPIRIT_DEBUG
 #include <iostream>
 #include <string>
diff --git a/CommonTools/Utils/src/ComparisonStack.h b/CommonTools/Utils/interface/ComparisonStack.h
similarity index 100%
rename from CommonTools/Utils/src/ComparisonStack.h
rename to CommonTools/Utils/interface/ComparisonStack.h
diff --git a/CommonTools/Utils/src/CutSetter.h b/CommonTools/Utils/interface/CutSetter.h
similarity index 93%
rename from CommonTools/Utils/src/CutSetter.h
rename to CommonTools/Utils/interface/CutSetter.h
index 5c4f37a85fc5f..43c5a67ec9d94 100644
--- a/CommonTools/Utils/src/CutSetter.h
+++ b/CommonTools/Utils/interface/CutSetter.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorPtr.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 #include <cassert>
 
 namespace reco {
diff --git a/CommonTools/Utils/src/ExpressionBinaryOperator.h b/CommonTools/Utils/interface/ExpressionBinaryOperator.h
similarity index 94%
rename from CommonTools/Utils/src/ExpressionBinaryOperator.h
rename to CommonTools/Utils/interface/ExpressionBinaryOperator.h
index aaa7c479881db..1bff443ea24be 100644
--- a/CommonTools/Utils/src/ExpressionBinaryOperator.h
+++ b/CommonTools/Utils/interface/ExpressionBinaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h b/CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h
similarity index 88%
rename from CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h
rename to CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h
index 0e85de62b2f70..d695a9eeed6a6 100644
--- a/CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h
+++ b/CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionBinaryOperator.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionBinaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 #include <cmath>
 
 namespace reco {
diff --git a/CommonTools/Utils/src/ExpressionConditionSetter.h b/CommonTools/Utils/interface/ExpressionConditionSetter.h
similarity index 85%
rename from CommonTools/Utils/src/ExpressionConditionSetter.h
rename to CommonTools/Utils/interface/ExpressionConditionSetter.h
index d62a4a2bfc8fe..e72435f507b2c 100644
--- a/CommonTools/Utils/src/ExpressionConditionSetter.h
+++ b/CommonTools/Utils/interface/ExpressionConditionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionFunctionSetter.h b/CommonTools/Utils/interface/ExpressionFunctionSetter.h
similarity index 85%
rename from CommonTools/Utils/src/ExpressionFunctionSetter.h
rename to CommonTools/Utils/interface/ExpressionFunctionSetter.h
index 8a6c2b02d051c..00fddcb5793e5 100644
--- a/CommonTools/Utils/src/ExpressionFunctionSetter.h
+++ b/CommonTools/Utils/interface/ExpressionFunctionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/FunctionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/FunctionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionNumber.h b/CommonTools/Utils/interface/ExpressionNumber.h
similarity index 100%
rename from CommonTools/Utils/src/ExpressionNumber.h
rename to CommonTools/Utils/interface/ExpressionNumber.h
diff --git a/CommonTools/Utils/src/ExpressionNumberSetter.h b/CommonTools/Utils/interface/ExpressionNumberSetter.h
similarity index 85%
rename from CommonTools/Utils/src/ExpressionNumberSetter.h
rename to CommonTools/Utils/interface/ExpressionNumberSetter.h
index 87f5a8d752886..bc78f6629b50b 100644
--- a/CommonTools/Utils/src/ExpressionNumberSetter.h
+++ b/CommonTools/Utils/interface/ExpressionNumberSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.3 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionNumber.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionNumber.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionSelectorSetter.h b/CommonTools/Utils/interface/ExpressionSelectorSetter.h
similarity index 84%
rename from CommonTools/Utils/src/ExpressionSelectorSetter.h
rename to CommonTools/Utils/interface/ExpressionSelectorSetter.h
index 0383ea68a8198..72de53f5c4938 100644
--- a/CommonTools/Utils/src/ExpressionSelectorSetter.h
+++ b/CommonTools/Utils/interface/ExpressionSelectorSetter.h
@@ -10,11 +10,11 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/BinarySelector.h"
-#include "CommonTools/Utils/src/ExpressionNumber.h"
-#include "CommonTools/Utils/src/Comparison.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/BinarySelector.h"
+#include "CommonTools/Utils/interface/ExpressionNumber.h"
+#include "CommonTools/Utils/interface/Comparison.h"
 #include "CommonTools/Utils/interface/Exception.h"
 
 #include <functional>
diff --git a/CommonTools/Utils/src/ExpressionSetter.h b/CommonTools/Utils/interface/ExpressionSetter.h
similarity index 92%
rename from CommonTools/Utils/src/ExpressionSetter.h
rename to CommonTools/Utils/interface/ExpressionSetter.h
index b1538e0a304e2..41d035b5628ad 100644
--- a/CommonTools/Utils/src/ExpressionSetter.h
+++ b/CommonTools/Utils/interface/ExpressionSetter.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionPtr.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionStack.h b/CommonTools/Utils/interface/ExpressionStack.h
similarity index 100%
rename from CommonTools/Utils/src/ExpressionStack.h
rename to CommonTools/Utils/interface/ExpressionStack.h
diff --git a/CommonTools/Utils/src/ExpressionUnaryOperator.h b/CommonTools/Utils/interface/ExpressionUnaryOperator.h
similarity index 93%
rename from CommonTools/Utils/src/ExpressionUnaryOperator.h
rename to CommonTools/Utils/interface/ExpressionUnaryOperator.h
index 8657673931dab..6126c03655141 100644
--- a/CommonTools/Utils/src/ExpressionUnaryOperator.h
+++ b/CommonTools/Utils/interface/ExpressionUnaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h b/CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h
similarity index 90%
rename from CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h
rename to CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h
index 8f0cfc1c61ca7..19463fa92ffde 100644
--- a/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h
+++ b/CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionUnaryOperator.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 #ifdef BOOST_SPIRIT_DEBUG
 #include <string>
 #include <iostream>
diff --git a/CommonTools/Utils/src/ExpressionVarSetter.h b/CommonTools/Utils/interface/ExpressionVarSetter.h
similarity index 86%
rename from CommonTools/Utils/src/ExpressionVarSetter.h
rename to CommonTools/Utils/interface/ExpressionVarSetter.h
index bbcaab3007a31..f101e195a1bd0 100644
--- a/CommonTools/Utils/src/ExpressionVarSetter.h
+++ b/CommonTools/Utils/interface/ExpressionVarSetter.h
@@ -10,9 +10,9 @@
  * \version $Revision: 1.3 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/Function.h b/CommonTools/Utils/interface/Function.h
similarity index 100%
rename from CommonTools/Utils/src/Function.h
rename to CommonTools/Utils/interface/Function.h
diff --git a/CommonTools/Utils/src/FunctionSetter.h b/CommonTools/Utils/interface/FunctionSetter.h
similarity index 90%
rename from CommonTools/Utils/src/FunctionSetter.h
rename to CommonTools/Utils/interface/FunctionSetter.h
index d64aad5163c88..69995e32db702 100644
--- a/CommonTools/Utils/src/FunctionSetter.h
+++ b/CommonTools/Utils/interface/FunctionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/Function.h"
-#include "CommonTools/Utils/src/FunctionStack.h"
+#include "CommonTools/Utils/interface/Function.h"
+#include "CommonTools/Utils/interface/FunctionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/FunctionStack.h b/CommonTools/Utils/interface/FunctionStack.h
similarity index 87%
rename from CommonTools/Utils/src/FunctionStack.h
rename to CommonTools/Utils/interface/FunctionStack.h
index addad24d49ba9..0583e62d18cb8 100644
--- a/CommonTools/Utils/src/FunctionStack.h
+++ b/CommonTools/Utils/interface/FunctionStack.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/Function.h"
+#include "CommonTools/Utils/interface/Function.h"
 #include <vector>
 
 namespace reco {
diff --git a/CommonTools/Utils/interface/Grammar.h b/CommonTools/Utils/interface/Grammar.h
index b4e729053a5d0..4fbcd546b0d51 100644
--- a/CommonTools/Utils/interface/Grammar.h
+++ b/CommonTools/Utils/interface/Grammar.h
@@ -14,31 +14,30 @@
 #include "boost/spirit/include/classic_grammar_def.hpp"
 #include "boost/spirit/include/classic_chset.hpp"
 #include <functional>
-#include "CommonTools/Utils/src/ExpressionNumberSetter.h"
-#include "CommonTools/Utils/src/ExpressionVarSetter.h"
-#include "CommonTools/Utils/src/ExpressionFunctionSetter.h"
-#include "CommonTools/Utils/src/ExpressionConditionSetter.h"
-#include "CommonTools/Utils/src/ComparisonSetter.h"
-#include "CommonTools/Utils/src/BinarySelectorSetter.h"
-#include "CommonTools/Utils/src/TrinarySelectorSetter.h"
-#include "CommonTools/Utils/src/IntSetter.h"
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
-#include "CommonTools/Utils/src/IntStack.h"
-#include "CommonTools/Utils/src/FunctionSetter.h"
-#include "CommonTools/Utils/src/CutSetter.h"
-#include "CommonTools/Utils/src/BinaryCutSetter.h"
-#include "CommonTools/Utils/src/UnaryCutSetter.h"
-#include "CommonTools/Utils/src/ExpressionSetter.h"
-#include "CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h"
-#include "CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h"
-#include "CommonTools/Utils/src/ExpressionSelectorSetter.h"
-#include "CommonTools/Utils/src/MethodSetter.h"
-#include "CommonTools/Utils/src/MethodArgumentSetter.h"
+#include "CommonTools/Utils/interface/ExpressionNumberSetter.h"
+#include "CommonTools/Utils/interface/ExpressionVarSetter.h"
+#include "CommonTools/Utils/interface/ExpressionFunctionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionConditionSetter.h"
+#include "CommonTools/Utils/interface/ComparisonSetter.h"
+#include "CommonTools/Utils/interface/BinarySelectorSetter.h"
+#include "CommonTools/Utils/interface/TrinarySelectorSetter.h"
+#include "CommonTools/Utils/interface/IntSetter.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
+#include "CommonTools/Utils/interface/IntStack.h"
+#include "CommonTools/Utils/interface/FunctionSetter.h"
+#include "CommonTools/Utils/interface/CutSetter.h"
+#include "CommonTools/Utils/interface/BinaryCutSetter.h"
+#include "CommonTools/Utils/interface/UnaryCutSetter.h"
+#include "CommonTools/Utils/interface/ExpressionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h"
+#include "CommonTools/Utils/interface/ExpressionSelectorSetter.h"
+#include "CommonTools/Utils/interface/MethodSetter.h"
+#include "CommonTools/Utils/interface/MethodArgumentSetter.h"
 #include "CommonTools/Utils/interface/Exception.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
-// #include "CommonTools/Utils/src/Abort.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/IntSetter.h b/CommonTools/Utils/interface/IntSetter.h
similarity index 90%
rename from CommonTools/Utils/src/IntSetter.h
rename to CommonTools/Utils/interface/IntSetter.h
index ffe76828f6579..e0bd74c71a6ea 100644
--- a/CommonTools/Utils/src/IntSetter.h
+++ b/CommonTools/Utils/interface/IntSetter.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/IntStack.h"
+#include "CommonTools/Utils/interface/IntStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/IntStack.h b/CommonTools/Utils/interface/IntStack.h
similarity index 100%
rename from CommonTools/Utils/src/IntStack.h
rename to CommonTools/Utils/interface/IntStack.h
diff --git a/CommonTools/Utils/src/LogicalBinaryOperator.h b/CommonTools/Utils/interface/LogicalBinaryOperator.h
similarity index 95%
rename from CommonTools/Utils/src/LogicalBinaryOperator.h
rename to CommonTools/Utils/interface/LogicalBinaryOperator.h
index 0f2cfadd3da49..8dc6112e25caa 100644
--- a/CommonTools/Utils/src/LogicalBinaryOperator.h
+++ b/CommonTools/Utils/interface/LogicalBinaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/LogicalUnaryOperator.h b/CommonTools/Utils/interface/LogicalUnaryOperator.h
similarity index 93%
rename from CommonTools/Utils/src/LogicalUnaryOperator.h
rename to CommonTools/Utils/interface/LogicalUnaryOperator.h
index d24d64ffe3469..5a60d9c057d58 100644
--- a/CommonTools/Utils/src/LogicalUnaryOperator.h
+++ b/CommonTools/Utils/interface/LogicalUnaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/MethodArgumentSetter.h b/CommonTools/Utils/interface/MethodArgumentSetter.h
similarity index 94%
rename from CommonTools/Utils/src/MethodArgumentSetter.h
rename to CommonTools/Utils/interface/MethodArgumentSetter.h
index e6dbc6ce011ca..4f8542e065eaf 100644
--- a/CommonTools/Utils/src/MethodArgumentSetter.h
+++ b/CommonTools/Utils/interface/MethodArgumentSetter.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
 #include <cassert>
 
 namespace reco {
diff --git a/CommonTools/Utils/src/MethodArgumentStack.h b/CommonTools/Utils/interface/MethodArgumentStack.h
similarity index 88%
rename from CommonTools/Utils/src/MethodArgumentStack.h
rename to CommonTools/Utils/interface/MethodArgumentStack.h
index f0427b0ca5220..21cec691679b9 100644
--- a/CommonTools/Utils/src/MethodArgumentStack.h
+++ b/CommonTools/Utils/interface/MethodArgumentStack.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 #include <vector>
 
 namespace reco {
diff --git a/CommonTools/Utils/src/MethodInvoker.h b/CommonTools/Utils/interface/MethodInvoker.h
similarity index 97%
rename from CommonTools/Utils/src/MethodInvoker.h
rename to CommonTools/Utils/interface/MethodInvoker.h
index ff133b17a8ac9..dde8be30764ab 100644
--- a/CommonTools/Utils/src/MethodInvoker.h
+++ b/CommonTools/Utils/interface/MethodInvoker.h
@@ -1,8 +1,8 @@
 #ifndef CommonTools_Utils_MethodInvoker_h
 #define CommonTools_Utils_MethodInvoker_h
 
-#include "CommonTools/Utils/src/AnyMethodArgument.h"
-#include "CommonTools/Utils/src/TypeCode.h"
+#include "CommonTools/Utils/interface/AnyMethodArgument.h"
+#include "CommonTools/Utils/interface/TypeCode.h"
 #include "FWCore/Reflection/interface/FunctionWithDict.h"
 #include "FWCore/Reflection/interface/MemberWithDict.h"
 #include "FWCore/Reflection/interface/ObjectWithDict.h"
diff --git a/CommonTools/Utils/src/MethodSetter.h b/CommonTools/Utils/interface/MethodSetter.h
similarity index 93%
rename from CommonTools/Utils/src/MethodSetter.h
rename to CommonTools/Utils/interface/MethodSetter.h
index beab8a579c478..28120cab06119 100644
--- a/CommonTools/Utils/src/MethodSetter.h
+++ b/CommonTools/Utils/interface/MethodSetter.h
@@ -7,9 +7,9 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/MethodStack.h b/CommonTools/Utils/interface/MethodStack.h
similarity index 88%
rename from CommonTools/Utils/src/MethodStack.h
rename to CommonTools/Utils/interface/MethodStack.h
index 4cec5795c426c..bcd11a0b31323 100644
--- a/CommonTools/Utils/src/MethodStack.h
+++ b/CommonTools/Utils/interface/MethodStack.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 #include <vector>
 
 namespace reco {
diff --git a/CommonTools/Utils/src/SelectorStack.h b/CommonTools/Utils/interface/SelectorStack.h
similarity index 100%
rename from CommonTools/Utils/src/SelectorStack.h
rename to CommonTools/Utils/interface/SelectorStack.h
diff --git a/CommonTools/Utils/src/TrinarySelector.h b/CommonTools/Utils/interface/TrinarySelector.h
similarity index 95%
rename from CommonTools/Utils/src/TrinarySelector.h
rename to CommonTools/Utils/interface/TrinarySelector.h
index 56af002d5783b..c3f1696cc3c1d 100644
--- a/CommonTools/Utils/src/TrinarySelector.h
+++ b/CommonTools/Utils/interface/TrinarySelector.h
@@ -12,7 +12,7 @@
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/TrinarySelectorSetter.h b/CommonTools/Utils/interface/TrinarySelectorSetter.h
similarity index 86%
rename from CommonTools/Utils/src/TrinarySelectorSetter.h
rename to CommonTools/Utils/interface/TrinarySelectorSetter.h
index 8ce5277ada70e..1019e90a51e4c 100644
--- a/CommonTools/Utils/src/TrinarySelectorSetter.h
+++ b/CommonTools/Utils/interface/TrinarySelectorSetter.h
@@ -10,10 +10,10 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ComparisonStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/TrinarySelector.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ComparisonStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/TrinarySelector.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/TypeCode.h b/CommonTools/Utils/interface/TypeCode.h
similarity index 100%
rename from CommonTools/Utils/src/TypeCode.h
rename to CommonTools/Utils/interface/TypeCode.h
diff --git a/CommonTools/Utils/src/TypeStack.h b/CommonTools/Utils/interface/TypeStack.h
similarity index 100%
rename from CommonTools/Utils/src/TypeStack.h
rename to CommonTools/Utils/interface/TypeStack.h
diff --git a/CommonTools/Utils/src/UnaryCutSetter.h b/CommonTools/Utils/interface/UnaryCutSetter.h
similarity index 86%
rename from CommonTools/Utils/src/UnaryCutSetter.h
rename to CommonTools/Utils/interface/UnaryCutSetter.h
index 7c94daeffc8cb..9c4d8c88918b8 100644
--- a/CommonTools/Utils/src/UnaryCutSetter.h
+++ b/CommonTools/Utils/interface/UnaryCutSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/LogicalUnaryOperator.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/LogicalUnaryOperator.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/interface/returnType.h b/CommonTools/Utils/interface/returnType.h
index 23dd7d7370735..0b506fcf4a645 100644
--- a/CommonTools/Utils/interface/returnType.h
+++ b/CommonTools/Utils/interface/returnType.h
@@ -7,7 +7,7 @@
  *
  */
 
-#include "CommonTools/Utils/src/TypeCode.h"
+#include "CommonTools/Utils/interface/TypeCode.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
 
 namespace edm {
diff --git a/CommonTools/Utils/src/ComparisonSetter.cc b/CommonTools/Utils/src/ComparisonSetter.cc
index c04bd0f4d0149..c4ddb5c96b8bc 100644
--- a/CommonTools/Utils/src/ComparisonSetter.cc
+++ b/CommonTools/Utils/src/ComparisonSetter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/ComparisonSetter.h"
+#include "CommonTools/Utils/interface/ComparisonSetter.h"
 
 #ifdef BOOST_SPIRIT_DEBUG
 namespace reco {
diff --git a/CommonTools/Utils/src/ExpressionCondition.h b/CommonTools/Utils/src/ExpressionCondition.h
index 5a59facbd527b..06d8b0d48ac9b 100644
--- a/CommonTools/Utils/src/ExpressionCondition.h
+++ b/CommonTools/Utils/src/ExpressionCondition.h
@@ -12,8 +12,8 @@
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
 #include "CommonTools/Utils/interface/SelectorBase.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionConditionSetter.cc b/CommonTools/Utils/src/ExpressionConditionSetter.cc
index 2dd869078913f..de3e1f1ee8769 100644
--- a/CommonTools/Utils/src/ExpressionConditionSetter.cc
+++ b/CommonTools/Utils/src/ExpressionConditionSetter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/ExpressionConditionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionConditionSetter.h"
 #include "CommonTools/Utils/src/ExpressionCondition.h"
 
 using namespace reco::parser;
diff --git a/CommonTools/Utils/src/ExpressionFunctionSetter.cc b/CommonTools/Utils/src/ExpressionFunctionSetter.cc
index bbddeb2206e68..7d118c3a6ef6a 100644
--- a/CommonTools/Utils/src/ExpressionFunctionSetter.cc
+++ b/CommonTools/Utils/src/ExpressionFunctionSetter.cc
@@ -1,6 +1,6 @@
-#include "CommonTools/Utils/src/ExpressionFunctionSetter.h"
-#include "CommonTools/Utils/src/ExpressionUnaryOperator.h"
-#include "CommonTools/Utils/src/ExpressionBinaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionFunctionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionBinaryOperator.h"
 #include "CommonTools/Utils/src/ExpressionQuaterOperator.h"
 #include <cmath>
 #include <Math/ProbFuncMathCore.h>
diff --git a/CommonTools/Utils/src/ExpressionQuaterOperator.h b/CommonTools/Utils/src/ExpressionQuaterOperator.h
index e3c856f184340..d79bc4ec5d275 100644
--- a/CommonTools/Utils/src/ExpressionQuaterOperator.h
+++ b/CommonTools/Utils/src/ExpressionQuaterOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {
diff --git a/CommonTools/Utils/src/ExpressionSetter.cc b/CommonTools/Utils/src/ExpressionSetter.cc
index 6738c0851eb7c..775983bea771e 100644
--- a/CommonTools/Utils/src/ExpressionSetter.cc
+++ b/CommonTools/Utils/src/ExpressionSetter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/ExpressionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionSetter.h"
 #include "CommonTools/Utils/src/AndCombiner.h"
 #include "CommonTools/Utils/src/OrCombiner.h"
 #include "CommonTools/Utils/src/NotCombiner.h"
diff --git a/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.cc b/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.cc
index d73c97318d7a8..3bc728b198ad9 100644
--- a/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.cc
+++ b/CommonTools/Utils/src/ExpressionUnaryOperatorSetter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h"
 
 using namespace reco::parser;
 
diff --git a/CommonTools/Utils/src/ExpressionVar.cc b/CommonTools/Utils/src/ExpressionVar.cc
index dd374c5eaef17..8d47b7629a597 100644
--- a/CommonTools/Utils/src/ExpressionVar.cc
+++ b/CommonTools/Utils/src/ExpressionVar.cc
@@ -1,5 +1,5 @@
 #include "CommonTools/Utils/src/ExpressionVar.h"
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 
 #include "FWCore/Reflection/interface/ObjectWithDict.h"
 #include "FWCore/Reflection/interface/FunctionWithDict.h"
diff --git a/CommonTools/Utils/src/ExpressionVar.h b/CommonTools/Utils/src/ExpressionVar.h
index f79f897b70a21..41e17e2b84614 100644
--- a/CommonTools/Utils/src/ExpressionVar.h
+++ b/CommonTools/Utils/src/ExpressionVar.h
@@ -11,8 +11,8 @@
  */
 
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/MethodInvoker.h"
-#include "CommonTools/Utils/src/TypeCode.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
+#include "CommonTools/Utils/interface/TypeCode.h"
 
 #include <vector>
 
diff --git a/CommonTools/Utils/src/ExpressionVarSetter.cc b/CommonTools/Utils/src/ExpressionVarSetter.cc
index 4942868b400d7..1ad0cdd0d9fc4 100644
--- a/CommonTools/Utils/src/ExpressionVarSetter.cc
+++ b/CommonTools/Utils/src/ExpressionVarSetter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/ExpressionVarSetter.h"
+#include "CommonTools/Utils/interface/ExpressionVarSetter.h"
 #include "CommonTools/Utils/src/ExpressionVar.h"
 #include "CommonTools/Utils/interface/returnType.h"
 #include "CommonTools/Utils/interface/Exception.h"
diff --git a/CommonTools/Utils/src/LogicalBinaryOperator.cc b/CommonTools/Utils/src/LogicalBinaryOperator.cc
index e0c150e2da86c..537bea87c35f6 100644
--- a/CommonTools/Utils/src/LogicalBinaryOperator.cc
+++ b/CommonTools/Utils/src/LogicalBinaryOperator.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/Utils/src/LogicalBinaryOperator.h"
+#include "CommonTools/Utils/interface/LogicalBinaryOperator.h"
 
 using namespace reco::parser;
 template <>
diff --git a/CommonTools/Utils/src/MethodInvoker.cc b/CommonTools/Utils/src/MethodInvoker.cc
index 787a94ce81362..2370c22428970 100644
--- a/CommonTools/Utils/src/MethodInvoker.cc
+++ b/CommonTools/Utils/src/MethodInvoker.cc
@@ -1,7 +1,7 @@
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 
 #include "CommonTools/Utils/src/ExpressionVar.h"
-#include "CommonTools/Utils/src/MethodSetter.h"
+#include "CommonTools/Utils/interface/MethodSetter.h"
 #include "CommonTools/Utils/src/findMethod.h"
 #include "CommonTools/Utils/interface/returnType.h"
 #include "FWCore/Utilities/interface/EDMException.h"
diff --git a/CommonTools/Utils/src/MethodSetter.cc b/CommonTools/Utils/src/MethodSetter.cc
index 36457fbda939d..9fadeaf248579 100644
--- a/CommonTools/Utils/src/MethodSetter.cc
+++ b/CommonTools/Utils/src/MethodSetter.cc
@@ -1,8 +1,8 @@
-#include "CommonTools/Utils/src/MethodSetter.h"
+#include "CommonTools/Utils/interface/MethodSetter.h"
 
 #include "CommonTools/Utils/interface/Exception.h"
 #include "CommonTools/Utils/src/ErrorCodes.h"
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 #include "CommonTools/Utils/src/findDataMember.h"
 #include "CommonTools/Utils/src/findMethod.h"
 #include "CommonTools/Utils/interface/returnType.h"
diff --git a/CommonTools/Utils/src/findMethod.h b/CommonTools/Utils/src/findMethod.h
index 4d18410aeefee..367d539f3fb2a 100644
--- a/CommonTools/Utils/src/findMethod.h
+++ b/CommonTools/Utils/src/findMethod.h
@@ -3,7 +3,7 @@
 #include "FWCore/Reflection/interface/FunctionWithDict.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
 #include <string>
-#include "CommonTools/Utils/src/AnyMethodArgument.h"
+#include "CommonTools/Utils/interface/AnyMethodArgument.h"
 
 namespace reco {
   // second pair member is true if a reference is found
diff --git a/DQM/Physics/src/QcdUeDQM.cc b/DQM/Physics/src/QcdUeDQM.cc
index cf42e21baf121..9fe3cb09d7158 100644
--- a/DQM/Physics/src/QcdUeDQM.cc
+++ b/DQM/Physics/src/QcdUeDQM.cc
@@ -17,7 +17,6 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "CommonTools/RecoAlgos/interface/TrackToRefCandidate.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"