diff --git a/Makefile b/Makefile
index f7af00825ef7f2f408f2d9a7ec11ce3567222086..aca5e6cd2eca8247f500b8380132025e6394c41f 100644
--- a/Makefile
+++ b/Makefile
@@ -865,9 +865,9 @@ COREDICTH_REL := $(patsubst include/%,%, $(COREDICTH_REL))
 CXXMODULES_CORE_EXCLUDE := RConversionRuleParser.h TSchemaRuleProcessor.h \
 			   RConfig.h RVersion.h  RtypesImp.h \
 			   Rtypes.h RtypesCore.h TClassEdit.h TMetaUtils.h \
-			   TSchemaType.h DllImport.h Rtypeinfo.h TGenericClassInfo.h \
+			   TSchemaType.h DllImport.h TGenericClassInfo.h \
 			   TSchemaHelper.h ESTLType.h RStringView.h Varargs.h \
-			   RootMetaSelection.h TString.h Riosfwd.h TMathBase.h \
+			   RootMetaSelection.h TString.h TMathBase.h \
 			   RWrap_libcpp_string_view.h TAtomicCountGcc.h \
 			   TException.h ROOT/TThreadExecutor.hxx TBranchProxyTemplate.h \
 			   TGLIncludes.h TGLWSIncludes.h snprintf.h strlcpy.h
diff --git a/build/unix/module.modulemap b/build/unix/module.modulemap
index 62137432fbff195e4095743bceae6b36590c62b9..fb68feeed3cca870143a35f1916fabdfceaa0315 100644
--- a/build/unix/module.modulemap
+++ b/build/unix/module.modulemap
@@ -36,7 +36,6 @@ module ROOT_Core_Config_C {
  header "TMetaUtils.h"
  header "TSchemaType.h"
  header "DllImport.h" // Should merge in RConfig.h.
- header "Rtypeinfo.h" // Old and useless, should delete.
  header "TGenericClassInfo.h"
  header "TSchemaHelper.h"
  header "ESTLType.h"
@@ -44,7 +43,6 @@ module ROOT_Core_Config_C {
  header "Varargs.h" // Old should revisit, either drop or delete.
  header "RootMetaSelection.h"
  header "TString.h"
- header "Riosfwd.h"
  header "snprintf.h" // #included by Rtypes, could go away?
  header "strlcpy.h" // #included by Rtypes, could go away?
 
diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake
index ec5b4951e0a35ad01e704042ada88c74bf6f8c2a..467427a247fedc79453891029cde75593c8534db 100644
--- a/cmake/modules/RootNewMacros.cmake
+++ b/cmake/modules/RootNewMacros.cmake
@@ -413,9 +413,9 @@ function (ROOT_CXXMODULES_APPEND_TO_MODULEMAP library library_headers)
   set(excluded_headers "RConversionRuleParser.h TSchemaRuleProcessor.h 
                         RConfig.h RVersion.h RtypesImp.h
 			Rtypes.h RtypesCore.h TClassEdit.h TMetaUtils.h
-			TSchemaType.h DllImport.h Rtypeinfo.h TGenericClassInfo.h
+			TSchemaType.h DllImport.h TGenericClassInfo.h
 			TSchemaHelper.h ESTLType.h RStringView.h Varargs.h
-			RootMetaSelection.h TString.h Riosfwd.h TMathBase.h
+			RootMetaSelection.h TString.h TMathBase.h
 			RWrap_libcpp_string_view.h TAtomicCountGcc.h
 			TException.h ThreadLocalStorage.h ROOT/TThreadExecutor.hxx
                         TBranchProxyTemplate.h TGLIncludes.h TGLWSIncludes.h
diff --git a/core/base/inc/Riosfwd.h b/core/base/inc/Riosfwd.h
index ff95f4d6cc2ed3fb2a0f3066be7826f14a95d383..74fa042d0c4a4d954e85c87b859ba02ece6da596 100644
--- a/core/base/inc/Riosfwd.h
+++ b/core/base/inc/Riosfwd.h
@@ -21,6 +21,9 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+
+#warning "Riosfwd.h is deprecated. It will be removed in ROOT v6.12. Please use #include <iosfwd>, instead.")
+
 #include <iosfwd>
 
 #endif
diff --git a/core/base/inc/Rtypeinfo.h b/core/base/inc/Rtypeinfo.h
index e5b65283014055493691b1eb46f98ac354b5df0b..4db2e5183906de5cc3145da1e3a0ff661aedf4c4 100644
--- a/core/base/inc/Rtypeinfo.h
+++ b/core/base/inc/Rtypeinfo.h
@@ -11,5 +11,8 @@
 
 #ifndef ROOT_Rtypeinfo
 #define ROOT_Rtypeinfo
+
+#warning "Rtypeinfo.h is deprecated. It will be removed in ROOT v6.12. Please use #include <typeinfo>, instead.")
+
 #include <typeinfo>
 #endif
diff --git a/core/base/inc/Rtypes.h b/core/base/inc/Rtypes.h
index 56c90938d442ba32a10af7f98f1db9ff48b2999b..d900a6068553b076762748c1382953fb76c5f753 100644
--- a/core/base/inc/Rtypes.h
+++ b/core/base/inc/Rtypes.h
@@ -26,15 +26,14 @@
 #ifndef ROOT_DllImport
 #include "DllImport.h"
 #endif
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
 
-#include <stdio.h>
-#include <string.h>
 #include "snprintf.h"   // part of stdio.h on systems that have it
 #include "strlcpy.h"    // part of string.h on systems that have it
+
 #include <atomic>
+#include <stdio.h>
+#include <string.h>
+#include <typeinfo>
 
 
 //---- forward declared class types --------------------------------------------
diff --git a/core/base/inc/TAttAxis.h b/core/base/inc/TAttAxis.h
index f3f15b2671eed5b65129190d1a6dc4d99c94afbd..618f83070c9505eabd2e779e6f571bae39cc44fb 100644
--- a/core/base/inc/TAttAxis.h
+++ b/core/base/inc/TAttAxis.h
@@ -15,9 +15,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 
 class TAttAxis {
diff --git a/core/base/inc/TAttFill.h b/core/base/inc/TAttFill.h
index 08524153b6c2c2dc43bf4e30742c33be65f98258..f390514e460567731a04e20099a31cff86b1ab97 100644
--- a/core/base/inc/TAttFill.h
+++ b/core/base/inc/TAttFill.h
@@ -16,9 +16,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 
 class TAttFill {
diff --git a/core/base/inc/TAttLine.h b/core/base/inc/TAttLine.h
index d487ec1703af22aa8061c2eeb6cf804ac5e017c0..0ac5b302631bb49615c3f4b50b475257d8ef5950 100644
--- a/core/base/inc/TAttLine.h
+++ b/core/base/inc/TAttLine.h
@@ -16,10 +16,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
-
 
 class TAttLine {
 
diff --git a/core/base/inc/TAttMarker.h b/core/base/inc/TAttMarker.h
index d070a58bd8f85d6a1493ff53e8626f499121bab9..e4797e14492e0dda7fdb79ef76294dfe30938671 100644
--- a/core/base/inc/TAttMarker.h
+++ b/core/base/inc/TAttMarker.h
@@ -16,9 +16,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 
 class TAttMarker {
diff --git a/core/base/inc/TAttText.h b/core/base/inc/TAttText.h
index acc754c23a8cee5609a1f78ddb110fb14ec103a6..463c1ca6d416ef5ea7d144c1897e73e8c6aa21fb 100644
--- a/core/base/inc/TAttText.h
+++ b/core/base/inc/TAttText.h
@@ -16,10 +16,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
-
 
 class TAttText {
 
diff --git a/core/base/inc/TObject.h b/core/base/inc/TObject.h
index b6938059126f13959bf4de0178ab676031e46987..f45226d6d0f0c4b45d30593fac6e00b87c5adc82 100644
--- a/core/base/inc/TObject.h
+++ b/core/base/inc/TObject.h
@@ -14,13 +14,13 @@
 
 
 #include "RConfigure.h"
-#include "Riosfwd.h"
 #include "Rtypes.h"
 #include "TStorage.h"
 #include "TVersionCheck.h"
 
 #include <stdarg.h>
 #include <string>
+#include <iosfwd>
 
 #ifdef WIN32
 #undef RemoveDirectory
diff --git a/core/base/inc/TString.h b/core/base/inc/TString.h
index e29438fd7a4a794d2b790036592bab91eb7073be..132ceb8cd9a23128f3686d070151a07d049c0c48 100644
--- a/core/base/inc/TString.h
+++ b/core/base/inc/TString.h
@@ -23,22 +23,16 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#ifndef __CINT__
-#include <string.h>
-#include <stdio.h>
-#endif
-
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
-
 #ifndef ROOT_TMathBase
 #include "TMathBase.h"
 #endif
 
+#include "RStringView.h"
+
+#include <iosfwd>
 #include <stdarg.h>
+#include <stdio.h>
 #include <string>
-#include "RStringView.h"
 
 #ifdef R__GLOBALSTL
 namespace std { using ::string; }
diff --git a/core/base/inc/TTimeStamp.h b/core/base/inc/TTimeStamp.h
index 080a4b55538f0eaf82d0a4a1f61c724d77d7ced1..f35e364a7c9a10827317f588b6e388995b012831 100644
--- a/core/base/inc/TTimeStamp.h
+++ b/core/base/inc/TTimeStamp.h
@@ -42,9 +42,6 @@
 #ifndef ROOT_Rtypes
 #include "Rtypes.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 #include <ctime>
 
diff --git a/core/cont/inc/TBits.h b/core/cont/inc/TBits.h
index 3665ef86be641f3d49be9fcab2f44d8c1bbc3096..55005550dbed359a5e5127c2e6c0008a01b8b129 100644
--- a/core/cont/inc/TBits.h
+++ b/core/cont/inc/TBits.h
@@ -23,9 +23,6 @@
 #ifndef ROOT_TObject
 #include "TObject.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef __CINT__
 #include <string.h>
 #endif
diff --git a/core/meta/inc/TEnum.h b/core/meta/inc/TEnum.h
index 6a4797f89d3e840fddef9a9928cb62aeee7a41d3..382a49721893e6cfa7aa30efdbe6f6237dadedb9 100644
--- a/core/meta/inc/TEnum.h
+++ b/core/meta/inc/TEnum.h
@@ -32,9 +32,6 @@
 #ifndef ROOT_TDictionary
 #include "TDictionary.h"
 #endif
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
 
 class TClass;
 class TEnumConstant;
diff --git a/core/meta/inc/TInterpreter.h b/core/meta/inc/TInterpreter.h
index 8b254a5923d1393ba8e0542343d50864066463d0..b74b96dbd68aa380a8dca12d67874c9f487754f3 100644
--- a/core/meta/inc/TInterpreter.h
+++ b/core/meta/inc/TInterpreter.h
@@ -30,10 +30,6 @@
 #include "TVirtualMutex.h"
 #endif
 
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
-
 #include <vector>
 
 class TClass;
diff --git a/core/meta/src/TCling.h b/core/meta/src/TCling.h
index 201bfa85cb3f6330893e28ecae0e293b9f4f811f..1892ed05eec4cfe01711b299b5aaf0d0985fd24c 100644
--- a/core/meta/src/TCling.h
+++ b/core/meta/src/TCling.h
@@ -27,9 +27,6 @@
 #ifndef ROOT_TInterpreter
 #include "TInterpreter.h"
 #endif
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
 
 #include <set>
 #include <unordered_set>
diff --git a/core/rint/inc/TTabCom.h b/core/rint/inc/TTabCom.h
index ddca891cfaa00f1e54fc72616ba35e26d60b6a63..203145b18f11a375b4d0bb54d8333f5e24031167 100644
--- a/core/rint/inc/TTabCom.h
+++ b/core/rint/inc/TTabCom.h
@@ -42,9 +42,6 @@
 #ifndef ROOT_TRegExp
 #include "TRegexp.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 
 #define MAX_LEN_PAT 1024               // maximum length of a pattern
diff --git a/geom/geom/inc/TGeoNode.h b/geom/geom/inc/TGeoNode.h
index 5a074754beca2f85823c6f287cab2651fefd0b8b..47d53f1260888b7f5a253626fe6a27342b2fb64b 100644
--- a/geom/geom/inc/TGeoNode.h
+++ b/geom/geom/inc/TGeoNode.h
@@ -12,10 +12,6 @@
 #ifndef ROOT_TGeoNode
 #define ROOT_TGeoNode
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
-
 #ifndef ROOT_TGeoAtt
 #include "TGeoAtt.h"
 #endif
diff --git a/graf2d/graf/inc/TAttImage.h b/graf2d/graf/inc/TAttImage.h
index 6152ce63d6632accdf791635897b7353641f1a5f..aec667658b1b003a044eb92a9d275c8470edd67f 100644
--- a/graf2d/graf/inc/TAttImage.h
+++ b/graf2d/graf/inc/TAttImage.h
@@ -16,10 +16,6 @@
 #include "TObject.h"
 #endif
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
-
 class TAttImage;
 
 class TPaletteEditor {
diff --git a/graf2d/graf/inc/TCurlyLine.h b/graf2d/graf/inc/TCurlyLine.h
index 4004dd1b8d71f517fcb56e95f878dc2a5f89e8b6..b342c98528f5b555b9493d74ef8d94d68e853058 100644
--- a/graf2d/graf/inc/TCurlyLine.h
+++ b/graf2d/graf/inc/TCurlyLine.h
@@ -12,9 +12,6 @@
 #define ROOT_TCurlyLine
 
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TPolyLine
 #include "TPolyLine.h"
 #endif
diff --git a/graf2d/graf/inc/TGraphPolar.h b/graf2d/graf/inc/TGraphPolar.h
index e17f0ce1a626efd1bba19f8dd4ace54e1560bfbb..229ef94fe181f5d650a9e5d4eed9b3042e0a79d6 100644
--- a/graf2d/graf/inc/TGraphPolar.h
+++ b/graf2d/graf/inc/TGraphPolar.h
@@ -15,9 +15,6 @@
 #ifndef ROOT_TGraphErrors
 #include "TGraphErrors.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TAttText
 #include "TAttText.h"
 #endif
diff --git a/graf2d/graf/inc/TGraphPolargram.h b/graf2d/graf/inc/TGraphPolargram.h
index 62dda9a60d911870b49b3f45d4ba3d0366c3b8b6..1ecc24a98e3665d543b5c360034e19500653847f 100644
--- a/graf2d/graf/inc/TGraphPolargram.h
+++ b/graf2d/graf/inc/TGraphPolargram.h
@@ -12,9 +12,6 @@
 #ifndef ROOT_TGraphPolargram
 #define ROOT_TGraphPolargram
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TAttText
 #include "TAttText.h"
 #endif
diff --git a/graf2d/graf/inc/TLatex.h b/graf2d/graf/inc/TLatex.h
index a6d5d0837e382980929d1610915754b62352f8a1..b328cd6ce3d66e97ff8c2fa614f22c6ebb002525 100644
--- a/graf2d/graf/inc/TLatex.h
+++ b/graf2d/graf/inc/TLatex.h
@@ -11,9 +11,6 @@
 #ifndef ROOT_TLatex
 #define ROOT_TLatex
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TText
 #include "TText.h"
 #endif
diff --git a/graf2d/graf/inc/TMathText.h b/graf2d/graf/inc/TMathText.h
index e1b6b81b18b49fb8e2d0181899b39b4f2e7b99e0..4dad80e3144c8b9b1410f3f52131f699d7e49298 100644
--- a/graf2d/graf/inc/TMathText.h
+++ b/graf2d/graf/inc/TMathText.h
@@ -11,9 +11,6 @@
 #ifndef ROOT_TMathText
 #define ROOT_TMathText
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TText
 #include "TText.h"
 #endif
diff --git a/hist/hist/inc/TF12.h b/hist/hist/inc/TF12.h
index 86e3eb993eb61932ac00e09a92bd4e7a42bcce68..08e057eb8e3ce6ffaf40aa530dab1dacfed90b74 100644
--- a/hist/hist/inc/TF12.h
+++ b/hist/hist/inc/TF12.h
@@ -23,9 +23,6 @@
 #ifndef ROOT_TF2
 #include "TF2.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 class TF12 : public TF1 {
 
diff --git a/html/inc/TDocOutput.h b/html/inc/TDocOutput.h
index 7ef75850b65b4ad07f026ae3d7ce6dd629e0f745..e152b557e2e8a424d6bd429d1cd57dd4663d77f7 100644
--- a/html/inc/TDocOutput.h
+++ b/html/inc/TDocOutput.h
@@ -24,9 +24,6 @@
 #ifndef ROOT_TObject
 #include "TObject.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TDocParser
 #include "TDocParser.h"
 #endif
diff --git a/html/inc/TDocParser.h b/html/inc/TDocParser.h
index 56baede0ac6fe19fe650583a94dc3e9c48bf37cb..915c2ecf335fb37ed65465765e7ec3dfbdafc757 100644
--- a/html/inc/TDocParser.h
+++ b/html/inc/TDocParser.h
@@ -33,9 +33,6 @@
 #ifndef ROOT_TString
 #include "TString.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 class TBaseClass;
 class TClass;
diff --git a/io/io/inc/TCollectionProxyFactory.h b/io/io/inc/TCollectionProxyFactory.h
index c1f4c9d5b76dc2ddce301275608039f74309395e..500eac7a5d3e64e2521f4d03fd0722ce0746babf 100644
--- a/io/io/inc/TCollectionProxyFactory.h
+++ b/io/io/inc/TCollectionProxyFactory.h
@@ -18,10 +18,6 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
-
 #include <vector>
 
 #ifndef ROOT_TCollectionProxyInfo
diff --git a/io/io/inc/TGenCollectionProxy.h b/io/io/inc/TGenCollectionProxy.h
index f860689f195a07067a8e919b40bee1484c79bf5b..e0dc0aea16a37272a8bcc34cb13cc81335ae9e58 100644
--- a/io/io/inc/TGenCollectionProxy.h
+++ b/io/io/inc/TGenCollectionProxy.h
@@ -23,10 +23,6 @@
 #include "TCollectionProxyInfo.h"
 #endif
 
-#ifndef ROOT_Rtypeinfo
-#include "Rtypeinfo.h"
-#endif
-
 #include <atomic>
 #include <string>
 #include <map>
diff --git a/math/mathcore/inc/TComplex.h b/math/mathcore/inc/TComplex.h
index 144d9440ecf3f20c6567ff514f5383ee9bc67ce4..c968fd14f96ecd6480c13ea8849299870cc13b59 100644
--- a/math/mathcore/inc/TComplex.h
+++ b/math/mathcore/inc/TComplex.h
@@ -18,9 +18,6 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TMath
 #include "TMath.h"
 #endif
diff --git a/misc/table/inc/TTable.h b/misc/table/inc/TTable.h
index 8b4af7fb35b483d96acfdd47020d64ddaa67b239..3dc0bdb501a5ff5d5a8250830902336426d3ab9f 100644
--- a/misc/table/inc/TTable.h
+++ b/misc/table/inc/TTable.h
@@ -33,10 +33,6 @@
 # include "TCut.h"
 #endif
 
-# ifndef ROOT_Riosfwd
-#  include "Riosfwd.h"
-# endif
-
 #ifndef __CINT__
 #  include <string.h>
 #  include <assert.h>
diff --git a/misc/table/src/TDataSetIter.cxx b/misc/table/src/TDataSetIter.cxx
index 76e22811f636fab07672acc4e75a1583544c0c57..df60d155bad70e61e1f08553ffb10bf387a6cdea 100644
--- a/misc/table/src/TDataSetIter.cxx
+++ b/misc/table/src/TDataSetIter.cxx
@@ -9,7 +9,6 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#include "Riosfwd.h"
 #include "Riostream.h"
 
 #include "TDataSetIter.h"
diff --git a/misc/table/src/TTable.cxx b/misc/table/src/TTable.cxx
index eaa21ba0ddb75c392b0ffd450384bf25d0f692b1..a2160dcf0447dac883df9c85ecb538cee39156fb 100644
--- a/misc/table/src/TTable.cxx
+++ b/misc/table/src/TTable.cxx
@@ -133,7 +133,6 @@
 #include "RConfigure.h"
 
 //#if ROOT_VERSION_CODE >= ROOT_VERSION(3,03,5)
-#include "Riosfwd.h"
 #include "Riostream.h"
 //#include <iomanip.h>
 
diff --git a/proof/proofd/inc/XrdProofdTrace.h b/proof/proofd/inc/XrdProofdTrace.h
index 3ce8d6b5d8116d4474f1c111e7ba5a5e7af53a24..22e00a15d6c87c9d6f6b125899d59b08096f7438 100644
--- a/proof/proofd/inc/XrdProofdTrace.h
+++ b/proof/proofd/inc/XrdProofdTrace.h
@@ -51,9 +51,6 @@
 
 #ifndef NODEBUG
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_DllImport
 #include "DllImport.h"
 #endif
diff --git a/roofit/roofitcore/inc/Roo1DTable.h b/roofit/roofitcore/inc/Roo1DTable.h
index 6349f61a5b958c27b297893fed9908e2fd628796..b8a7cbb1b4094460468b15187f07d28186ae58ea 100644
--- a/roofit/roofitcore/inc/Roo1DTable.h
+++ b/roofit/roofitcore/inc/Roo1DTable.h
@@ -16,7 +16,6 @@
 #ifndef ROO_1D_TABLE
 #define ROO_1D_TABLE
 
-#include "Riosfwd.h"
 #include <assert.h>
 #include "TObjArray.h"
 #include "RooTable.h"
diff --git a/roofit/roofitcore/inc/RooAICRegistry.h b/roofit/roofitcore/inc/RooAICRegistry.h
index 4e82a96f27f246cee5712cf6b07c54fa81871a5b..6cc612b5d2da12a497272aa3d89b5b9cc908919b 100644
--- a/roofit/roofitcore/inc/RooAICRegistry.h
+++ b/roofit/roofitcore/inc/RooAICRegistry.h
@@ -17,7 +17,6 @@
 #define ROO_AIC_REGISTRY
 
 #include <vector>
-#include "Riosfwd.h"
 #include <assert.h>
 #include "Rtypes.h"
 class RooArgSet ;
diff --git a/roofit/roofitcore/inc/RooAbsCache.h b/roofit/roofitcore/inc/RooAbsCache.h
index 797af722b06f054ff107e63f42052bfa6b69cd30..1adc0822e132c50d6414f1403567ee9bdb391bc2 100644
--- a/roofit/roofitcore/inc/RooAbsCache.h
+++ b/roofit/roofitcore/inc/RooAbsCache.h
@@ -17,7 +17,6 @@
 #define ROO_ABS_CACHE
 
 #include "Rtypes.h"
-#include "Riosfwd.h"
 
 class RooAbsArg ;
 class RooAbsCollection ;
diff --git a/roofit/roofitcore/inc/RooAbsCategory.h b/roofit/roofitcore/inc/RooAbsCategory.h
index ff8d2a7f9167669a9a3ae87603cb9288dc4f20ff..37848d899fd9087aee67a61696fc2f51c59faa39 100644
--- a/roofit/roofitcore/inc/RooAbsCategory.h
+++ b/roofit/roofitcore/inc/RooAbsCategory.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ABS_CATEGORY
 #define ROO_ABS_CATEGORY
 
-#include "Riosfwd.h"
 #include "TObjArray.h"
 #include "RooAbsArg.h"
 #include "RooCatType.h"
diff --git a/roofit/roofitcore/inc/RooAbsCategoryLValue.h b/roofit/roofitcore/inc/RooAbsCategoryLValue.h
index 2fcdc8326421ed7ce2efed1bffbd097224f62128..57a044680178cfd06434a789b0270538d86d09c6 100644
--- a/roofit/roofitcore/inc/RooAbsCategoryLValue.h
+++ b/roofit/roofitcore/inc/RooAbsCategoryLValue.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ABS_CATEGORY_LVALUE
 #define ROO_ABS_CATEGORY_LVALUE
 
-#include "Riosfwd.h"
 #include "RooAbsCategory.h"
 #include "RooAbsLValue.h"
 
diff --git a/roofit/roofitcore/inc/RooAbsLValue.h b/roofit/roofitcore/inc/RooAbsLValue.h
index c2be3eb5750bf94a7b750766bce8950fd6ccb2da..5793de03e4404e9189b575c554780a873a4050fd 100644
--- a/roofit/roofitcore/inc/RooAbsLValue.h
+++ b/roofit/roofitcore/inc/RooAbsLValue.h
@@ -19,7 +19,6 @@
 #include <list>
 #include <string>
 
-#include "Riosfwd.h"
 #include "Rtypes.h"
 
 class RooAbsBinning ;
diff --git a/roofit/roofitcore/inc/RooAbsOptTestStatistic.h b/roofit/roofitcore/inc/RooAbsOptTestStatistic.h
index 98b47c59931184cabcc5818e13106d46f61c804c..26d3e64df884ff98e63cfd36371c84ecbec0d8e7 100644
--- a/roofit/roofitcore/inc/RooAbsOptTestStatistic.h
+++ b/roofit/roofitcore/inc/RooAbsOptTestStatistic.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ABS_OPT_TEST_STATISTIC
 #define ROO_ABS_OPT_TEST_STATISTIC
 
-#include "Riosfwd.h"
 #include "RooAbsTestStatistic.h"
 #include "RooSetProxy.h"
 #include "RooCategoryProxy.h"
diff --git a/roofit/roofitcore/inc/RooAbsProxy.h b/roofit/roofitcore/inc/RooAbsProxy.h
index f6118e324f21cf083b4ae73b0110aa8820e216b5..76541bedc6e6bcc71258c636c212f32a8fbffd75 100644
--- a/roofit/roofitcore/inc/RooAbsProxy.h
+++ b/roofit/roofitcore/inc/RooAbsProxy.h
@@ -18,7 +18,6 @@
 
 #include "TObject.h"
 #include "RooAbsArg.h"
-#include "Riosfwd.h"
 
 #ifdef _WIN32
 // Turn off 'warning C4355: 'this' : used in base member initializer list'
diff --git a/roofit/roofitcore/inc/RooAbsRealLValue.h b/roofit/roofitcore/inc/RooAbsRealLValue.h
index 24798e1ba123988922acf2ee0a3a83d0cf7882a7..46a19671ecdac52edd8f564d68067ff6587bb312 100644
--- a/roofit/roofitcore/inc/RooAbsRealLValue.h
+++ b/roofit/roofitcore/inc/RooAbsRealLValue.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ABS_REAL_LVALUE
 #define ROO_ABS_REAL_LVALUE
 
-#include "Riosfwd.h"
 #include <math.h>
 #include <float.h>
 #include "TString.h"
diff --git a/roofit/roofitcore/inc/RooAbsTestStatistic.h b/roofit/roofitcore/inc/RooAbsTestStatistic.h
index 0f88ab8faa62ecb963f31505868c0add8a4b10a0..aaf21e519712c7335022306fdf1a93a17812c931 100644
--- a/roofit/roofitcore/inc/RooAbsTestStatistic.h
+++ b/roofit/roofitcore/inc/RooAbsTestStatistic.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ABS_TEST_STATISTIC
 #define ROO_ABS_TEST_STATISTIC
 
-#include "Riosfwd.h"
 #include "RooAbsReal.h"
 #include "RooSetProxy.h"
 #include "RooRealProxy.h"
diff --git a/roofit/roofitcore/inc/RooCatType.h b/roofit/roofitcore/inc/RooCatType.h
index 181a380773403f344f0146908cdbbc9d0689dcd6..e7dc1aedd5ff51b06497884e90c132c1d5a22d58 100644
--- a/roofit/roofitcore/inc/RooCatType.h
+++ b/roofit/roofitcore/inc/RooCatType.h
@@ -16,7 +16,6 @@
 #ifndef ROO_CAT_TYPE
 #define ROO_CAT_TYPE
 
-#include "Riosfwd.h"
 #include "TObject.h"
 #include "RooPrintable.h"
 
diff --git a/roofit/roofitcore/inc/RooCategory.h b/roofit/roofitcore/inc/RooCategory.h
index 1480891a627eb23467a7bb472f70fd6658155d69..7ee1aad7f86fd0a5abc4dbd2dab18446f56a238c 100644
--- a/roofit/roofitcore/inc/RooCategory.h
+++ b/roofit/roofitcore/inc/RooCategory.h
@@ -16,7 +16,6 @@
 #ifndef ROO_CATEGORY
 #define ROO_CATEGORY
 
-#include "Riosfwd.h"
 #include "RooAbsCategoryLValue.h"
 
 #include "RooSharedPropertiesList.h"
diff --git a/roofit/roofitcore/inc/RooComplex.h b/roofit/roofitcore/inc/RooComplex.h
index 9cce555b2a1c650d5ea641b94c4f1c556d1fb193..09ce5be5ff83d17c974207bbecf30b33076f8ce3 100644
--- a/roofit/roofitcore/inc/RooComplex.h
+++ b/roofit/roofitcore/inc/RooComplex.h
@@ -23,7 +23,6 @@
 
 #include <math.h>
 #include "Rtypes.h"
-#include "Riosfwd.h"
 #include <complex>
 
 // This is a bare-bones complex class adapted from the CINT complex.h header,
diff --git a/roofit/roofitcore/inc/RooConvCoefVar.h b/roofit/roofitcore/inc/RooConvCoefVar.h
index 967fdaaf79570e16e802f64b8356cbeb76826d2c..43e46617c334d4a9d4555f1589fee97e4eed1a34 100644
--- a/roofit/roofitcore/inc/RooConvCoefVar.h
+++ b/roofit/roofitcore/inc/RooConvCoefVar.h
@@ -16,7 +16,6 @@
 #ifndef ROO_CONV_COEF_VAR
 #define ROO_CONV_COEF_VAR
 
-#include "Riosfwd.h"
 #include <math.h>
 #include <float.h>
 
diff --git a/roofit/roofitcore/inc/RooDataHistSliceIter.h b/roofit/roofitcore/inc/RooDataHistSliceIter.h
index 42600485cfd9b117e3d7e553474110b49e2a708a..d3ca4347bca6caac0854cf1c95af1a8863066a92 100644
--- a/roofit/roofitcore/inc/RooDataHistSliceIter.h
+++ b/roofit/roofitcore/inc/RooDataHistSliceIter.h
@@ -16,7 +16,6 @@
 #ifndef ROO_DATA_HIST_SLICE_ITER
 #define ROO_DATA_HIST_SLICE_ITER
 
-#include "Riosfwd.h"
 #include "TIterator.h"
 #include "RooArgSet.h"
 #include "TObjString.h"
diff --git a/roofit/roofitcore/inc/RooErrorVar.h b/roofit/roofitcore/inc/RooErrorVar.h
index 08d8e455d1ffead57ab04b7b60b37c48ab27d461..974d3bebbe79148e1ac93eff298999b1bb2041a9 100644
--- a/roofit/roofitcore/inc/RooErrorVar.h
+++ b/roofit/roofitcore/inc/RooErrorVar.h
@@ -16,7 +16,6 @@
 #ifndef ROO_ERROR_VAR
 #define ROO_ERROR_VAR
 
-#include "Riosfwd.h"
 #include <math.h>
 #include <float.h>
 
diff --git a/roofit/roofitcore/inc/RooFitResult.h b/roofit/roofitcore/inc/RooFitResult.h
index 9866229bade2c5a85c4c4abd80bb9ffa7130c64e..fa70767ab4cbd388998a91516b92720f7e995c33 100644
--- a/roofit/roofitcore/inc/RooFitResult.h
+++ b/roofit/roofitcore/inc/RooFitResult.h
@@ -16,7 +16,6 @@
 #ifndef ROO_FIT_RESULT
 #define ROO_FIT_RESULT
 
-#include "Riosfwd.h"
 #include "RooAbsArg.h"
 #include "RooPrintable.h"
 #include "RooDirItem.h"
diff --git a/roofit/roofitcore/inc/RooLinearVar.h b/roofit/roofitcore/inc/RooLinearVar.h
index bd8c9c7162818c254625b4287b61c40c3d36a75a..f568ab855d143cac1382d4d9bcb0d66e03b9d378 100644
--- a/roofit/roofitcore/inc/RooLinearVar.h
+++ b/roofit/roofitcore/inc/RooLinearVar.h
@@ -16,7 +16,6 @@
 #ifndef ROO_LINEAR_VAR
 #define ROO_LINEAR_VAR
 
-#include "Riosfwd.h"
 #include <math.h>
 #include <float.h>
 #include "TString.h"
diff --git a/roofit/roofitcore/inc/RooListProxy.h b/roofit/roofitcore/inc/RooListProxy.h
index 60c5a10b58e4e250966027163a11f77047fba070..79899521b924397ee2b4872ae130818a07e3c804 100644
--- a/roofit/roofitcore/inc/RooListProxy.h
+++ b/roofit/roofitcore/inc/RooListProxy.h
@@ -17,7 +17,6 @@
 #define ROO_LIST_PROXY
 
 #include "TObject.h"
-#include "Riosfwd.h"
 #include "RooAbsProxy.h"
 #include "RooLinkedListIter.h"
 #include "RooAbsArg.h"
diff --git a/roofit/roofitcore/inc/RooMapCatEntry.h b/roofit/roofitcore/inc/RooMapCatEntry.h
index be0a2f452b59ee053282ffcfe6846c613c454a4e..cccfb1001adf05e0fd283fe39d6f1841aa8ae65a 100644
--- a/roofit/roofitcore/inc/RooMapCatEntry.h
+++ b/roofit/roofitcore/inc/RooMapCatEntry.h
@@ -16,7 +16,6 @@
 #ifndef ROO_MAP_CAT_ENTRY
 #define ROO_MAP_CAT_ENTRY
 
-#include "Riosfwd.h"
 #include "TNamed.h"
 #include "TRegexp.h"
 #include "RooCatType.h"
diff --git a/roofit/roofitcore/inc/RooMsgService.h b/roofit/roofitcore/inc/RooMsgService.h
index a11bc0487be3a6ec882bdfdaeea8fc188874e14a..2d2d2d7b17ce0ba5b27f6a44c1652ee38650dbe6 100644
--- a/roofit/roofitcore/inc/RooMsgService.h
+++ b/roofit/roofitcore/inc/RooMsgService.h
@@ -16,7 +16,6 @@
 #ifndef ROO_MSG_SERVICE
 #define ROO_MSG_SERVICE
 
-#include "Riosfwd.h"
 #include <assert.h>
 #include "TObject.h"
 #include <string>
diff --git a/roofit/roofitcore/inc/RooMultiCatIter.h b/roofit/roofitcore/inc/RooMultiCatIter.h
index 79c1813b35bb109ee4c88a9334fec0af0fe734fd..380ffc8ebc9f82da54ad99569e715960ccdab53d 100644
--- a/roofit/roofitcore/inc/RooMultiCatIter.h
+++ b/roofit/roofitcore/inc/RooMultiCatIter.h
@@ -16,7 +16,6 @@
 #ifndef ROO_MULTI_CAT_ITER
 #define ROO_MULTI_CAT_ITER
 
-#include "Riosfwd.h"
 #include "TIterator.h"
 #include "RooArgSet.h"
 #include "TObjString.h"
diff --git a/roofit/roofitcore/inc/RooNormSetCache.h b/roofit/roofitcore/inc/RooNormSetCache.h
index c5e841c97bd55bf20ce4964da52bd05e9bd0a81d..53fd4ffa06fdc250ab7574ac591147ad07927730 100644
--- a/roofit/roofitcore/inc/RooNormSetCache.h
+++ b/roofit/roofitcore/inc/RooNormSetCache.h
@@ -21,7 +21,6 @@
 #include <map>
 
 #include "Rtypes.h"
-#include "Riosfwd.h"
 #include "RooNameSet.h"
 
 class RooAbsArg;
diff --git a/roofit/roofitcore/inc/RooPrintable.h b/roofit/roofitcore/inc/RooPrintable.h
index 89123d73739a8e7ccd96ddd004c7b47098bb7b68..1b29e8b9d3b459dd04f7907204dca348dc80f59a 100644
--- a/roofit/roofitcore/inc/RooPrintable.h
+++ b/roofit/roofitcore/inc/RooPrintable.h
@@ -19,7 +19,6 @@
 
 class TNamed ;
 
-#include "Riosfwd.h"
 #include "Rtypes.h"
 #include "TString.h"
 
diff --git a/roofit/roofitcore/inc/RooRealConstant.h b/roofit/roofitcore/inc/RooRealConstant.h
index c606e8cfa2884504a235f6c69e1cb7b2cc1f07a8..ebb3f0c5b6b7f2497e2ece166d08a5f5fdcb225b 100644
--- a/roofit/roofitcore/inc/RooRealConstant.h
+++ b/roofit/roofitcore/inc/RooRealConstant.h
@@ -17,7 +17,6 @@
 #define ROO_REAL_CONSTANT
 
 #include "Rtypes.h"
-#include "Riosfwd.h"
 
 class RooAbsReal ;
 class RooArgList ;
diff --git a/roofit/roofitcore/inc/RooRealVar.h b/roofit/roofitcore/inc/RooRealVar.h
index a6e9b6df082c95937c97599f861209fe1a551957..8935d386de5dd413c0cd08acc6a5616f09adb5f9 100644
--- a/roofit/roofitcore/inc/RooRealVar.h
+++ b/roofit/roofitcore/inc/RooRealVar.h
@@ -18,7 +18,6 @@
 
 #include <list>
 #include <string>
-#include "Riosfwd.h"
 #include <math.h>
 #include <float.h>
 #include "TString.h"
diff --git a/roofit/roofitcore/inc/RooSetProxy.h b/roofit/roofitcore/inc/RooSetProxy.h
index 25ee4aa17341063cd96e54680ba3b31ce9bfdff9..e38f7f5aba9ddc491ed27b6d8fb0478e9f680a2c 100644
--- a/roofit/roofitcore/inc/RooSetProxy.h
+++ b/roofit/roofitcore/inc/RooSetProxy.h
@@ -17,7 +17,6 @@
 #define ROO_SET_PROXY
 
 #include "TObject.h"
-#include "Riosfwd.h"
 #include "RooAbsProxy.h"
 #include "RooAbsArg.h"
 #include "RooArgSet.h"
diff --git a/roofit/roofitcore/inc/RooStreamParser.h b/roofit/roofitcore/inc/RooStreamParser.h
index 6a5fa6d49df96e1741c4e297a0493589051f73d2..ae59cb896cc438751f53d582061152e074fbc2d3 100644
--- a/roofit/roofitcore/inc/RooStreamParser.h
+++ b/roofit/roofitcore/inc/RooStreamParser.h
@@ -16,7 +16,6 @@
 #ifndef ROO_STREAM_PARSER
 #define ROO_STREAM_PARSER
 
-#include "Riosfwd.h"
 #include "TString.h"
 
 class RooStreamParser {
diff --git a/roofit/roofitcore/inc/RooStringVar.h b/roofit/roofitcore/inc/RooStringVar.h
index 7fded7b84c8df6f25cb125af2bcad43830b884b1..2c0f29a13d9f38cef8480cd094a1452a9253300d 100644
--- a/roofit/roofitcore/inc/RooStringVar.h
+++ b/roofit/roofitcore/inc/RooStringVar.h
@@ -16,7 +16,6 @@
 #ifndef ROO_STRING_VAR
 #define ROO_STRING_VAR
 
-#include "Riosfwd.h"
 #include "TString.h"
 #include "RooAbsString.h"
 class RooArgSet ;
diff --git a/roofit/roofitcore/inc/RooTable.h b/roofit/roofitcore/inc/RooTable.h
index 6729a33ff17894d25e8006cd1fb4f323665eb444..6e0b1dbbbe76688f976aee827d91e1398f8ba2e2 100644
--- a/roofit/roofitcore/inc/RooTable.h
+++ b/roofit/roofitcore/inc/RooTable.h
@@ -16,7 +16,6 @@
 #ifndef ROO_TABLE
 #define ROO_TABLE
 
-#include "Riosfwd.h"
 #include <assert.h>
 #include "TNamed.h"
 #include "RooAbsCategory.h"
diff --git a/roofit/roofitcore/inc/RooThreshEntry.h b/roofit/roofitcore/inc/RooThreshEntry.h
index 8245775fd420abf334b19cef3fef25a85a34e0a2..4a8c5ab34a5861d50fed9d6e026a3e0e336e2821 100644
--- a/roofit/roofitcore/inc/RooThreshEntry.h
+++ b/roofit/roofitcore/inc/RooThreshEntry.h
@@ -16,7 +16,6 @@
 #ifndef ROO_THRESH_ENTRY
 #define ROO_THRESH_ENTRY
 
-#include "Riosfwd.h"
 #include "TNamed.h"
 #include "RooCatType.h"
 
diff --git a/roofit/roofitcore/inc/RooTrace.h b/roofit/roofitcore/inc/RooTrace.h
index c12d3436244ef234edacd99d98962dfa1f362fa2..cea2a340a62fe786e1b8e8c1d55487664fac38d4 100644
--- a/roofit/roofitcore/inc/RooTrace.h
+++ b/roofit/roofitcore/inc/RooTrace.h
@@ -17,7 +17,6 @@
 #define ROO_TRACE
 
 #include <assert.h>
-#include "Riosfwd.h"
 #include "RooLinkedList.h"
 
 #define TRACE_CREATE
diff --git a/tmva/tmva/inc/TMVA/GeneticPopulation.h b/tmva/tmva/inc/TMVA/GeneticPopulation.h
index 4af94fe28d5ea7a941e3cd1e94f5be75f8b58bb7..3032866818d96f4fc701edf8657e3ccc30cd020c 100644
--- a/tmva/tmva/inc/TMVA/GeneticPopulation.h
+++ b/tmva/tmva/inc/TMVA/GeneticPopulation.h
@@ -36,9 +36,6 @@
 #include <string>
 #include <vector>
 
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 #ifndef ROOT_TMVA_GeneticGenes
 #include "TMVA/GeneticGenes.h"
 #endif
diff --git a/tree/tree/inc/TLeaf.h b/tree/tree/inc/TLeaf.h
index c82ee7a3781f82d048391c8e92580ac160540bbb..707e4938fa82c13fff5f365868191e2f7b15e53e 100644
--- a/tree/tree/inc/TLeaf.h
+++ b/tree/tree/inc/TLeaf.h
@@ -27,9 +27,6 @@
 #ifndef ROOT_TBranch
 #include "TBranch.h"
 #endif
-#ifndef ROOT_Riosfwd
-#include "Riosfwd.h"
-#endif
 
 class TClonesArray;
 class TBrowser;