diff --git a/graf2d/gpad/src/TSliderBox.cxx b/graf2d/gpad/src/TSliderBox.cxx
index 29bd2f97c7b9efb0c8cd598aa864d5c6a5c31e2a..363a2d5a7605bbf7d46c04c805c40ed7f09b0001 100644
--- a/graf2d/gpad/src/TSliderBox.cxx
+++ b/graf2d/gpad/src/TSliderBox.cxx
@@ -13,6 +13,7 @@
 #include "TROOT.h"
 #include "TSlider.h"
 #include "TSliderBox.h"
+#include "TVirtualX.h"
 
 #include <string.h>
 
diff --git a/graf2d/graf/src/TArrow.cxx b/graf2d/graf/src/TArrow.cxx
index d62a51aafc75f52466cc7631da9cb039c21a0c11..b0c420d5a0eba1fa418efbe948e0584bbf841e75 100644
--- a/graf2d/graf/src/TArrow.cxx
+++ b/graf2d/graf/src/TArrow.cxx
@@ -15,6 +15,7 @@
 #include "TArrow.h"
 #include "TVirtualPad.h"
 #include "TVirtualPS.h"
+#include "TVirtualX.h"
 
 Float_t TArrow::fgDefaultAngle      = 60;
 Float_t TArrow::fgDefaultArrowSize  = 0.05;
diff --git a/graf2d/graf/src/TEllipse.cxx b/graf2d/graf/src/TEllipse.cxx
index 92f168078bbccaa340926d7fd13a3198a447ac3e..a3dc23dd88570ccdbe149b9a8838c7eb9007274d 100644
--- a/graf2d/graf/src/TEllipse.cxx
+++ b/graf2d/graf/src/TEllipse.cxx
@@ -16,8 +16,9 @@
 #include "TEllipse.h"
 #include "TVirtualPad.h"
 #include "TMath.h"
-#include "TClass.h"
 #include "TPoint.h"
+#include "TVirtualX.h"
+
 
 const Double_t kPI = 3.14159265358979323846;
 
diff --git a/graf2d/graf/src/TLatex.cxx b/graf2d/graf/src/TLatex.cxx
index 344fb73490912c13829c08c34eb9213057347c24..5a8082338bd7745838220a28281995259655c78f 100644
--- a/graf2d/graf/src/TLatex.cxx
+++ b/graf2d/graf/src/TLatex.cxx
@@ -11,12 +11,12 @@
 
 #include "Riostream.h"
 #include "TROOT.h"
-#include "TClass.h"
 #include "TLatex.h"
 #include "TMathText.h"
 #include "TMath.h"
 #include "TVirtualPad.h"
 #include "TVirtualPS.h"
+#include "TVirtualX.h"
 
 const Double_t kPI = TMath::Pi();
 
diff --git a/graf2d/graf/src/TMathText.cxx b/graf2d/graf/src/TMathText.cxx
index 8f6cca3fd2cef9e69da6d6201e987f5982f3c55b..56966963871f328267483f228ec80826ea55cd03 100644
--- a/graf2d/graf/src/TMathText.cxx
+++ b/graf2d/graf/src/TMathText.cxx
@@ -11,7 +11,6 @@
 
 #include "Riostream.h"
 #include "TROOT.h"
-#include "TClass.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
@@ -20,6 +19,7 @@
 #include "TMath.h"
 #include "TVirtualPad.h"
 #include "TVirtualPS.h"
+#include "TVirtualX.h"
 #include "TText.h"
 
 #include "../../../graf2d/mathtext/inc/mathtext.h"
diff --git a/graf2d/graf/src/TPie.cxx b/graf2d/graf/src/TPie.cxx
index de222b38ef7b573a6c14e539030b2d349eb5ca38..1bf03cbc5ec62e35d661ff7abc0676882600b1fb 100644
--- a/graf2d/graf/src/TPie.cxx
+++ b/graf2d/graf/src/TPie.cxx
@@ -15,6 +15,7 @@
 #include <Riostream.h>
 #include <TROOT.h>
 #include <TVirtualPad.h>
+#include <TVirtualX.h>
 #include <TArc.h>
 #include <TLegend.h>
 #include <TMath.h>
diff --git a/graf2d/graf/src/TPolyLine.cxx b/graf2d/graf/src/TPolyLine.cxx
index 1edbfb68898e8671b6879558030114b7db3b4718..e465ec68d1bd87f7a03bee07424d4b7263581fc8 100644
--- a/graf2d/graf/src/TPolyLine.cxx
+++ b/graf2d/graf/src/TPolyLine.cxx
@@ -13,8 +13,8 @@
 #include "TROOT.h"
 #include "TMath.h"
 #include "TVirtualPad.h"
+#include "TVirtualX.h"
 #include "TPolyLine.h"
-#include "TClass.h"
 
 ClassImp(TPolyLine);
 
diff --git a/graf2d/postscript/src/TImageDump.cxx b/graf2d/postscript/src/TImageDump.cxx
index fed64462feb1cb7307c411e6e80fe64bb3fb7637..95cfce8ef03422eb2e12ea8da18cecbe6388337c 100644
--- a/graf2d/postscript/src/TImageDump.cxx
+++ b/graf2d/postscript/src/TImageDump.cxx
@@ -35,6 +35,7 @@ TImageDump can be used in any mode (batch, interactive) as follows
 #include "TPoint.h"
 #include "TColor.h"
 #include "TVirtualPad.h"
+#include "TVirtualX.h"
 #include "TROOT.h"
 #include "TSystem.h"
 #include "TText.h"
diff --git a/hist/histpainter/src/TPaletteAxis.cxx b/hist/histpainter/src/TPaletteAxis.cxx
index ce76bf6c3a8d67ae77644de2cb23f186d935d61d..6b70180e8cb1629893ff8faad137b653af91e5e0 100644
--- a/hist/histpainter/src/TPaletteAxis.cxx
+++ b/hist/histpainter/src/TPaletteAxis.cxx
@@ -13,6 +13,7 @@
 #include "TROOT.h"
 #include "TPaletteAxis.h"
 #include "TVirtualPad.h"
+#include "TVirtualX.h"
 #include "TStyle.h"
 #include "TMath.h"
 #include "TView.h"