diff --git a/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc b/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc
index f6fcfd88b0405..2b4c9e3a428c5 100644
--- a/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc
+++ b/FastSimulation/Utilities/src/RandomEngineAndDistribution.cc
@@ -3,7 +3,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
 
 #include "CLHEP/Random/RandomEngine.h"
 
diff --git a/IOMC/RandomEngine/src/TRandomAdaptor.h b/IOMC/RandomEngine/interface/TRandomAdaptor.h
similarity index 100%
rename from IOMC/RandomEngine/src/TRandomAdaptor.h
rename to IOMC/RandomEngine/interface/TRandomAdaptor.h
diff --git a/IOMC/RandomEngine/src/RandomNumberGeneratorService.cc b/IOMC/RandomEngine/src/RandomNumberGeneratorService.cc
index 49017f5bcead9..f1843a0b59528 100644
--- a/IOMC/RandomEngine/src/RandomNumberGeneratorService.cc
+++ b/IOMC/RandomEngine/src/RandomNumberGeneratorService.cc
@@ -34,7 +34,7 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
+#include "IOMC/RandomEngine/interface/TRandomAdaptor.h"
 #include "SimDataFormats/RandomEngine/interface/RandomEngineState.h"
 #include "SimDataFormats/RandomEngine/interface/RandomEngineStates.h"
 
diff --git a/IOMC/RandomEngine/src/TRandomAdaptor.cc b/IOMC/RandomEngine/src/TRandomAdaptor.cc
index 719fe277f4773..2910610de5ca8 100644
--- a/IOMC/RandomEngine/src/TRandomAdaptor.cc
+++ b/IOMC/RandomEngine/src/TRandomAdaptor.cc
@@ -1,4 +1,4 @@
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
+#include "IOMC/RandomEngine/interface/TRandomAdaptor.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
 #include "CLHEP/Random/engineIDulong.h"
diff --git a/IOMC/RandomEngine/test/TestRandomNumberServiceGlobal.cc b/IOMC/RandomEngine/test/TestRandomNumberServiceGlobal.cc
index f13ec96c6419e..32a77d519a6f6 100644
--- a/IOMC/RandomEngine/test/TestRandomNumberServiceGlobal.cc
+++ b/IOMC/RandomEngine/test/TestRandomNumberServiceGlobal.cc
@@ -65,7 +65,7 @@ the text file containing the states.
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
+#include "IOMC/RandomEngine/interface/TRandomAdaptor.h"
 
 #include "CLHEP/Random/RandExponential.h"
 #include "CLHEP/Random/RandomEngine.h"
diff --git a/IORawData/CSCCommissioning/src/CSCFileReader.h b/IORawData/CSCCommissioning/src/CSCFileReader.h
index 79f0fac2e4be2..2a599dac02b5d 100644
--- a/IORawData/CSCCommissioning/src/CSCFileReader.h
+++ b/IORawData/CSCCommissioning/src/CSCFileReader.h
@@ -2,7 +2,6 @@
 #define CSCFileReader_h
 
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "IORawData/DTCommissioning/plugins/RawFile.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Provenance/interface/EventID.h"
diff --git a/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc b/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
index 020b4b1edaeab..956d2ffd0a336 100644
--- a/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
+++ b/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
@@ -39,8 +39,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 #include "SimTransport/PPSProtonTransport/interface/ProtonTransport.h"
+#include "CLHEP/Random/RandomEngine.h"
 #include "TRandom3.h"
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
 
 //
 // class declaration
diff --git a/SimTransport/HectorProducer/src/HectorProducer.cc b/SimTransport/HectorProducer/src/HectorProducer.cc
index 2b83376bee320..44c181bf1b794 100644
--- a/SimTransport/HectorProducer/src/HectorProducer.cc
+++ b/SimTransport/HectorProducer/src/HectorProducer.cc
@@ -8,7 +8,7 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "IOMC/RandomEngine/src/TRandomAdaptor.h"
+#include "IOMC/RandomEngine/interface/TRandomAdaptor.h"
 
 // SimpleConfigurable replacement
 #include "FWCore/ParameterSet/interface/ParameterSet.h"