diff --git a/hist/hbook/CMakeLists.txt b/hist/hbook/CMakeLists.txt
index c276a441018d1..6765490931122 100644
--- a/hist/hbook/CMakeLists.txt
+++ b/hist/hbook/CMakeLists.txt
@@ -8,12 +8,19 @@
 # CMakeLists.txt file for building ROOT hist/hbook package
 ############################################################################
 
+set(HBOOK_HEADERS
+  THbookBranch.h
+  THbookFile.h
+  THbookKey.h
+  THbookTree.h
+)
+
+set(RELATIVE_INC_HEADERS ${HBOOK_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Hbook
   HEADERS
-    THbookBranch.h
-    THbookFile.h
-    THbookKey.h
-    THbookTree.h
+    ${HBOOK_HEADERS}
   SOURCES
     src/THbookBranch.cxx
     src/THbookFile.cxx
@@ -31,6 +38,16 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hbook
     RIO
 )
 
+target_sources(Hbook
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
+
 # This is needed in particular for macOS, where the path of the GNU Fortran
 # library might not be in the default DYLD_LIBRARY_PATH, but it gets picked
 # up with enable_language(Fortran).
diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt
index d3b4610c72342..e45c43b132a54 100644
--- a/hist/hist/CMakeLists.txt
+++ b/hist/hist/CMakeLists.txt
@@ -8,94 +8,101 @@
 # CMakeLists.txt file for building ROOT hist/hist package
 ############################################################################
 
+set(HIST_HEADERS
+  Foption.h
+  HFitInterface.h
+  TAxis.h
+  TAxisModLab.h
+  TBackCompFitter.h
+  TBinomialEfficiencyFitter.h
+  TConfidenceLevel.h
+  TEfficiency.h
+  TF1.h
+  TF12.h
+  TF1AbsComposition.h
+  TF1Convolution.h
+  TF1NormSum.h
+  TF2.h
+  TF3.h
+  TFitResult.h
+  TFitResultPtr.h
+  TFormula.h
+  TFractionFitter.h
+  TGraph.h
+  TGraph2D.h
+  TGraph2DAsymmErrors.h
+  TGraph2DErrors.h
+  TGraphAsymmErrors.h
+  TGraphBentErrors.h
+  TGraphDelaunay.h
+  TGraphDelaunay2D.h
+  TGraphErrors.h
+  TGraphMultiErrors.h
+  TGraphSmooth.h
+  TGraphTime.h
+  TH1.h
+  TH1C.h
+  TH1D.h
+  TH1F.h
+  TH1I.h
+  TH1L.h
+  TH1S.h
+  TH2.h
+  TH2C.h
+  TH2D.h
+  TH2F.h
+  TH2I.h
+  TH2L.h
+  TH2Poly.h
+  TH2S.h
+  TH3.h
+  TH3C.h
+  TH3D.h
+  TH3F.h
+  TH3I.h
+  TH3L.h
+  TH3S.h
+  THLimitsFinder.h
+  THStack.h
+  THistRange.h
+  THn.h
+  THnBase.h
+  THnChain.h
+  THnSparse.h
+  THnSparse_Internal.h
+  TKDE.h
+  TLimit.h
+  TLimitDataSource.h
+  TMultiDimFit.h
+  TMultiGraph.h
+  TNDArray.h
+  TPolyMarker.h
+  TPrincipal.h
+  TProfile.h
+  TProfile2D.h
+  TProfile2Poly.h
+  TProfile3D.h
+  TSVDUnfold.h
+  TScatter.h
+  TScatter2D.h
+  TSpline.h
+  TVirtualFitter.h
+  TVirtualGraphPainter.h
+  TVirtualHistPainter.h
+  TVirtualPaveStats.h
+  Math/WrappedMultiTF1.h
+  Math/WrappedTF1.h
+  v5/TF1Data.h
+  v5/TFormula.h
+  v5/TFormulaPrimitive.h
+)
+
+set(RELATIVE_INC_HEADERS ${HIST_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Hist
   HEADERS
-    Foption.h
-    HFitInterface.h
-    TAxis.h
-    TAxisModLab.h
-    TBackCompFitter.h
-    TBinomialEfficiencyFitter.h
-    TConfidenceLevel.h
-    TEfficiency.h
-    TF12.h
-    TF1AbsComposition.h
-    TF1Convolution.h
-    TF1.h
-    TF1NormSum.h
-    TF2.h
-    TF3.h
-    TFitResult.h
-    TFitResultPtr.h
-    TFormula.h
-    TFractionFitter.h
-    THistRange.h
-    TGraph2DErrors.h
-    TGraph2DAsymmErrors.h
-    TGraph2D.h
-    TGraphAsymmErrors.h
-    TGraphMultiErrors.h
-    TGraphBentErrors.h
-    TGraphDelaunay2D.h
-    TGraphDelaunay.h
-    TGraphErrors.h
-    TGraph.h
-    TGraphSmooth.h
-    TGraphTime.h
-    TScatter.h
-    TScatter2D.h
-    TH1C.h
-    TH1D.h
-    TH1F.h
-    TH1.h
-    TH1I.h
-    TH1L.h
-    TH1S.h
-    TH2C.h
-    TH2D.h
-    TH2F.h
-    TH2.h
-    TH2I.h
-    TH2L.h
-    TH2Poly.h
-    TH2S.h
-    TH3C.h
-    TH3D.h
-    TH3F.h
-    TH3.h
-    TH3I.h
-    TH3L.h
-    TH3S.h
-    THLimitsFinder.h
-    THnBase.h
-    THnChain.h
-    THn.h
-    THnSparse.h
-    THnSparse_Internal.h
-    THStack.h
-    TKDE.h
-    TLimitDataSource.h
-    TLimit.h
-    TMultiDimFit.h
-    TMultiGraph.h
-    TNDArray.h
-    TPolyMarker.h
-    TPrincipal.h
-    TProfile2D.h
-    TProfile2Poly.h
-    TProfile3D.h
-    TProfile.h
-    TSpline.h
-    TSVDUnfold.h
-    TVirtualFitter.h
-    TVirtualGraphPainter.h
-    TVirtualHistPainter.h
-    TVirtualPaveStats.h
-    Math/WrappedMultiTF1.h
-    Math/WrappedTF1.h
-    v5/TF1Data.h
-    v5/TFormula.h
-    v5/TFormulaPrimitive.h
+    ${HIST_HEADERS}
   SOURCES
     AnalyticalIntegrals.cxx
     Haxis.cxx
@@ -173,6 +180,22 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist
     RIO
 )
 
+target_sources(Hist
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    src/AnalyticalIntegrals.h
+    src/Rebin2DHelpers.h
+    src/TEfficiencyHelper.h
+    src/TF1Helper.h
+    src/TH1Merger.h
+    src/TProfileHelper.h
+    inc/LinkDef.h
+)
+
 ROOT_ADD_TEST_SUBDIRECTORY(test)
 
 if(clad)
diff --git a/hist/histpainter/CMakeLists.txt b/hist/histpainter/CMakeLists.txt
index 1b5f5ab18e6b0..ab42a485739ff 100644
--- a/hist/histpainter/CMakeLists.txt
+++ b/hist/histpainter/CMakeLists.txt
@@ -8,14 +8,21 @@
 # CMakeLists.txt file for building ROOT hist/histpainter package
 ############################################################################
 
+set(HISTPAINTER_HEADERS
+  Hoption.h
+  Hparam.h
+  TGraph2DPainter.h
+  TGraphPainter.h
+  THistPainter.h
+  TPaletteAxis.h
+)
+
+set(RELATIVE_INC_HEADERS ${HISTPAINTER_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(HistPainter
   HEADERS
-    Hoption.h
-    Hparam.h
-    TGraph2DPainter.h
-    TGraphPainter.h
-    THistPainter.h
-    TPaletteAxis.h
+    ${HISTPAINTER_HEADERS}
   SOURCES
     src/TGraph2DPainter.cxx
     src/TGraphPainter.cxx
@@ -34,3 +41,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(HistPainter
 )
 # Suppress deprecation warnings across compilation units and during dictionary generation, remove with Hoption.h Hparam.h
 target_compile_definitions(HistPainter PRIVATE ROOT_Hoption_cxx ROOT_Hparam_cxx)
+
+target_sources(HistPainter
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+    src/TPainter3dAlgorithms.h
+)
+
diff --git a/hist/spectrum/CMakeLists.txt b/hist/spectrum/CMakeLists.txt
index d82dca45eb155..08209590f292c 100644
--- a/hist/spectrum/CMakeLists.txt
+++ b/hist/spectrum/CMakeLists.txt
@@ -8,15 +8,22 @@
 # CMakeLists.txt file for building ROOT hist/spectrum package
 ############################################################################
 
+set(SPECTRUM_HEADERS
+  TSpectrum.h
+  TSpectrum2.h
+  TSpectrum2Fit.h
+  TSpectrum2Transform.h
+  TSpectrum3.h
+  TSpectrumFit.h
+  TSpectrumTransform.h
+)
+
+set(RELATIVE_INC_HEADERS ${SPECTRUM_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Spectrum
   HEADERS
-    TSpectrum.h
-    TSpectrum2.h
-    TSpectrum2Fit.h
-    TSpectrum2Transform.h
-    TSpectrum3.h
-    TSpectrumFit.h
-    TSpectrumTransform.h
+    ${SPECTRUM_HEADERS}
   SOURCES
     src/TSpectrum.cxx
     src/TSpectrum2.cxx
@@ -30,3 +37,13 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Spectrum
   DEPENDENCIES
     Hist
 )
+
+target_sources(Spectrum
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
diff --git a/hist/spectrumpainter/CMakeLists.txt b/hist/spectrumpainter/CMakeLists.txt
index 6d08e1b4be0d0..97e9fcb04f7e6 100644
--- a/hist/spectrumpainter/CMakeLists.txt
+++ b/hist/spectrumpainter/CMakeLists.txt
@@ -8,9 +8,16 @@
 # CMakeLists.txt file for building ROOT hist/spectrumpainter package
 ############################################################################
 
+set(SPECTRUMPAINTER_HEADERS
+  TSpectrum2Painter.h
+)
+
+set(RELATIVE_INC_HEADERS ${SPECTRUMPAINTER_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(SpectrumPainter
   HEADERS
-    TSpectrum2Painter.h
+    ${SPECTRUMPAINTER_HEADERS}
   SOURCES
     src/TSpectrum2Painter.cxx
   DICTIONARY_OPTIONS
@@ -20,3 +27,13 @@ ROOT_STANDARD_LIBRARY_PACKAGE(SpectrumPainter
     Hist
     Gpad
 )
+
+target_sources(SpectrumPainter
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
diff --git a/hist/unfold/CMakeLists.txt b/hist/unfold/CMakeLists.txt
index 7d2c78f0ec489..f442dffceb491 100644
--- a/hist/unfold/CMakeLists.txt
+++ b/hist/unfold/CMakeLists.txt
@@ -8,14 +8,21 @@
 # CMakeLists.txt file for building ROOT hist/unfold package
 ############################################################################
 
+set(UNFOLD_HEADERS
+  TUnfold.h
+  TUnfoldBinning.h
+  TUnfoldBinningXML.h
+  TUnfoldDensity.h
+  TUnfoldIterativeEM.h
+  TUnfoldSys.h
+)
+
+set(RELATIVE_INC_HEADERS ${UNFOLD_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Unfold
   HEADERS
-    TUnfold.h
-    TUnfoldBinning.h
-    TUnfoldBinningXML.h
-    TUnfoldDensity.h
-    TUnfoldIterativeEM.h
-    TUnfoldSys.h
+    ${UNFOLD_HEADERS}
   SOURCES
     src/TUnfold.cxx
     src/TUnfoldBinning.cxx
@@ -30,3 +37,13 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Unfold
     XMLParser
     Matrix
 )
+
+target_sources(Unfold
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)