diff --git a/DataFormats/Common/interface/SortedCollection.h b/DataFormats/Common/interface/SortedCollection.h
index 523109ec78500..8bca0f397d15f 100644
--- a/DataFormats/Common/interface/SortedCollection.h
+++ b/DataFormats/Common/interface/SortedCollection.h
@@ -28,7 +28,7 @@ unreliable if such duplicate entries are made.
 #include "DataFormats/Common/interface/CMS_CLASS_VERSION.h"
 #include "DataFormats/Common/interface/fillPtrVector.h"
 #include "DataFormats/Common/interface/FillView.h"
-#include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/setPtr.h"
 #include "DataFormats/Common/interface/traits.h"
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "FWCore/Utilities/interface/EDMException.h"
diff --git a/DataFormats/FTLDigi/src/classes.h b/DataFormats/FTLDigi/src/classes.h
index 1015fcb0ef9c7..f02505a83dcfc 100644
--- a/DataFormats/FTLDigi/src/classes.h
+++ b/DataFormats/FTLDigi/src/classes.h
@@ -1,3 +1,4 @@
 #include <vector>
 #include "DataFormats/FTLDigi/interface/FTLDigiCollections.h"
 #include "DataFormats/FTLDigi/interface/PMTDSimAccumulator.h"
+#include "DataFormats/Common/interface/Ref.h"
diff --git a/DataFormats/HGCDigi/src/classes.h b/DataFormats/HGCDigi/src/classes.h
index c52ba2ba0c008..bd98c396de743 100644
--- a/DataFormats/HGCDigi/src/classes.h
+++ b/DataFormats/HGCDigi/src/classes.h
@@ -1,2 +1,3 @@
 #include <vector>
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
+#include "DataFormats/Common/interface/Ref.h"
diff --git a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
index 48f6dc47baba2..70f247497a338 100644
--- a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
+++ b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
@@ -1,3 +1,4 @@
+#include <cassert>
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include <EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h>
 #include <Geometry/EcalMapping/interface/EcalElectronicsMapping.h>
diff --git a/RecoCaloTools/Selectors/interface/CaloConeSelector.h b/RecoCaloTools/Selectors/interface/CaloConeSelector.h
index ff51fb85dadef..969f79193d7b3 100644
--- a/RecoCaloTools/Selectors/interface/CaloConeSelector.h
+++ b/RecoCaloTools/Selectors/interface/CaloConeSelector.h
@@ -5,6 +5,7 @@
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include <memory>
+#include <functional>
 
 /** \class CaloConeSelector
   *  
diff --git a/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h b/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
index 983ed7666a7dd..263669c83e699 100644
--- a/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
+++ b/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
@@ -5,6 +5,7 @@
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include <memory>
+#include <functional>
 
 /** \class CaloDualConeSelector
   *  
diff --git a/RecoCaloTools/Selectors/test/TestCaloSelectors.cc b/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
index f03d0ba3a7c06..7debfca154df2 100644
--- a/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
+++ b/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
@@ -11,6 +11,7 @@
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include <iostream>
+#include <functional>
 
 class TestCaloSelectors : public edm::one::EDAnalyzer<> {
 public:
diff --git a/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp b/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
index fe6aabf928aca..866ebbb304cd3 100644
--- a/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
+++ b/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
@@ -11,6 +11,7 @@
 #include <TPaveStats.h>
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
+#include "DataFormats/Common/interface/Wrapper.h"
 //#include "CUDADataFormats/HcalRecHitSoA/interface/RecHitCollection.h"
 
 #define CREATE_HIST_1D(varname, nbins, first, last) auto varname = new TH1D(#varname, #varname, nbins, first, last)