diff --git a/graf/inc/TGraphPolar.h b/graf/inc/TGraphPolar.h
index 006215b9270ef7d6c09742fa46cd800a0a1d273a..0d07a1da4aa0b39d40d048e47de3d04e60e49c23 100644
--- a/graf/inc/TGraphPolar.h
+++ b/graf/inc/TGraphPolar.h
@@ -12,8 +12,12 @@
 #ifndef ROOT_TGraphPolar
 #define ROOT_TGraphPolar
 
+#ifndef ROOT_TGraphErrors
 #include "TGraphErrors.h"
-#include "Riostream.h"
+#endif
+#ifndef ROOT_Riosfwd
+#include "Riosfwd.h"
+#endif
 #ifndef ROOT_TAttText
 #include "TAttText.h"
 #endif
diff --git a/graf/src/TGraphPolar.cxx b/graf/src/TGraphPolar.cxx
index d19617a6bd9c9c6f0ef2216534c204e113c5573d..d9148a31eb076c7586130ac2e89dae64aa330996 100644
--- a/graf/src/TGraphPolar.cxx
+++ b/graf/src/TGraphPolar.cxx
@@ -52,6 +52,7 @@ End_Macro */
 #include "TEllipse.h"
 #include "TH1.h"
 #include "TMath.h"
+#include "Riostream.h"
 
 
 ClassImp(TGraphPolar);