diff --git a/hist/histpainter/CMakeLists.txt b/hist/histpainter/CMakeLists.txt
index 30a6718bc2acc..1b5f5ab18e6b0 100644
--- a/hist/histpainter/CMakeLists.txt
+++ b/hist/histpainter/CMakeLists.txt
@@ -32,3 +32,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(HistPainter
   LIBRARIES
     Matrix
 )
+# 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)
diff --git a/hist/histpainter/src/TGraph2DPainter.cxx b/hist/histpainter/src/TGraph2DPainter.cxx
index f382054df9259..96f9e95d92886 100644
--- a/hist/histpainter/src/TGraph2DPainter.cxx
+++ b/hist/histpainter/src/TGraph2DPainter.cxx
@@ -22,7 +22,6 @@
 #include "TView.h"
 #include "THLimitsFinder.h"
 #include "TStyle.h"
-#define ROOT_Hoption_cxx
 #include "Hoption.h"
 #include "TH1.h"
 #include <vector>
diff --git a/hist/histpainter/src/THistPainter.cxx b/hist/histpainter/src/THistPainter.cxx
index 735e2c4f6a3cb..41447a2070b16 100644
--- a/hist/histpainter/src/THistPainter.cxx
+++ b/hist/histpainter/src/THistPainter.cxx
@@ -53,9 +53,7 @@
 #include "TMath.h"
 #include "TRandom2.h"
 #include "TObjArray.h"
-#define ROOT_Hoption_cxx
 #include "Hoption.h"
-#define ROOT_Hparam_cxx
 #include "Hparam.h"
 #include "TPluginManager.h"
 #include "TPaletteAxis.h"
diff --git a/hist/histpainter/src/TPainter3dAlgorithms.cxx b/hist/histpainter/src/TPainter3dAlgorithms.cxx
index d981fd6370183..f0884c9aa3656 100644
--- a/hist/histpainter/src/TPainter3dAlgorithms.cxx
+++ b/hist/histpainter/src/TPainter3dAlgorithms.cxx
@@ -33,9 +33,7 @@ class by Rene Brun.
 #include "TH1.h"
 #include "TF3.h"
 #include "TView.h"
-#define ROOT_Hoption_cxx
 #include "Hoption.h"
-#define ROOT_Hparam_cxx
 #include "Hparam.h"
 #include "TMath.h"
 #include "TStyle.h"
diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt
index 697a18ce59686..224ae918cf7e0 100644
--- a/net/net/CMakeLists.txt
+++ b/net/net/CMakeLists.txt
@@ -70,4 +70,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
   LIBRARIES
     ${ROOT_ATOMIC_LIBS}
 )
+# Suppress deprecation warnings across compilation units and during dictionary generation, remove with NetErrors.h
+target_compile_definitions(Net PRIVATE ROOT_NetErrors_cxx)
+
 ROOT_ADD_TEST_SUBDIRECTORY(test)
diff --git a/net/net/src/NetErrors.cxx b/net/net/src/NetErrors.cxx
index 85460bca3edc2..a356a38a22272 100644
--- a/net/net/src/NetErrors.cxx
+++ b/net/net/src/NetErrors.cxx
@@ -18,7 +18,6 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#define ROOT_NetErrors_cxx
 #include "NetErrors.h"
 
 // Must match order of ERootdErrors enum in NetErrors.h
diff --git a/net/net/src/TSocket.cxx b/net/net/src/TSocket.cxx
index c75255f6375de..8947ae1de0a38 100644
--- a/net/net/src/TSocket.cxx
+++ b/net/net/src/TSocket.cxx
@@ -23,7 +23,6 @@ TUnixSystem or TWinNTSystem).
 
 #include "Bytes.h"
 #include "Compression.h"
-#define ROOT_NetErrors_cxx
 #include "NetErrors.h"
 #include "TError.h"
 #include "TMessage.h"
diff --git a/net/net/src/TUDPSocket.cxx b/net/net/src/TUDPSocket.cxx
index 7bf568d7da90b..2611494f79dd7 100644
--- a/net/net/src/TUDPSocket.cxx
+++ b/net/net/src/TUDPSocket.cxx
@@ -22,7 +22,6 @@ TUnixSystem or TWinNTSystem).
 
 #include "Bytes.h"
 #include "Compression.h"
-#define ROOT_NetErrors_cxx
 #include "NetErrors.h"
 #include "TError.h"
 #include "TMessage.h"
diff --git a/tree/treeviewer/CMakeLists.txt b/tree/treeviewer/CMakeLists.txt
index 1c5cc6585dded..90396d18e68b0 100644
--- a/tree/treeviewer/CMakeLists.txt
+++ b/tree/treeviewer/CMakeLists.txt
@@ -44,4 +44,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TreeViewer
 if(ROOT_NEED_STDCXXFS)
   target_link_libraries(TreeViewer PUBLIC stdc++fs)
 endif()
-
+# Suppress deprecation warnings across compilation units and during dictionary generation, remove with HelpTextTV.h
+target_compile_definitions(TreeViewer PRIVATE ROOT_HelpTextTV_cxx)
diff --git a/tree/treeviewer/src/HelpTextTV.cxx b/tree/treeviewer/src/HelpTextTV.cxx
index 806ef1b5e243e..86642bc59148f 100644
--- a/tree/treeviewer/src/HelpTextTV.cxx
+++ b/tree/treeviewer/src/HelpTextTV.cxx
@@ -9,7 +9,6 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#define ROOT_HelpTextTV_cxx
 #include "HelpTextTV.h"
 
 const char gTVHelpAbout[] = "\
diff --git a/tree/treeviewer/src/TTreeViewer.cxx b/tree/treeviewer/src/TTreeViewer.cxx
index f8262cbf214fc..5f0becb1bdb93 100644
--- a/tree/treeviewer/src/TTreeViewer.cxx
+++ b/tree/treeviewer/src/TTreeViewer.cxx
@@ -200,7 +200,6 @@ more complex cuts such as (~e1) && (~e2), or (~e1) || !(~e2). Parentheses are im
 
 #include "TTreeViewer.h"
 #include "HelpText.h"
-#define ROOT_HelpTextTV_cxx
 #include "HelpTextTV.h"
 #include "TTVLVContainer.h"
 #include "TTVSession.h"