API tools faq
paste
GoddamnIDontNeedAUse

Untitled

GoddamnIDontNeedAUse
Feb 13th, 2017
152
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 133.25 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/bindings/r/inc/TRInterface.h b/bindings/r/inc/TRInterface.h
  2. index 68b793623e..ade43ab7d2 100644
  3. --- a/bindings/r/inc/TRInterface.h
  4. +++ b/bindings/r/inc/TRInterface.h
  5. @@ -13,27 +13,23 @@dasdadsfadsf #define ROOT_R_TRInterface
  6.  
  7.  #ifndef ROOT_R_TRObject
  8.  #include<TRObject.h>
  9.  #endif
  10.  
  11.  #ifndef ROOT_R_TRDataFrame
  12.  #include<TRDataFrame.h>
  13.  #endif
  14.  
  15. -#ifndef ROOT_R_TFunctionExport
  16. -#include<TRFunctionExport.h>
  17. -#endif
  18. +#include <TRFunctionExport.h>
  19.  
  20. -#ifndef ROOT_R_TFunctionImport
  21. -#include<TRFunctionImport.h>
  22. -#endif
  23. +#include <TRFunctionImport.h>
  24.  
  25.  #ifndef ROOT_TThread
  26.  #include<TThread.h>
  27.  #endif
  28.  
  29.  /**
  30.   @namespace ROOT::R
  31.   namespace associated R package for ROOT.
  32.   @defgroup R R Interface for Statistical Computing
  33.   */
  34. diff --git a/bindings/r/src/TRFunctionImport.cxx b/bindings/r/src/TRFunctionImport.cxx
  35. index fb8c142a88..5a45017c83 100644
  36. --- a/bindings/r/src/TRFunctionImport.cxx
  37. +++ b/bindings/r/src/TRFunctionImport.cxx
  38. @@ -1,23 +1,21 @@
  39.  /*************************************************************************
  40.   * Copyright (C)      2015, Omar Andres Zapata Mesa                      *
  41.   * All rights reserved.                                                  *
  42.   *                                                                       *
  43.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  44.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  45.   *************************************************************************/
  46.  #include<TRFunctionImport.h>
  47.  #include <TRObject.h>
  48.  
  49. -#ifndef Rcpp_Function_h
  50. -#include<Rcpp/Function.h>
  51. -#endif
  52. +#include <Rcpp/Function.h>
  53.  
  54.  //______________________________________________________________________________
  55.  /* Begin_Html
  56.  End_Html
  57.  */
  58.  
  59.  
  60.  using namespace ROOT::R;
  61.  ClassImp(TRFunctionImport)
  62.  
  63. diff --git a/core/base/inc/TFileInfo.h b/core/base/inc/TFileInfo.h
  64. index 86b10654a8..59b819d2e4 100644
  65. --- a/core/base/inc/TFileInfo.h
  66. +++ b/core/base/inc/TFileInfo.h
  67. @@ -17,23 +17,21 @@
  68.  // TFileInfo                                                            //
  69.  //                                                                      //
  70.  // Class describing a generic file including meta information.          //
  71.  //                                                                      //
  72.  //////////////////////////////////////////////////////////////////////////
  73.  
  74.  #ifndef ROOT_TNamed
  75.  #include "TNamed.h"
  76.  #endif
  77.  
  78. -#ifndef ROOT_Turl
  79.  #include "TUrl.h"
  80. -#endif
  81.  
  82.  #ifndef ROOT_TUUID
  83.  #include "TUUID.h"
  84.  #endif
  85.  
  86.  #ifndef ROOT_TMD5
  87.  #include "TMD5.h"
  88.  #endif
  89.  
  90.  #ifndef ROOT_TObjString
  91. diff --git a/core/base/src/TListOfTypes.h b/core/base/src/TListOfTypes.h
  92. index c3a4b38ad8..8be940422b 100644
  93. --- a/core/base/src/TListOfTypes.h
  94. +++ b/core/base/src/TListOfTypes.h
  95. @@ -16,23 +16,21 @@
  96.  //                                                                      //
  97.  // TListOfTypes                                                         //
  98.  //                                                                      //
  99.  // A collection of TDataType designed to hold the typedef information   //
  100.  // and numerical type information.  The collection is populated on      //
  101.  // demand.                                                              //
  102.  //                                                                      //
  103.  //////////////////////////////////////////////////////////////////////////
  104.  
  105.  
  106. -#ifndef ROOT_THastTable
  107.  #include "THashTable.h"
  108. -#endif
  109.  
  110.  class TDataType;
  111.  
  112.  class TListOfTypes : public THashTable
  113.  {
  114.  public:
  115.     TListOfTypes();
  116.  
  117.     using THashTable::FindObject;
  118.     virtual TObject   *FindObject(const char *name) const;
  119. diff --git a/core/meta/inc/TListOfDataMembers.h b/core/meta/inc/TListOfDataMembers.h
  120. index 6b44c25187..be8ada7291 100644
  121. --- a/core/meta/inc/TListOfDataMembers.h
  122. +++ b/core/meta/inc/TListOfDataMembers.h
  123. @@ -15,23 +15,21 @@
  124.  //////////////////////////////////////////////////////////////////////////
  125.  //                                                                      //
  126.  // TListOfDataMembers                                                   //
  127.  //                                                                      //
  128.  // A collection of TDataMember objects designed for fast access given a //
  129.  // DeclId_t and for keep track of TDataMember that were described       //
  130.  // unloaded member.                                                     //
  131.  //                                                                      //
  132.  //////////////////////////////////////////////////////////////////////////
  133.  
  134. -#ifndef ROOT_THastList
  135.  #include "THashList.h"
  136. -#endif
  137.  
  138.  #ifndef ROOT_TDictionary
  139.  #include "TDictionary.h"
  140.  #endif
  141.  
  142.  class TExMap;
  143.  class TDataMember;
  144.  
  145.  class TListOfDataMembers : public THashList
  146.  {
  147. diff --git a/core/meta/inc/TListOfEnums.h b/core/meta/inc/TListOfEnums.h
  148. index fe6b3da1b0..c5fae8bf88 100644
  149. --- a/core/meta/inc/TListOfEnums.h
  150. +++ b/core/meta/inc/TListOfEnums.h
  151. @@ -15,23 +15,21 @@
  152.  //////////////////////////////////////////////////////////////////////////
  153.  //                                                                      //
  154.  // TListOfEnums                                                         //
  155.  //                                                                      //
  156.  // A collection of TEnum objects designed for fast access given a       //
  157.  // DeclId_t and for keep track of TEnum that were described             //
  158.  // unloaded enum.                                                       //
  159.  //                                                                      //
  160.  //////////////////////////////////////////////////////////////////////////
  161.  
  162. -#ifndef ROOT_THastList
  163.  #include "THashList.h"
  164. -#endif
  165.  
  166.  #ifndef ROOT_TDictionary
  167.  #include "TDictionary.h"
  168.  #endif
  169.  
  170.  class TExMap;
  171.  class TEnum;
  172.  
  173.  class TListOfEnums : public THashList
  174.  {
  175. diff --git a/core/meta/inc/TListOfFunctionTemplates.h b/core/meta/inc/TListOfFunctionTemplates.h
  176. index a5781d4bf9..3eb7ee63c9 100644
  177. --- a/core/meta/inc/TListOfFunctionTemplates.h
  178. +++ b/core/meta/inc/TListOfFunctionTemplates.h
  179. @@ -15,27 +15,23 @@
  180.  //////////////////////////////////////////////////////////////////////////
  181.  //                                                                      //
  182.  // TListOfFunctionTemplates                                             //
  183.  //                                                                      //
  184.  // A collection of TFunctionTemplate objects designed for fast access   //
  185.  // given a DeclId_t and for keep track of TFunctionTempalte that were   //
  186.  // described unloaded function.                                         //
  187.  //                                                                      //
  188.  //////////////////////////////////////////////////////////////////////////
  189.  
  190. -#ifndef ROOT_THastList
  191.  #include "THashList.h"
  192. -#endif
  193.  
  194. -#ifndef ROOT_THastTable
  195.  #include "THashTable.h"
  196. -#endif
  197.  
  198.  #ifndef ROOT_TDictionary
  199.  #include "TDictionary.h"
  200.  #endif
  201.  
  202.  class TExMap;
  203.  class TFunctionTemplate;
  204.  
  205.  class TListOfFunctionTemplates : public THashList
  206.  {
  207. diff --git a/core/meta/inc/TListOfFunctions.h b/core/meta/inc/TListOfFunctions.h
  208. index 3747dd0cd1..930fdbb764 100644
  209. --- a/core/meta/inc/TListOfFunctions.h
  210. +++ b/core/meta/inc/TListOfFunctions.h
  211. @@ -15,27 +15,23 @@
  212.  //////////////////////////////////////////////////////////////////////////
  213.  //                                                                      //
  214.  // TListOfFunctions                                                     //
  215.  //                                                                      //
  216.  // A collection of TFunction objects designed for fast access given a   //
  217.  // DeclId_t and for keep track of TFunction that were described         //
  218.  // unloaded function.                                                   //
  219.  //                                                                      //
  220.  //////////////////////////////////////////////////////////////////////////
  221.  
  222. -#ifndef ROOT_THastList
  223.  #include "THashList.h"
  224. -#endif
  225.  
  226. -#ifndef ROOT_THastTable
  227.  #include "THashTable.h"
  228. -#endif
  229.  
  230.  #ifndef ROOT_TDictionary
  231.  #include "TDictionary.h"
  232.  #endif
  233.  
  234.  class TExMap;
  235.  class TFunction;
  236.  
  237.  class TListOfFunctions : public THashList
  238.  {
  239. diff --git a/core/rint/inc/TTabCom.h b/core/rint/inc/TTabCom.h
  240. index 203145b18f..6f6ca8805f 100644
  241. --- a/core/rint/inc/TTabCom.h
  242. +++ b/core/rint/inc/TTabCom.h
  243. @@ -32,23 +32,21 @@
  244.  //   global variable, function, or class name                             //
  245.  //                                                                        //
  246.  // Also, something like gWhatever->Func([TAB] will print the appropriate  //
  247.  // list of prototypes. For a list of some limitations see the source.     //
  248.  //                                                                        //
  249.  ////////////////////////////////////////////////////////////////////////////
  250.  
  251.  #ifndef ROOT_TObjString
  252.  #include "TObjString.h"
  253.  #endif
  254. -#ifndef ROOT_TRegExp
  255.  #include "TRegexp.h"
  256. -#endif
  257.  
  258.  
  259.  #define MAX_LEN_PAT 1024               // maximum length of a pattern
  260.  #define dblquote(x) "\"" << x << "\""
  261.  
  262.  // forward declarations
  263.  class TList;
  264.  class TListIter;
  265.  class TSeqCollection;
  266.  class TClass;
  267. diff --git a/geom/geom/inc/TGeoNavigator.h b/geom/geom/inc/TGeoNavigator.h
  268. index 7ec3354efd..f89bc8ea39 100644
  269. --- a/geom/geom/inc/TGeoNavigator.h
  270. +++ b/geom/geom/inc/TGeoNavigator.h
  271. @@ -9,23 +9,21 @@
  272.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  273.   *************************************************************************/
  274.  
  275.  #ifndef ROOT_TGeoNavigator
  276.  #define ROOT_TGeoNavigator
  277.  
  278.  #ifndef ROOT_TObject
  279.  #include "TObject.h"
  280.  #endif
  281.  
  282. -#ifndef ROOT_TGeoNodeCache
  283.  #include "TGeoCache.h"
  284. -#endif
  285.  
  286.  ////////////////////////////////////////////////////////////////////////////
  287.  //                                                                        //
  288.  // TGeoNavigator - Class containing the implementation of all navigation  //
  289.  //   methods.
  290.  //                                                                        //
  291.  ////////////////////////////////////////////////////////////////////////////
  292.  
  293.  class TGeoManager;
  294.  class TGeoNode;
  295. diff --git a/geom/geombuilder/inc/TGeoBBoxEditor.h b/geom/geombuilder/inc/TGeoBBoxEditor.h
  296. index 498e6ef89e..f19c463876 100644
  297. --- a/geom/geombuilder/inc/TGeoBBoxEditor.h
  298. +++ b/geom/geombuilder/inc/TGeoBBoxEditor.h
  299. @@ -12,23 +12,21 @@
  300.  #define ROOT_TGeoBBoxEditor
  301.  
  302.  //////////////////////////////////////////////////////////////////////////
  303.  //                                                                      //
  304.  //  TGeoBBoxEditor                                                      //
  305.  //                                                                      //
  306.  //  Editor for a TGeoBBox.                                              //
  307.  //                                                                      //
  308.  //////////////////////////////////////////////////////////////////////////
  309.  
  310. -#ifndef ROOT_TGButton
  311.  #include "TGWidget.h"
  312. -#endif
  313.  #ifndef ROOT_TGeoGedFrame
  314.  #include "TGeoGedFrame.h"
  315.  #endif
  316.  
  317.  class TGeoBBox;
  318.  class TGeoTabManager;
  319.  class TGTextEntry;
  320.  class TGNumberEntry;
  321.  class TGTab;
  322.  class TGComboBox;
  323. diff --git a/geom/geombuilder/inc/TGeoConeEditor.h b/geom/geombuilder/inc/TGeoConeEditor.h
  324. index 62bbb2380c..66183e6512 100644
  325. --- a/geom/geombuilder/inc/TGeoConeEditor.h
  326. +++ b/geom/geombuilder/inc/TGeoConeEditor.h
  327. @@ -12,23 +12,21 @@
  328.  #define ROOT_TGeoConeEditor
  329.  
  330.  //////////////////////////////////////////////////////////////////////////
  331.  //                                                                      //
  332.  //  TGeoConeEditor                                                      //
  333.  //                                                                      //
  334.  //  Editor for a TGeoCone.                                              //
  335.  //                                                                      //
  336.  //////////////////////////////////////////////////////////////////////////
  337.  
  338. -#ifndef ROOT_TGButton
  339.  #include "TGWidget.h"
  340. -#endif
  341.  #ifndef ROOT_TGeoGedFrame
  342.  #include "TGeoGedFrame.h"
  343.  #endif
  344.  
  345.  class TGeoCone;
  346.  class TGeoConeSeg;
  347.  class TGeoTabManager;
  348.  class TGTextEntry;
  349.  class TGNumberEntry;
  350.  class TGTab;
  351. diff --git a/geom/geombuilder/inc/TGeoEltuEditor.h b/geom/geombuilder/inc/TGeoEltuEditor.h
  352. index 3b8625f4a0..eed5c6502b 100644
  353. --- a/geom/geombuilder/inc/TGeoEltuEditor.h
  354. +++ b/geom/geombuilder/inc/TGeoEltuEditor.h
  355. @@ -12,23 +12,21 @@
  356.  #define ROOT_TGeoEltuEditor
  357.  
  358.  //////////////////////////////////////////////////////////////////////////
  359.  //                                                                      //
  360.  //  TGeoEltuEditor                                                      //
  361.  //                                                                      //
  362.  //  Editor for a TGeoEltu.                                              //
  363.  //                                                                      //
  364.  //////////////////////////////////////////////////////////////////////////
  365.  
  366. -#ifndef ROOT_TGButton
  367.  #include "TGWidget.h"
  368. -#endif
  369.  #ifndef ROOT_TGeoGedFrame
  370.  #include "TGeoGedFrame.h"
  371.  #endif
  372.  
  373.  class TGeoEltu;
  374.  class TGeoTabManager;
  375.  class TGTextEntry;
  376.  class TGNumberEntry;
  377.  class TGTab;
  378.  class TGComboBox;
  379. diff --git a/geom/geombuilder/inc/TGeoHypeEditor.h b/geom/geombuilder/inc/TGeoHypeEditor.h
  380. index 9febdedbc6..5864b3a7a6 100644
  381. --- a/geom/geombuilder/inc/TGeoHypeEditor.h
  382. +++ b/geom/geombuilder/inc/TGeoHypeEditor.h
  383. @@ -12,23 +12,21 @@
  384.  #define ROOT_TGeoHypeEditor
  385.  
  386.  //////////////////////////////////////////////////////////////////////////
  387.  //                                                                      //
  388.  //  TGeoHypeEditor                                                      //
  389.  //                                                                      //
  390.  //  Editor for a TGeoHype.                                              //
  391.  //                                                                      //
  392.  //////////////////////////////////////////////////////////////////////////
  393.  
  394. -#ifndef ROOT_TGButton
  395.  #include "TGWidget.h"
  396. -#endif
  397.  #ifndef ROOT_TGeoGedFrame
  398.  #include "TGeoGedFrame.h"
  399.  #endif
  400.  
  401.  class TGeoHype;
  402.  class TGeoTabManager;
  403.  class TGTextEntry;
  404.  class TGNumberEntry;
  405.  class TGTab;
  406.  class TGComboBox;
  407. diff --git a/geom/geombuilder/inc/TGeoManagerEditor.h b/geom/geombuilder/inc/TGeoManagerEditor.h
  408. index d703c6bed0..0906d1f4f2 100644
  409. --- a/geom/geombuilder/inc/TGeoManagerEditor.h
  410. +++ b/geom/geombuilder/inc/TGeoManagerEditor.h
  411. @@ -13,23 +13,21 @@
  412.  #define ROOT_TGeoManagerEditor
  413.  
  414.  //////////////////////////////////////////////////////////////////////////
  415.  //                                                                      //
  416.  //  TGeoManagerEditor                                                   //
  417.  //                                                                      //
  418.  //  Editor for a TGeoManager.                                           //
  419.  //                                                                      //
  420.  //////////////////////////////////////////////////////////////////////////
  421.  
  422. -#ifndef ROOT_TGButton
  423.  #include "TGWidget.h"
  424. -#endif
  425.  #ifndef ROOT_TGeoGedFrame
  426.  #include "TGeoGedFrame.h"
  427.  #endif
  428.  
  429.  class TGeoManager;
  430.  class TGeoVolume;
  431.  class TGeoShape;
  432.  class TGeoMedium;
  433.  class TGeoMaterial;
  434.  class TGeoMatrix;
  435. diff --git a/geom/geombuilder/inc/TGeoMaterialEditor.h b/geom/geombuilder/inc/TGeoMaterialEditor.h
  436. index a14f29d540..3391b66243 100644
  437. --- a/geom/geombuilder/inc/TGeoMaterialEditor.h
  438. +++ b/geom/geombuilder/inc/TGeoMaterialEditor.h
  439. @@ -12,23 +12,21 @@
  440.  #define ROOT_TGeoMaterialEditor
  441.  
  442.  //////////////////////////////////////////////////////////////////////////
  443.  //                                                                      //
  444.  //  TGeoMaterialEditor                                                  //
  445.  //                                                                      //
  446.  //  Editor for a TGeoMaterial.                                          //
  447.  //                                                                      //
  448.  //////////////////////////////////////////////////////////////////////////
  449.  
  450. -#ifndef ROOT_TGButton
  451.  #include "TGWidget.h"
  452. -#endif
  453.  #ifndef ROOT_TGeoGedFrame
  454.  #include "TGeoGedFrame.h"
  455.  #endif
  456.  
  457.  class TGeoMaterial;
  458.  class TGeoTabManager;
  459.  class TGTextEntry;
  460.  class TGNumberEntry;
  461.  class TGTab;
  462.  class TGComboBox;
  463. diff --git a/geom/geombuilder/inc/TGeoMatrixEditor.h b/geom/geombuilder/inc/TGeoMatrixEditor.h
  464. index 755da8099b..7655d261b1 100644
  465. --- a/geom/geombuilder/inc/TGeoMatrixEditor.h
  466. +++ b/geom/geombuilder/inc/TGeoMatrixEditor.h
  467. @@ -13,23 +13,21 @@
  468.  #define ROOT_TGeoTranslationEditor
  469.  
  470.  //////////////////////////////////////////////////////////////////////////
  471.  //                                                                      //
  472.  //  TGeoTranslationEditor                                               //
  473.  //                                                                      //
  474.  //  Editor for a TGeoTranslation.                                       //
  475.  //                                                                      //
  476.  //////////////////////////////////////////////////////////////////////////
  477.  
  478. -#ifndef ROOT_TGButton
  479.  #include "TGWidget.h"
  480. -#endif
  481.  #ifndef ROOT_TGeoGedFrame
  482.  #include "TGeoGedFrame.h"
  483.  #endif
  484.  
  485.  class TGeoTranslation;
  486.  class TGeoRotation;
  487.  class TGeoCombiTrans;
  488.  class TGTextEntry;
  489.  class TGNumberEntry;
  490.  class TGTab;
  491. diff --git a/geom/geombuilder/inc/TGeoMediumEditor.h b/geom/geombuilder/inc/TGeoMediumEditor.h
  492. index f773d484e1..a477544a8b 100644
  493. --- a/geom/geombuilder/inc/TGeoMediumEditor.h
  494. +++ b/geom/geombuilder/inc/TGeoMediumEditor.h
  495. @@ -13,23 +13,21 @@
  496.  #define ROOT_TGeoMediumEditor
  497.  
  498.  //////////////////////////////////////////////////////////////////////////
  499.  //                                                                      //
  500.  //  TGeoMediumEditor                                                    //
  501.  //                                                                      //
  502.  //  Editor for a TGeoMedium.                                            //
  503.  //                                                                      //
  504.  //////////////////////////////////////////////////////////////////////////
  505.  
  506. -#ifndef ROOT_TGButton
  507.  #include "TGWidget.h"
  508. -#endif
  509.  #ifndef ROOT_TGeoGedFrame
  510.  #include "TGeoGedFrame.h"
  511.  #endif
  512.  
  513.  class TGeoMedium;
  514.  class TGeoMaterial;
  515.  class TGeoTabManager;
  516.  class TGTextEntry;
  517.  class TGNumberEntry;
  518.  class TGTab;
  519. diff --git a/geom/geombuilder/inc/TGeoNodeEditor.h b/geom/geombuilder/inc/TGeoNodeEditor.h
  520. index d12bd5af64..b8aa604bb7 100644
  521. --- a/geom/geombuilder/inc/TGeoNodeEditor.h
  522. +++ b/geom/geombuilder/inc/TGeoNodeEditor.h
  523. @@ -13,23 +13,21 @@
  524.  #define ROOT_TGeoNodeEditor
  525.  
  526.  //////////////////////////////////////////////////////////////////////////
  527.  //                                                                      //
  528.  //  TGeoNodeEditor                                                    //
  529.  //                                                                      //
  530.  //  Editor for a TGeoNode.                                            //
  531.  //                                                                      //
  532.  //////////////////////////////////////////////////////////////////////////
  533.  
  534. -#ifndef ROOT_TGButton
  535.  #include "TGWidget.h"
  536. -#endif
  537.  #ifndef ROOT_TGeoGedFrame
  538.  #include "TGeoGedFrame.h"
  539.  #endif
  540.  
  541.  class TGeoNode;
  542.  class TGeoVolume;
  543.  class TGeoMatrix;
  544.  class TGTextEntry;
  545.  class TGNumberEntry;
  546.  class TGTab;
  547. diff --git a/geom/geombuilder/inc/TGeoParaEditor.h b/geom/geombuilder/inc/TGeoParaEditor.h
  548. index d52fe4ec59..597190548e 100644
  549. --- a/geom/geombuilder/inc/TGeoParaEditor.h
  550. +++ b/geom/geombuilder/inc/TGeoParaEditor.h
  551. @@ -12,23 +12,21 @@
  552.  #define ROOT_TGeoParaEditor
  553.  
  554.  //////////////////////////////////////////////////////////////////////////
  555.  //                                                                      //
  556.  //  TGeoParaEditor                                                      //
  557.  //                                                                      //
  558.  //  Editor for a TGeoPara.                                              //
  559.  //                                                                      //
  560.  //////////////////////////////////////////////////////////////////////////
  561.  
  562. -#ifndef ROOT_TGButton
  563.  #include "TGWidget.h"
  564. -#endif
  565.  #ifndef ROOT_TGeoGedFrame
  566.  #include "TGeoGedFrame.h"
  567.  #endif
  568.  
  569.  class TGeoPara;
  570.  class TGeoTabManager;
  571.  class TGTextEntry;
  572.  class TGNumberEntry;
  573.  class TGTab;
  574.  class TGComboBox;
  575. diff --git a/geom/geombuilder/inc/TGeoPconEditor.h b/geom/geombuilder/inc/TGeoPconEditor.h
  576. index 006d1531b5..57e1b97c9e 100644
  577. --- a/geom/geombuilder/inc/TGeoPconEditor.h
  578. +++ b/geom/geombuilder/inc/TGeoPconEditor.h
  579. @@ -12,23 +12,21 @@
  580.  #define ROOT_TGeoPconEditor
  581.  
  582.  //////////////////////////////////////////////////////////////////////////
  583.  //                                                                      //
  584.  //  TGeoPconEditor                                                      //
  585.  //                                                                      //
  586.  //  Editor for a TGeoPcon.                                              //
  587.  //                                                                      //
  588.  //////////////////////////////////////////////////////////////////////////
  589.  
  590. -#ifndef ROOT_TGButton
  591.  #include "TGWidget.h"
  592. -#endif
  593.  #ifndef ROOT_TGeoGedFrame
  594.  #include "TGeoGedFrame.h"
  595.  #endif
  596.  
  597.  class TGeoPcon;
  598.  class TGeoPconSection;
  599.  class TGeoTabManager;
  600.  class TGTextEntry;
  601.  class TGNumberEntry;
  602.  class TGTab;
  603. diff --git a/geom/geombuilder/inc/TGeoPgonEditor.h b/geom/geombuilder/inc/TGeoPgonEditor.h
  604. index eabe25de98..62ddeac2e9 100644
  605. --- a/geom/geombuilder/inc/TGeoPgonEditor.h
  606. +++ b/geom/geombuilder/inc/TGeoPgonEditor.h
  607. @@ -12,23 +12,21 @@
  608.  #define ROOT_TGeoPgonEditor
  609.  
  610.  //////////////////////////////////////////////////////////////////////////
  611.  //                                                                      //
  612.  //  TGeoPgonEditor                                                      //
  613.  //                                                                      //
  614.  //  Editor for a TGeoPgon.                                              //
  615.  //                                                                      //
  616.  //////////////////////////////////////////////////////////////////////////
  617.  
  618. -#ifndef ROOT_TGButton
  619.  #include "TGWidget.h"
  620. -#endif
  621.  #ifndef ROOT_TGeoPconEditor
  622.  #include "TGeoPconEditor.h"
  623.  #endif
  624.  
  625.  class TGNumberEntry;
  626.  class TGTab;
  627.  
  628.  class TGeoPgonEditor : public TGeoPconEditor {
  629.  
  630.  protected:
  631. diff --git a/geom/geombuilder/inc/TGeoSphereEditor.h b/geom/geombuilder/inc/TGeoSphereEditor.h
  632. index 13d7abeab2..d9d2a2e068 100644
  633. --- a/geom/geombuilder/inc/TGeoSphereEditor.h
  634. +++ b/geom/geombuilder/inc/TGeoSphereEditor.h
  635. @@ -12,23 +12,21 @@
  636.  #define ROOT_TGeoSphereEditor
  637.  
  638.  //////////////////////////////////////////////////////////////////////////
  639.  //                                                                      //
  640.  //  TGeoSphereEditor                                                      //
  641.  //                                                                     //
  642.  //  Editor for a TGeoSphere.                                              //
  643.  //                                                                      //
  644.  //////////////////////////////////////////////////////////////////////////
  645.  
  646. -#ifndef ROOT_TGButton
  647.  #include "TGWidget.h"
  648. -#endif
  649.  #ifndef ROOT_TGeoGedFrame
  650.  #include "TGeoGedFrame.h"
  651.  #endif
  652.  
  653.  class TGeoSphere;
  654.  class TGeoTabManager;
  655.  class TGTextEntry;
  656.  class TGNumberEntry;
  657.  class TGTab;
  658.  class TGComboBox;
  659. diff --git a/geom/geombuilder/inc/TGeoTorusEditor.h b/geom/geombuilder/inc/TGeoTorusEditor.h
  660. index cf68eeef42..ccf7b10f05 100644
  661. --- a/geom/geombuilder/inc/TGeoTorusEditor.h
  662. +++ b/geom/geombuilder/inc/TGeoTorusEditor.h
  663. @@ -12,23 +12,21 @@
  664.  #define ROOT_TGeoTorusEditor
  665.  
  666.  //////////////////////////////////////////////////////////////////////////
  667.  //                                                                      //
  668.  //  TGeoTorusEditor                                                      //
  669.  //                                                                      //
  670.  //  Editor for a TGeoTorus.                                              //
  671.  //                                                                      //
  672.  //////////////////////////////////////////////////////////////////////////
  673.  
  674. -#ifndef ROOT_TGButton
  675.  #include "TGWidget.h"
  676. -#endif
  677.  #ifndef ROOT_TGeoGedFrame
  678.  #include "TGeoGedFrame.h"
  679.  #endif
  680.  
  681.  class TGeoTorus;
  682.  class TGeoTabManager;
  683.  class TGTextEntry;
  684.  class TGNumberEntry;
  685.  class TGTab;
  686.  class TGComboBox;
  687. diff --git a/geom/geombuilder/inc/TGeoTrapEditor.h b/geom/geombuilder/inc/TGeoTrapEditor.h
  688. index ac5286359b..4598f2d688 100644
  689. --- a/geom/geombuilder/inc/TGeoTrapEditor.h
  690. +++ b/geom/geombuilder/inc/TGeoTrapEditor.h
  691. @@ -12,23 +12,21 @@
  692.  #define ROOT_TGeoTrapEditor
  693.  
  694.  //////////////////////////////////////////////////////////////////////////
  695.  //                                                                      //
  696.  //  TGeoTrapEditor                                                      //
  697.  //                                                                      //
  698.  //  Editor for a TGeoTrap.                                              //
  699.  //                                                                      //
  700.  //////////////////////////////////////////////////////////////////////////
  701.  
  702. -#ifndef ROOT_TGButton
  703.  #include "TGWidget.h"
  704. -#endif
  705.  #ifndef ROOT_TGeoGedFrame
  706.  #include "TGeoGedFrame.h"
  707.  #endif
  708.  
  709.  class TGeoTrap;
  710.  class TGeoTabManager;
  711.  class TGTextEntry;
  712.  class TGNumberEntry;
  713.  class TGTab;
  714.  class TGComboBox;
  715. diff --git a/geom/geombuilder/inc/TGeoTrd1Editor.h b/geom/geombuilder/inc/TGeoTrd1Editor.h
  716. index 02120d33b7..162316cf2c 100644
  717. --- a/geom/geombuilder/inc/TGeoTrd1Editor.h
  718. +++ b/geom/geombuilder/inc/TGeoTrd1Editor.h
  719. @@ -12,23 +12,21 @@
  720.  #define ROOT_TGeoTrd1Editor
  721.  
  722.  //////////////////////////////////////////////////////////////////////////
  723.  //                                                                      //
  724.  //  TGeoTrd1Editor                                                      //
  725.  //                                                                      //
  726.  //  Editor for a TGeoTrd1.                                              //
  727.  //                                                                      //
  728.  //////////////////////////////////////////////////////////////////////////
  729.  
  730. -#ifndef ROOT_TGButton
  731.  #include "TGWidget.h"
  732. -#endif
  733.  #ifndef ROOT_TGeoGedFrame
  734.  #include "TGeoGedFrame.h"
  735.  #endif
  736.  
  737.  class TGeoTrd1;
  738.  class TGeoTabManager;
  739.  class TGTextEntry;
  740.  class TGNumberEntry;
  741.  class TGTab;
  742.  class TGComboBox;
  743. diff --git a/geom/geombuilder/inc/TGeoTrd2Editor.h b/geom/geombuilder/inc/TGeoTrd2Editor.h
  744. index 9aa22b8691..3df5f95195 100644
  745. --- a/geom/geombuilder/inc/TGeoTrd2Editor.h
  746. +++ b/geom/geombuilder/inc/TGeoTrd2Editor.h
  747. @@ -12,23 +12,21 @@
  748.  #define ROOT_TGeoTrd2Editor
  749.  
  750.  //////////////////////////////////////////////////////////////////////////
  751.  //                                                                      //
  752.  //  TGeoTrd2Editor                                                      //
  753.  //                                                                      //
  754.  //  Editor for a TGeoTrd2.                                              //
  755.  //                                                                      //
  756.  //////////////////////////////////////////////////////////////////////////
  757.  
  758. -#ifndef ROOT_TGButton
  759.  #include "TGWidget.h"
  760. -#endif
  761.  #ifndef ROOT_TGeoGedFrame
  762.  #include "TGeoGedFrame.h"
  763.  #endif
  764.  
  765.  class TGeoTrd2;
  766.  class TGeoTabManager;
  767.  class TGTextEntry;
  768.  class TGNumberEntry;
  769.  class TGTab;
  770.  class TGComboBox;
  771. diff --git a/geom/geombuilder/inc/TGeoTubeEditor.h b/geom/geombuilder/inc/TGeoTubeEditor.h
  772. index 026bc24161..d6015bc9c6 100644
  773. --- a/geom/geombuilder/inc/TGeoTubeEditor.h
  774. +++ b/geom/geombuilder/inc/TGeoTubeEditor.h
  775. @@ -12,23 +12,21 @@
  776.  #define ROOT_TGeoTubeEditor
  777.  
  778.  //////////////////////////////////////////////////////////////////////////
  779.  //                                                                      //
  780.  //  TGeoTubeEditor                                                      //
  781.  //                                                                      //
  782.  //  Editor for a TGeoTube.                                              //
  783.  //                                                                      //
  784.  //////////////////////////////////////////////////////////////////////////
  785.  
  786. -#ifndef ROOT_TGButton
  787.  #include "TGWidget.h"
  788. -#endif
  789.  #ifndef ROOT_TGeoGedFrame
  790.  #include "TGeoGedFrame.h"
  791.  #endif
  792.  
  793.  class TGeoTube;
  794.  class TGeoTabManager;
  795.  class TGTextEntry;
  796.  class TGNumberEntry;
  797.  class TGTab;
  798.  class TGComboBox;
  799. diff --git a/geom/geombuilder/inc/TGeoVolumeEditor.h b/geom/geombuilder/inc/TGeoVolumeEditor.h
  800. index 7bc97c2b57..c2fac86e4c 100644
  801. --- a/geom/geombuilder/inc/TGeoVolumeEditor.h
  802. +++ b/geom/geombuilder/inc/TGeoVolumeEditor.h
  803. @@ -13,23 +13,21 @@
  804.  #define ROOT_TGeoVolumeEditor
  805.  
  806.  //////////////////////////////////////////////////////////////////////////
  807.  //                                                                      //
  808.  //  TGeoVolumeEditor                                                    //
  809.  //                                                                      //
  810.  //  Editor for a TGeoVolume.                                            //
  811.  //                                                                      //
  812.  //////////////////////////////////////////////////////////////////////////
  813.  
  814. -#ifndef ROOT_TGButton
  815.  #include "TGWidget.h"
  816. -#endif
  817.  #ifndef ROOT_TGeoGedFrame
  818.  #include "TGeoGedFrame.h"
  819.  #endif
  820.  
  821.  class TGeoManager;
  822.  class TGeoVolume;
  823.  class TGeoShape;
  824.  class TGeoMedium;
  825.  class TGeoMaterial;
  826.  class TGeoMatrix;
  827. diff --git a/graf2d/gpad/inc/TClassTree.h b/graf2d/gpad/inc/TClassTree.h
  828. index a959222b6e..4f67737cc9 100644
  829. --- a/graf2d/gpad/inc/TClassTree.h
  830. +++ b/graf2d/gpad/inc/TClassTree.h
  831. @@ -6,23 +6,21 @@
  832.   * All rights reserved.                                                  *
  833.   *                                                                       *
  834.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  835.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  836.   *************************************************************************/
  837.  
  838.  #ifndef ROOT_TClassTree
  839.  #define ROOT_TClassTree
  840.  
  841.  
  842. -#ifndef ROOT_TTnamed
  843.  #include "TNamed.h"
  844. -#endif
  845.  
  846.  class TClass;
  847.  class TObjString;
  848.  
  849.  class TClassTree : public TNamed {
  850.  
  851.  protected:
  852.     TString   fClasses;    ///<List of classes to be drawn
  853.     Float_t   fYoffset;    ///<offset at top of picture in per cent of pad
  854.     Float_t   fLabelDx;    ///<width along x of TPaveLabels in per cent of pad
  855. diff --git a/graf2d/graf/inc/TCandle.h b/graf2d/graf/inc/TCandle.h
  856. index f3496db8f0..6f4d5a110f 100644
  857. --- a/graf2d/graf/inc/TCandle.h
  858. +++ b/graf2d/graf/inc/TCandle.h
  859. @@ -14,23 +14,21 @@
  860.  
  861.  #ifndef ROOT_TObject
  862.  #include "TObject.h"
  863.  #endif
  864.  #ifndef ROOT_TAttLine
  865.  #include "TAttLine.h"
  866.  #endif
  867.  #ifndef ROOT_TAttFill
  868.  #include "TAttFill.h"
  869.  #endif
  870. -#ifndef ROOT_TAttMarket
  871.  #include "TAttMarker.h"
  872. -#endif
  873.  
  874.  #include "TH1D.h"
  875.  #include "TMath.h"
  876.  
  877.  const Int_t kNMAXPOINTS = 2010;  // Max outliers per candle
  878.  
  879.  class TCandle : public TAttLine, public TAttFill, public TAttMarker {
  880.  public:
  881.     //Candle Option
  882.     enum CandleOption {
  883. diff --git a/graf2d/ios/inc/IOSPad.h b/graf2d/ios/inc/IOSPad.h
  884. index 0a1514ee84..68f5ac7485 100644
  885. --- a/graf2d/ios/inc/IOSPad.h
  886. +++ b/graf2d/ios/inc/IOSPad.h
  887. @@ -22,27 +22,23 @@
  888.  // to extend this class for iOS only.                                   //
  889.  //                                                                      //
  890.  //////////////////////////////////////////////////////////////////////////
  891.  
  892.  #include <utility>
  893.  #include <vector>
  894.  #include <string>
  895.  
  896.  #include <CoreGraphics/CGContext.h>
  897.  
  898. -#ifndef ROOT_TLine
  899.  #include "TList.h"
  900. -#endif
  901.  
  902. -#ifndef ROOT_IOSTextOperations
  903.  #include "IOSTextOperations.h"
  904. -#endif
  905.  
  906.  #ifndef ROOT_IOSPainter
  907.  #include "IOSPainter.h"
  908.  #endif
  909.  
  910.  #ifndef ROOT_IOSPadStub
  911.  #include "IOSPadStub.h"
  912.  #endif
  913.  
  914.  namespace ROOT {
  915. diff --git a/graf2d/ios/inc/IOSPainter.h b/graf2d/ios/inc/IOSPainter.h
  916. index d8220a247f..617a0434a0 100644
  917. --- a/graf2d/ios/inc/IOSPainter.h
  918. +++ b/graf2d/ios/inc/IOSPainter.h
  919. @@ -25,23 +25,21 @@
  920.  
  921.  #include <CoreGraphics/CoreGraphics.h>
  922.  
  923.  
  924.  #ifndef ROOT_TVirtualPadPainter
  925.  #include "TVirtualPadPainter.h"
  926.  #endif
  927.  #ifndef ROOT_TextOperations
  928.  #include "IOSTextOperations.h"
  929.  #endif
  930. -#ifndef ROOT_GraphicUtils
  931.  #include "IOSGraphicUtils.h"
  932. -#endif
  933.  #ifndef ROOT_TPoint
  934.  #include "TPoint.h"
  935.  #endif
  936.  
  937.  namespace ROOT {
  938.  namespace iOS {
  939.  
  940.  //
  941.  //SpaceConverter converts coordinates from pad's user space into UIView's userspace.
  942.  //
  943. diff --git a/graf2d/ios/inc/IOSTextOperations.h b/graf2d/ios/inc/IOSTextOperations.h
  944. index 7d8b62e7d1..33a2604154 100644
  945. --- a/graf2d/ios/inc/IOSTextOperations.h
  946. +++ b/graf2d/ios/inc/IOSTextOperations.h
  947. @@ -20,23 +20,21 @@
  948.  // To be extended or completely changed in a future.                    //
  949.  //                                                                      //
  950.  //////////////////////////////////////////////////////////////////////////
  951.  
  952.  #include <vector>
  953.  #include <map>
  954.  
  955.  #include <CoreText/CTFont.h>
  956.  #include <CoreText/CTLine.h>
  957.  
  958. -#ifndef ROOT_IOSResourceManagement
  959.  #include "IOSResourceManagement.h"
  960. -#endif
  961.  
  962.  #ifndef ROOT_Rtypes
  963.  #include "Rtypes.h"
  964.  #endif
  965.  
  966.  namespace ROOT {
  967.  namespace iOS {
  968.  
  969.  class CTLineGuard : public Util::NonCopyable {
  970.     friend class Painter;
  971. diff --git a/graf3d/g3d/inc/TPolyLine3D.h b/graf3d/g3d/inc/TPolyLine3D.h
  972. index 36914a3eb5..09872d5cbc 100644
  973. --- a/graf3d/g3d/inc/TPolyLine3D.h
  974. +++ b/graf3d/g3d/inc/TPolyLine3D.h
  975. @@ -20,23 +20,21 @@
  976.  // A 3-D polyline.                                                      //
  977.  //                                                                      //
  978.  //////////////////////////////////////////////////////////////////////////
  979.  
  980.  #ifndef ROOT_TObject
  981.  #include "TObject.h"
  982.  #endif
  983.  #ifndef ROOT_TList
  984.  #include "TList.h"
  985.  #endif
  986. -#ifndef ROOT_TTString
  987.  #include "TString.h"
  988. -#endif
  989.  #ifndef ROOT_TAttLine
  990.  #include "TAttLine.h"
  991.  #endif
  992.  #ifndef ROOT_TAtt3D
  993.  #include "TAtt3D.h"
  994.  #endif
  995.  
  996.  
  997.  class TPolyLine3D : public TObject, public TAttLine, public TAtt3D
  998.  {
  999. diff --git a/graf3d/g3d/inc/TSPHE.h b/graf3d/g3d/inc/TSPHE.h
  1000. index b204985373..6eeef63f0e 100644
  1001. --- a/graf3d/g3d/inc/TSPHE.h
  1002. +++ b/graf3d/g3d/inc/TSPHE.h
  1003. @@ -14,23 +14,21 @@
  1004.  
  1005.  
  1006.  ////////////////////////////////////////////////////////////////////////////
  1007.  //                                                                        //
  1008.  // TSPHE                                                                  //
  1009.  //                                                                        //
  1010.  // SPHE is Sphere. Not implemented yet.                                   //
  1011.  //                                                                        //
  1012.  ////////////////////////////////////////////////////////////////////////////
  1013.  
  1014. -#ifndef ROOT_TBRIK
  1015.  #include "TShape.h"
  1016. -#endif
  1017.  
  1018.  // const Int_t kDiv = 30;               //default number of z segments for semi-sphere
  1019.  
  1020.  class TSPHE : public TShape {
  1021.  private:
  1022.     // Internal cache
  1023.     mutable Double_t  *fSiTab;       //! Table of sin(fPhimin) .... sin(Phi)
  1024.     mutable Double_t  *fCoTab;       //! Table of cos(fPhimin) .... cos(Phi)
  1025.     mutable Double_t  *fCoThetaTab;  //! Table of sin(gThemin) .... cos(Theta)
  1026.     Int_t      fNdiv;        // number of divisions
  1027. diff --git a/graf3d/gl/inc/CsgOps.h b/graf3d/gl/inc/CsgOps.h
  1028. index 25ca75fab8..fae48f287c 100644
  1029. --- a/graf3d/gl/inc/CsgOps.h
  1030. +++ b/graf3d/gl/inc/CsgOps.h
  1031. @@ -1,19 +1,17 @@
  1032.  // @(#)root/gl:$Id$
  1033.  // Author:  Timur Pocheptsov  01/04/2005
  1034.  
  1035.  #ifndef ROOT_CsgOps
  1036.  #define ROOT_CsgOps
  1037.  
  1038. -#ifndef ROOT_Rtype
  1039.  #include "Rtypes.h"
  1040. -#endif
  1041.  
  1042.  class TBuffer3D;
  1043.  
  1044.  namespace RootCsg {
  1045.  
  1046.     // I need TBaseMesh to have an opaque pointer
  1047.     // to hidden representation of resulting mesh.
  1048.  
  1049.  class TBaseMesh {
  1050.  public:
  1051. diff --git a/graf3d/gl/inc/TGLMarchingCubes.h b/graf3d/gl/inc/TGLMarchingCubes.h
  1052. index f5900d2769..c7102cb904 100644
  1053. --- a/graf3d/gl/inc/TGLMarchingCubes.h
  1054. +++ b/graf3d/gl/inc/TGLMarchingCubes.h
  1055. @@ -14,23 +14,21 @@
  1056.  
  1057.  #include <vector>
  1058.  
  1059.  #ifndef ROOT_TH3
  1060.  #include "TH3.h"
  1061.  #endif
  1062.  
  1063.  #ifndef ROOT_TGLIsoMesh
  1064.  #include "TGLIsoMesh.h"
  1065.  #endif
  1066. -#ifndef ROOT_TKDEAdapter
  1067.  #include "TKDEAdapter.h"
  1068. -#endif
  1069.  
  1070.  /*
  1071.  Implementation of "marching cubes" algortihm for GL module. Used by
  1072.  TGLTF3Painter and TGLIsoPainter.
  1073.  Good and clear algorithm explanation can be found here:
  1074.  http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/
  1075.  */
  1076.  
  1077.  class TF3;
  1078.  class TKDEFGT;
  1079. diff --git a/graf3d/gl/inc/TGLOverlayButton.h b/graf3d/gl/inc/TGLOverlayButton.h
  1080. index 9b63397166..0732b68c0f 100644
  1081. --- a/graf3d/gl/inc/TGLOverlayButton.h
  1082. +++ b/graf3d/gl/inc/TGLOverlayButton.h
  1083. @@ -5,23 +5,21 @@
  1084.   * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers.               *
  1085.   * All rights reserved.                                                  *
  1086.   *                                                                       *
  1087.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  1088.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  1089.   *************************************************************************/
  1090.  
  1091.  #ifndef ROOT_TGLOverlayButton
  1092.  #define ROOT_TGLOverlayButton
  1093.  
  1094. -#ifndef ROOT_TGLOverlay
  1095.  #include "TGLOverlay.h"
  1096. -#endif
  1097.  #ifndef ROOT_TGLFontManager
  1098.  #include "TGLFontManager.h"
  1099.  #endif
  1100.  #ifndef ROOT_TGLViewerBase
  1101.  #include "TGLViewerBase.h"
  1102.  #endif
  1103.  #ifndef ROOT_TQObject
  1104.  #include "TQObject.h"
  1105.  #endif
  1106.  
  1107. diff --git a/graf3d/gl/inc/TGLPadPainter.h b/graf3d/gl/inc/TGLPadPainter.h
  1108. index 4a174175fb..fa80a6a69a 100644
  1109. --- a/graf3d/gl/inc/TGLPadPainter.h
  1110. +++ b/graf3d/gl/inc/TGLPadPainter.h
  1111. @@ -10,23 +10,21 @@
  1112.   *************************************************************************/
  1113.  
  1114.  #ifndef ROOT_TGLPadPainter
  1115.  #define ROOT_TGLPadPainter
  1116.  
  1117.  #include <deque>
  1118.  
  1119.  #ifndef ROOT_TVirtualPadPainter
  1120.  #include "TVirtualPadPainter.h"
  1121.  #endif
  1122. -#ifndef ROOT_TGLFontmanager
  1123.  #include "TGLFontManager.h"
  1124. -#endif
  1125.  #ifndef ROOT_TGLPadUtils
  1126.  #include "TGLPadUtils.h"
  1127.  #endif
  1128.  #ifndef ROOT_TPoint
  1129.  #include "TPoint.h"
  1130.  #endif
  1131.  
  1132.  class TLinearGradient;
  1133.  class TRadialGradient;
  1134.  /*
  1135. diff --git a/graf3d/gl/inc/TGLPadUtils.h b/graf3d/gl/inc/TGLPadUtils.h
  1136. index f2336f8534..de9adac7e0 100644
  1137. --- a/graf3d/gl/inc/TGLPadUtils.h
  1138. +++ b/graf3d/gl/inc/TGLPadUtils.h
  1139. @@ -8,23 +8,21 @@
  1140.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  1141.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  1142.   *************************************************************************/
  1143.  
  1144.  #ifndef ROOT_TGLPadUtils
  1145.  #define ROOT_TGLPadUtils
  1146.  
  1147.  #include <vector>
  1148.  #include <list>
  1149.  
  1150. -#ifndef ROOT_RStipples
  1151.  #include "RStipples.h"
  1152. -#endif
  1153.  #ifndef ROOT_TPoint
  1154.  #include "TPoint.h"
  1155.  #endif
  1156.  #ifndef ROOT_Rtypes
  1157.  #include "Rtypes.h"
  1158.  #endif
  1159.  
  1160.  class TGLPadPainter;//For friend declarations.
  1161.  
  1162.  /*
  1163. diff --git a/graf3d/gl/inc/TGLPlotPainter.h b/graf3d/gl/inc/TGLPlotPainter.h
  1164. index ec7b5a74ed..3b38757b99 100644
  1165. --- a/graf3d/gl/inc/TGLPlotPainter.h
  1166. +++ b/graf3d/gl/inc/TGLPlotPainter.h
  1167. @@ -10,23 +10,21 @@
  1168.   *************************************************************************/
  1169.  
  1170.  #ifndef ROOT_TGLPlotPainter
  1171.  #define ROOT_TGLPlotPainter
  1172.  
  1173.  #include <vector>
  1174.  
  1175.  #ifndef ROOT_TVirtualGL
  1176.  #include "TVirtualGL.h"
  1177.  #endif
  1178. -#ifndef ROOT_TGLPlotBox
  1179.  #include "TGLPlotBox.h"
  1180. -#endif
  1181.  #ifndef ROOT_TPoint
  1182.  #include "TPoint.h"
  1183.  #endif
  1184.  #ifndef ROOT_TGLUtil
  1185.  #include "TGLUtil.h"
  1186.  #endif
  1187.  #ifndef ROOT_TNamed
  1188.  #include "TNamed.h"
  1189.  #endif
  1190.  
  1191. diff --git a/graf3d/gl/inc/TGLScenePad.h b/graf3d/gl/inc/TGLScenePad.h
  1192. index 768f2b7e64..db228d95b9 100644
  1193. --- a/graf3d/gl/inc/TGLScenePad.h
  1194. +++ b/graf3d/gl/inc/TGLScenePad.h
  1195. @@ -5,23 +5,21 @@
  1196.   * Copyright (C) 1995-2004, Rene Brun and Fons Rademakers.               *
  1197.   * All rights reserved.                                                  *
  1198.   *                                                                       *
  1199.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  1200.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  1201.   *************************************************************************/
  1202.  
  1203.  #ifndef ROOT_TGLScenePad
  1204.  #define ROOT_TGLScenePad
  1205.  
  1206. -#ifndef ROOT_TGLScene
  1207.  #include "TGLScene.h"
  1208. -#endif
  1209.  #ifndef ROOT_TVirtualViewer3D
  1210.  #include "TVirtualViewer3D.h"
  1211.  #endif
  1212.  #ifndef ROOT_CsgOps
  1213.  #include "CsgOps.h"
  1214.  #endif
  1215.  
  1216.  
  1217.  class TGLViewer;
  1218.  class TGLFaceSet;
  1219. diff --git a/gui/fitpanel/inc/TFitParametersDialog.h b/gui/fitpanel/inc/TFitParametersDialog.h
  1220. index cfeb167646..b848b406e8 100644
  1221. --- a/gui/fitpanel/inc/TFitParametersDialog.h
  1222. +++ b/gui/fitpanel/inc/TFitParametersDialog.h
  1223. @@ -13,23 +13,21 @@
  1224.  #define ROOT_TFitParametersDialog
  1225.  
  1226.  //////////////////////////////////////////////////////////////////////////
  1227.  //                                                                      //
  1228.  //  TFitParametersDialog                                                //
  1229.  //                                                                      //
  1230.  //  This class is used for fit function parameter settings.             //
  1231.  //                                                                      //
  1232.  //////////////////////////////////////////////////////////////////////////
  1233.  
  1234. -#ifndef ROOT_TGButton
  1235.  #include "TGWidget.h"
  1236. -#endif
  1237.  #ifndef ROOT_TGFrame
  1238.  #include "TGFrame.h"
  1239.  #endif
  1240.  
  1241.  enum EFPDialogBound {
  1242.     kFPDBounded,
  1243.     kFPDNoneBounded
  1244.  };
  1245.  
  1246.  /// Enumeration specifying if parameters
  1247. diff --git a/gui/sessionviewer/inc/TSessionLogView.h b/gui/sessionviewer/inc/TSessionLogView.h
  1248. index ff4297cbc0..3ea1743537 100644
  1249. --- a/gui/sessionviewer/inc/TSessionLogView.h
  1250. +++ b/gui/sessionviewer/inc/TSessionLogView.h
  1251. @@ -13,23 +13,21 @@
  1252.  #define ROOT_TSessionLogView
  1253.  
  1254.  #ifndef ROOT_TGFrame
  1255.  #include "TGFrame.h"
  1256.  #endif
  1257.  
  1258.  #ifndef ROOT_TGButton
  1259.  #include "TGButton.h"
  1260.  #endif
  1261.  
  1262. -#ifndef ROOT_TTextView
  1263.  #include "TGTextView.h"
  1264. -#endif
  1265.  
  1266.  class TSessionViewer;
  1267.  
  1268.  class TSessionLogView : public TGTransientFrame {
  1269.  
  1270.  private:
  1271.     TSessionViewer       *fViewer;   // pointer on main viewer
  1272.     TGTextView           *fTextView; // Text view widget
  1273.     TGTextButton         *fClose;    // OK button
  1274.     TGLayoutHints        *fL1;       // layout of TGTextEdit
  1275. diff --git a/hist/hist/inc/TAxisModLab.h b/hist/hist/inc/TAxisModLab.h
  1276. index 26faf0dafe..858b1717d6 100644
  1277. --- a/hist/hist/inc/TAxisModLab.h
  1278. +++ b/hist/hist/inc/TAxisModLab.h
  1279. @@ -5,23 +5,21 @@
  1280.   * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers.               *
  1281.   * All rights reserved.                                                  *
  1282.   *                                                                       *
  1283.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  1284.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  1285.   *************************************************************************/
  1286.  
  1287.  #ifndef ROOT_TAxisModLab
  1288.  #define ROOT_TAxisModLab
  1289.  
  1290. -#ifndef ROOT_TAttText
  1291.  #include "TObject.h"
  1292. -#endif
  1293.  
  1294.  #ifndef ROOT_TAttText
  1295.  #include "TAttText.h"
  1296.  #endif
  1297.  
  1298.  #ifndef ROOT_TString
  1299.  #include "TString.h"
  1300.  #endif
  1301.  
  1302.  class TAxisModLab : public TObject, public TAttText {
  1303. diff --git a/hist/hist/inc/TBackCompFitter.h b/hist/hist/inc/TBackCompFitter.h
  1304. index 5ab02f838c..108d09983a 100644
  1305. --- a/hist/hist/inc/TBackCompFitter.h
  1306. +++ b/hist/hist/inc/TBackCompFitter.h
  1307. @@ -14,23 +14,21 @@
  1308.  #include "TVirtualFitter.h"
  1309.  #endif
  1310.  
  1311.  #include "Fit/BasicFCN.h"
  1312.  #include "Fit/FitResult.h"
  1313.  
  1314.  #ifndef ROOT_Fit_Fitter
  1315.  #include "Fit/Fitter.h"
  1316.  #endif
  1317.  
  1318. -#ifndef ROOT_Fit_DataVector
  1319.  #include "Fit/DataVector.h"
  1320. -#endif
  1321.  
  1322.  #ifndef ROOT_Math_IFunctionfwd
  1323.  #include "Math/IFunctionfwd.h"
  1324.  #endif
  1325.  
  1326.  
  1327.  
  1328.  #include <vector>
  1329.  
  1330.  /*
  1331. diff --git a/hist/hist/inc/TFitResult.h b/hist/hist/inc/TFitResult.h
  1332. index 436fc8d9c3..42be2d84d2 100644
  1333. --- a/hist/hist/inc/TFitResult.h
  1334. +++ b/hist/hist/inc/TFitResult.h
  1335. @@ -18,23 +18,21 @@
  1336.  //                                                                      //
  1337.  // Provides a way to view the fit result and to store them.             //
  1338.  //                                                                      //
  1339.  //                                                                      //
  1340.  //////////////////////////////////////////////////////////////////////////
  1341.  
  1342.  #ifndef ROOT_TNamed
  1343.  #include "TNamed.h"
  1344.  #endif
  1345.  
  1346. -#ifndef ROOT_FIT_FitResult
  1347.  #include "Fit/FitResult.h"
  1348. -#endif
  1349.  
  1350.  #ifndef ROOT_TMatrixDSym
  1351.  #include "TMatrixDSym.h"
  1352.  #endif
  1353.  
  1354.  class TFitResult:public TNamed, public ROOT::Fit::FitResult {
  1355.  
  1356.  public:
  1357.  
  1358.     // Default constructor for I/O
  1359. diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h
  1360. index d82bbcdcfd..5290cc4288 100644
  1361. --- a/hist/hist/inc/v5/TF1Data.h
  1362. +++ b/hist/hist/inc/v5/TF1Data.h
  1363. @@ -18,23 +18,21 @@
  1364.  //////////////////////////////////////////////////////////////////////////
  1365.  //                                                                      //
  1366.  // TF1Data                                                                 //
  1367.  //                                                                      //
  1368.  // Dummy class with same structure of v5::TF1 objects
  1369.  // used only for reading the old files                                   //
  1370.  //////////////////////////////////////////////////////////////////////////
  1371.  
  1372.  #include "RConfigure.h"
  1373.  
  1374. -#ifndef ROOT_v5_TFormula
  1375.  #include "v5/TFormula.h"
  1376. -#endif
  1377.  #ifndef ROOT_TAttLine
  1378.  #include "TAttLine.h"
  1379.  #endif
  1380.  #ifndef ROOT_TAttFill
  1381.  #include "TAttFill.h"
  1382.  #endif
  1383.  #ifndef ROOT_TAttMarker
  1384.  #include "TAttMarker.h"
  1385.  #endif
  1386.  
  1387. diff --git a/hist/histpainter/inc/TGraph2DPainter.h b/hist/histpainter/inc/TGraph2DPainter.h
  1388. index d3bead83d4..7c9ebad5a7 100644
  1389. --- a/hist/histpainter/inc/TGraph2DPainter.h
  1390. +++ b/hist/histpainter/inc/TGraph2DPainter.h
  1391. @@ -14,23 +14,21 @@
  1392.  
  1393.  
  1394.  //////////////////////////////////////////////////////////////////////////
  1395.  //                                                                      //
  1396.  // TGraph2DPainter                                                      //
  1397.  //                                                                      //
  1398.  // helper class to draw 2D graphs                                       //
  1399.  //                                                                      //
  1400.  //////////////////////////////////////////////////////////////////////////
  1401.  
  1402. -#ifndef ROOT_Object
  1403.  #include "TObject.h"
  1404. -#endif
  1405.  
  1406.  class TGraph2D;
  1407.  class TGraphDelaunay;
  1408.  class TGraphDelaunay2D;
  1409.  class TList;
  1410.  
  1411.  class TGraph2DPainter : public TObject {
  1412.  
  1413.  protected:
  1414.  
  1415. diff --git a/io/io/inc/TCollectionProxyFactory.h b/io/io/inc/TCollectionProxyFactory.h
  1416. index 500eac7a5d..d9819a9340 100644
  1417. --- a/io/io/inc/TCollectionProxyFactory.h
  1418. +++ b/io/io/inc/TCollectionProxyFactory.h
  1419. @@ -17,23 +17,21 @@
  1420.  //  recursive calls.
  1421.  //
  1422.  //////////////////////////////////////////////////////////////////////////
  1423.  
  1424.  #include <vector>
  1425.  
  1426.  #ifndef ROOT_TCollectionProxyInfo
  1427.  #include "TCollectionProxyInfo.h"
  1428.  #endif
  1429.  
  1430. -#ifndef ROOT_TClassStreamer
  1431.  #include "TClassStreamer.h"
  1432. -#endif
  1433.  
  1434.  #ifndef ROOT_TMemberStreamer
  1435.  #include "TMemberStreamer.h"
  1436.  #endif
  1437.  
  1438.  #ifndef ROOT_TGenCollectionProxy
  1439.  #include "TGenCollectionProxy.h"
  1440.  #endif
  1441.  
  1442.  // Forward declarations
  1443. diff --git a/math/genvector/inc/Math/GenVector/Cartesian2D.h b/math/genvector/inc/Math/GenVector/Cartesian2D.h
  1444. index c43a62f5ec..cea1e053ab 100644
  1445. --- a/math/genvector/inc/Math/GenVector/Cartesian2D.h
  1446. +++ b/math/genvector/inc/Math/GenVector/Cartesian2D.h
  1447. @@ -214,23 +214,21 @@ private:
  1448.  
  1449.  
  1450.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1451.  // need to put here setter methods to resolve nasty cyclical dependencies
  1452.  // I need to include other coordinate systems only when Cartesian is already defined
  1453.  // since they depend on it
  1454.  
  1455.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1456.  #include "Math/GenVector/GenVector_exception.h"
  1457.  #endif
  1458. -#ifndef ROOT_Math_GenVector_Polar2D
  1459.  #include "Math/GenVector/Polar2D.h"
  1460. -#endif
  1461.  
  1462.  // ====== Set member functions for coordinates in other systems =======
  1463.  
  1464.  namespace ROOT {
  1465.  
  1466.     namespace Math {
  1467.  
  1468.        template <class T>
  1469.        void Cartesian2D<T>::SetR(Scalar r) {
  1470.           GenVector_exception e("Cartesian2D::SetR() is not supposed to be called");
  1471. diff --git a/math/genvector/inc/Math/GenVector/Cartesian3D.h b/math/genvector/inc/Math/GenVector/Cartesian3D.h
  1472. index 3737348c2c..51fd4a62ca 100644
  1473. --- a/math/genvector/inc/Math/GenVector/Cartesian3D.h
  1474. +++ b/math/genvector/inc/Math/GenVector/Cartesian3D.h
  1475. @@ -248,26 +248,22 @@ private:
  1476.  } // end namespace ROOT
  1477.  
  1478.  
  1479.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1480.  // need to put here setter methods to resolve nasty cyclical dependencies
  1481.  // I need to include other coordinate systems only when Cartesian is already defined
  1482.  // since they depend on it
  1483.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1484.  #include "Math/GenVector/GenVector_exception.h"
  1485.  #endif
  1486. -#ifndef ROOT_Math_GenVector_CylindricalEta3D
  1487.  #include "Math/GenVector/CylindricalEta3D.h"
  1488. -#endif
  1489. -#ifndef ROOT_Math_GenVector_Polar3D
  1490.  #include "Math/GenVector/Polar3D.h"
  1491. -#endif
  1492.  
  1493.    // ====== Set member functions for coordinates in other systems =======
  1494.  
  1495.  namespace ROOT {
  1496.  
  1497.    namespace Math {
  1498.  
  1499.  template <class T>
  1500.  void Cartesian3D<T>::SetR(Scalar r) {
  1501.     GenVector_exception e("Cartesian3D::SetR() is not supposed to be called");
  1502. diff --git a/math/genvector/inc/Math/GenVector/Cylindrical3D.h b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
  1503. index 809fb72777..18e8fa4d8f 100644
  1504. --- a/math/genvector/inc/Math/GenVector/Cylindrical3D.h
  1505. +++ b/math/genvector/inc/Math/GenVector/Cylindrical3D.h
  1506. @@ -246,35 +246,29 @@ private:
  1507.     T fPhi;
  1508.  
  1509.  };
  1510.  
  1511.    } // end namespace Math
  1512.  
  1513.  } // end namespace ROOT
  1514.  
  1515.  // move implementations here to avoid circle dependencies
  1516.  
  1517. -#ifndef ROOT_Math_GenVector_Cartesian3D
  1518.  #include "Math/GenVector/Cartesian3D.h"
  1519. -#endif
  1520.  
  1521.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1522.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1523.  #include "Math/GenVector/GenVector_exception.h"
  1524.  #endif
  1525. -#ifndef ROOT_Math_GenVector_CylindricalEta3D
  1526.  #include "Math/GenVector/CylindricalEta3D.h"
  1527. -#endif
  1528. -#ifndef ROOT_Math_GenVector_Polar3D
  1529.  #include "Math/GenVector/Polar3D.h"
  1530.  #endif
  1531. -#endif
  1532.  
  1533.  namespace ROOT {
  1534.  
  1535.    namespace Math {
  1536.  
  1537.  template <class T>
  1538.  void Cylindrical3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
  1539.     *this = Cartesian3D<Scalar>(xx, yy, zz);
  1540.  }
  1541.  
  1542. diff --git a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
  1543. index 53b59b17fa..b34acc40c4 100644
  1544. --- a/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
  1545. +++ b/math/genvector/inc/Math/GenVector/CylindricalEta3D.h
  1546. @@ -274,32 +274,28 @@ private:
  1547.  
  1548.  };
  1549.  
  1550.    } // end namespace Math
  1551.  
  1552.  } // end namespace ROOT
  1553.  
  1554.  
  1555.  // move implementations here to avoid circle dependencies
  1556.  
  1557. -#ifndef ROOT_Math_GenVector_Cartesian3D
  1558.  #include "Math/GenVector/Cartesian3D.h"
  1559. -#endif
  1560.  
  1561.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1562.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1563.  #include "Math/GenVector/GenVector_exception.h"
  1564.  #endif
  1565. -#ifndef ROOT_Math_GenVector_Polar3D
  1566.  #include "Math/GenVector/Polar3D.h"
  1567.  #endif
  1568. -#endif
  1569.  
  1570.  namespace ROOT {
  1571.  
  1572.    namespace Math {
  1573.  
  1574.  template <class T>
  1575.  void CylindricalEta3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
  1576.     *this = Cartesian3D<Scalar>(xx, yy, zz);
  1577.  }
  1578.  
  1579. diff --git a/math/genvector/inc/Math/GenVector/DisplacementVector2D.h b/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
  1580. index 423240b0c6..976a53f0fe 100644
  1581. --- a/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
  1582. +++ b/math/genvector/inc/Math/GenVector/DisplacementVector2D.h
  1583. @@ -10,23 +10,21 @@
  1584.    **********************************************************************/
  1585.  
  1586.  // Header source file for class DisplacementVector2D
  1587.  //
  1588.  // Created by: Lorenzo Moneta  at Mon Apr 16 2007
  1589.  //
  1590.  
  1591.  #ifndef ROOT_Math_GenVector_DisplacementVector2D
  1592.  #define ROOT_Math_GenVector_DisplacementVector2D  1
  1593.  
  1594. -#ifndef ROOT_Math_GenVector_Cartesian2D
  1595.  #include "Math/GenVector/Cartesian2D.h"
  1596. -#endif
  1597.  
  1598.  #ifndef ROOT_Math_GenVector_PositionVector2Dfwd
  1599.  #include "Math/GenVector/PositionVector2Dfwd.h"
  1600.  #endif
  1601.  
  1602.  #ifndef ROOT_Math_GenVector_GenVectorIO
  1603.  #include "Math/GenVector/GenVectorIO.h"
  1604.  #endif
  1605.  
  1606.  #ifndef ROOT_Math_GenVector_BitReproducible
  1607. diff --git a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
  1608. index 66d82c8c9a..37b898f917 100644
  1609. --- a/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
  1610. +++ b/math/genvector/inc/Math/GenVector/DisplacementVector3D.h
  1611. @@ -13,23 +13,21 @@
  1612.  //
  1613.  // Created by: Lorenzo Moneta  at Mon May 30 12:21:43 2005
  1614.  // Major rewrite: M. FIschler  at Wed Jun  8  2005
  1615.  //
  1616.  // Last update: $Id$
  1617.  //
  1618.  
  1619.  #ifndef ROOT_Math_GenVector_DisplacementVector3D
  1620.  #define ROOT_Math_GenVector_DisplacementVector3D  1
  1621.  
  1622. -#ifndef ROOT_Math_GenVector_Cartesian3D
  1623.  #include "Math/GenVector/Cartesian3D.h"
  1624. -#endif
  1625.  
  1626.  #ifndef ROOT_Math_GenVector_PositionVector3Dfwd
  1627.  #include "Math/GenVector/PositionVector3Dfwd.h"
  1628.  #endif
  1629.  
  1630.  #ifndef ROOT_Math_GenVector_GenVectorIO
  1631.  #include "Math/GenVector/GenVectorIO.h"
  1632.  #endif
  1633.  
  1634.  #ifndef ROOT_Math_GenVector_BitReproducible
  1635. diff --git a/math/genvector/inc/Math/GenVector/LorentzVector.h b/math/genvector/inc/Math/GenVector/LorentzVector.h
  1636. index 27b5fd90dc..2b55f8b948 100644
  1637. --- a/math/genvector/inc/Math/GenVector/LorentzVector.h
  1638. +++ b/math/genvector/inc/Math/GenVector/LorentzVector.h
  1639. @@ -11,27 +11,23 @@
  1640.  // Header file for class LorentzVector
  1641.  //
  1642.  // Created by:    moneta   at Tue May 31 17:06:09 2005
  1643.  // Major mods by: fischler at Wed Jul 20   2005
  1644.  //
  1645.  // Last update: $Id$
  1646.  //
  1647.  #ifndef ROOT_Math_GenVector_LorentzVector
  1648.  #define ROOT_Math_GenVector_LorentzVector  1
  1649.  
  1650. -#ifndef ROOT_Math_GenVector_PxPyPzE4D
  1651.  #include "Math/GenVector/PxPyPzE4D.h"
  1652. -#endif
  1653.  
  1654. -#ifndef ROOT_Math_GenVector_DisplacementVector3D
  1655.  #include "Math/GenVector/DisplacementVector3D.h"
  1656. -#endif
  1657.  
  1658.  #ifndef ROOT_Math_GenVector_GenVectorIO
  1659.  #include "Math/GenVector/GenVectorIO.h"
  1660.  #endif
  1661.  
  1662.  
  1663.  
  1664.  namespace ROOT {
  1665.  
  1666.    namespace Math {
  1667. diff --git a/math/genvector/inc/Math/GenVector/Polar2D.h b/math/genvector/inc/Math/GenVector/Polar2D.h
  1668. index 39b72c4c9d..0c7109a881 100644
  1669. --- a/math/genvector/inc/Math/GenVector/Polar2D.h
  1670. +++ b/math/genvector/inc/Math/GenVector/Polar2D.h
  1671. @@ -219,23 +219,21 @@ private:
  1672.  };
  1673.  
  1674.  
  1675.     } // end namespace Math
  1676.  
  1677.  } // end namespace ROOT
  1678.  
  1679.  
  1680.  // move implementations here to avoid circle dependencies
  1681.  
  1682. -#ifndef ROOT_Math_GenVector_Cartesian2D
  1683.  #include "Math/GenVector/Cartesian2D.h"
  1684. -#endif
  1685.  
  1686.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1687.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1688.  #include "Math/GenVector/GenVector_exception.h"
  1689.  #endif
  1690.  #endif
  1691.  
  1692.  namespace ROOT {
  1693.  
  1694.     namespace Math {
  1695. diff --git a/math/genvector/inc/Math/GenVector/Polar3D.h b/math/genvector/inc/Math/GenVector/Polar3D.h
  1696. index 8023293c46..9ef73ed493 100644
  1697. --- a/math/genvector/inc/Math/GenVector/Polar3D.h
  1698. +++ b/math/genvector/inc/Math/GenVector/Polar3D.h
  1699. @@ -243,32 +243,28 @@ private:
  1700.  };
  1701.  
  1702.  
  1703.  
  1704.    } // end namespace Math
  1705.  
  1706.  } // end namespace ROOT
  1707.  
  1708.  // move implementations here to avoid circle dependencies
  1709.  
  1710. -#ifndef ROOT_Math_GenVector_Cartesian3D
  1711.  #include "Math/GenVector/Cartesian3D.h"
  1712. -#endif
  1713.  
  1714.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1715.  #ifndef ROOT_Math_GenVector_GenVector_exception
  1716.  #include "Math/GenVector/GenVector_exception.h"
  1717.  #endif
  1718. -#ifndef ROOT_Math_GenVector_CylindricalEta3D
  1719.  #include "Math/GenVector/CylindricalEta3D.h"
  1720.  #endif
  1721. -#endif
  1722.  
  1723.  
  1724.  namespace ROOT {
  1725.  
  1726.    namespace Math {
  1727.  
  1728.  template <class T>
  1729.  void Polar3D<T>::SetXYZ(Scalar xx, Scalar yy, Scalar zz) {
  1730.     *this = Cartesian3D<Scalar>(xx, yy, zz);
  1731.  }
  1732. diff --git a/math/genvector/inc/Math/GenVector/PositionVector2D.h b/math/genvector/inc/Math/GenVector/PositionVector2D.h
  1733. index 7ffb8ba8b1..da708b2ef0 100644
  1734. --- a/math/genvector/inc/Math/GenVector/PositionVector2D.h
  1735. +++ b/math/genvector/inc/Math/GenVector/PositionVector2D.h
  1736. @@ -9,23 +9,21 @@
  1737.    **********************************************************************/
  1738.  
  1739.  // Header file for class PositionVector2D
  1740.  //
  1741.  // Created by: Lorenzo Moneta  at Mon Apr 16 2007
  1742.  //
  1743.  //
  1744.  #ifndef ROOT_Math_GenVector_PositionVector2D
  1745.  #define ROOT_Math_GenVector_PositionVector2D  1
  1746.  
  1747. -#ifndef ROOT_Math_GenVector_DisplacementVector2Dfwd
  1748.  #include "Math/GenVector/DisplacementVector2D.h"
  1749. -#endif
  1750.  
  1751.  #ifndef ROOT_Math_GenVector_GenVectorIO
  1752.  #include "Math/GenVector/GenVectorIO.h"
  1753.  #endif
  1754.  
  1755.  #ifndef ROOT_Math_GenVector_BitReproducible
  1756.  #include "Math/GenVector/BitReproducible.h"
  1757.  #endif
  1758.  
  1759.  #ifndef ROOT_Math_GenVector_CoordinateSystemTags
  1760. diff --git a/math/genvector/inc/Math/GenVector/PositionVector3D.h b/math/genvector/inc/Math/GenVector/PositionVector3D.h
  1761. index b567bc0f0a..2be3ce00e0 100644
  1762. --- a/math/genvector/inc/Math/GenVector/PositionVector3D.h
  1763. +++ b/math/genvector/inc/Math/GenVector/PositionVector3D.h
  1764. @@ -14,23 +14,21 @@
  1765.  //
  1766.  // Last update: $Id$
  1767.  //
  1768.  #ifndef ROOT_Math_GenVector_PositionVector3D
  1769.  #define ROOT_Math_GenVector_PositionVector3D  1
  1770.  
  1771.  #ifndef ROOT_Math_GenVector_DisplacementVector3Dfwd
  1772.  #include "Math/GenVector/DisplacementVector3Dfwd.h"
  1773.  #endif
  1774.  
  1775. -#ifndef ROOT_Math_GenVector_Cartesian3D
  1776.  #include "Math/GenVector/Cartesian3D.h"
  1777. -#endif
  1778.  
  1779.  #ifndef ROOT_Math_GenVector_GenVectorIO
  1780.  #include "Math/GenVector/GenVectorIO.h"
  1781.  #endif
  1782.  
  1783.  #ifndef ROOT_Math_GenVector_BitReproducible
  1784.  #include "Math/GenVector/BitReproducible.h"
  1785.  #endif
  1786.  
  1787.  #ifndef ROOT_Math_GenVector_CoordinateSystemTags
  1788. diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
  1789. index 81326a5df2..460c3029f8 100644
  1790. --- a/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
  1791. +++ b/math/genvector/inc/Math/GenVector/PtEtaPhiE4D.h
  1792. @@ -364,28 +364,24 @@ private:
  1793.  
  1794.  };
  1795.  
  1796.  
  1797.  } // end namespace Math
  1798.  } // end namespace ROOT
  1799.  
  1800.  
  1801.  
  1802.  // move implementations here to avoid circle dependencies
  1803. -#ifndef ROOT_Math_GenVector_PxPyPzE4D
  1804.  #include "Math/GenVector/PxPyPzE4D.h"
  1805. -#endif
  1806.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1807. -#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
  1808.  #include "Math/GenVector/PtEtaPhiM4D.h"
  1809.  #endif
  1810. -#endif
  1811.  
  1812.  namespace ROOT {
  1813.  
  1814.  namespace Math {
  1815.  
  1816.  template <class ScalarType>
  1817.  inline void PtEtaPhiE4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, Scalar e) {
  1818.     *this = PxPyPzE4D<Scalar> (px, py, pz, e);
  1819.  }
  1820.  
  1821. diff --git a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
  1822. index 1d63faca53..0eaf1606df 100644
  1823. --- a/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
  1824. +++ b/math/genvector/inc/Math/GenVector/PtEtaPhiM4D.h
  1825. @@ -389,23 +389,21 @@ private:
  1826.     ScalarType fM;
  1827.  
  1828.  };
  1829.  
  1830.  
  1831.  } // end namespace Math
  1832.  } // end namespace ROOT
  1833.  
  1834.  
  1835.  // move implementations here to avoid circle dependencies
  1836. -#ifndef ROOT_Math_GenVector_PxPyPzE4D
  1837.  #include "Math/GenVector/PxPyPzE4D.h"
  1838. -#endif
  1839.  
  1840.  
  1841.  
  1842.  namespace ROOT {
  1843.  
  1844.  namespace Math {
  1845.  
  1846.  
  1847.  template <class ScalarType>
  1848.  inline void PtEtaPhiM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, Scalar e) {
  1849. diff --git a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
  1850. index 914df609f4..2cc24203d7 100644
  1851. --- a/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
  1852. +++ b/math/genvector/inc/Math/GenVector/PxPyPzE4D.h
  1853. @@ -351,26 +351,22 @@ private:
  1854.  };
  1855.  
  1856.  } // end namespace Math
  1857.  } // end namespace ROOT
  1858.  
  1859.  
  1860.  
  1861.  #if defined(__MAKECINT__) || defined(G__DICTIONARY)
  1862.  // move implementations here to avoid circle dependencies
  1863.  
  1864. -#ifndef ROOT_Math_GenVector_PtEtaPhiE4D
  1865.  #include "Math/GenVector/PtEtaPhiE4D.h"
  1866. -#endif
  1867. -#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
  1868.  #include "Math/GenVector/PtEtaPhiM4D.h"
  1869. -#endif
  1870.  
  1871.  namespace ROOT {
  1872.  
  1873.  namespace Math {
  1874.  
  1875.  
  1876.      // ====== Set member functions for coordinates in other systems =======
  1877.      // throw always exceptions  in this case
  1878.  
  1879.  template <class ScalarType>
  1880. diff --git a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
  1881. index 5b2efdd962..dd3629857c 100644
  1882. --- a/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
  1883. +++ b/math/genvector/inc/Math/GenVector/PxPyPzM4D.h
  1884. @@ -380,26 +380,22 @@ private:
  1885.     ScalarType fM;
  1886.  
  1887.  };
  1888.  
  1889.  } // end namespace Math
  1890.  } // end namespace ROOT
  1891.  
  1892.  
  1893.  // move implementations here to avoid circle dependencies
  1894.  
  1895. -#ifndef ROOT_Math_GenVector_PxPyPzE4D
  1896.  #include "Math/GenVector/PxPyPzE4D.h"
  1897. -#endif
  1898. -#ifndef ROOT_Math_GenVector_PtEtaPhiM4D
  1899.  #include "Math/GenVector/PtEtaPhiM4D.h"
  1900. -#endif
  1901.  
  1902.  namespace ROOT {
  1903.  
  1904.  namespace Math {
  1905.  
  1906.  template <class ScalarType>
  1907.  inline void PxPyPzM4D<ScalarType>::SetPxPyPzE(Scalar px, Scalar py, Scalar pz, Scalar e) {
  1908.     *this = PxPyPzE4D<Scalar> (px, py, pz, e);
  1909.  }
  1910.  
  1911. diff --git a/math/genvector/inc/Math/GenVector/RotationZYX.h b/math/genvector/inc/Math/GenVector/RotationZYX.h
  1912. index 0552edd89a..cc4eb86d8b 100644
  1913. --- a/math/genvector/inc/Math/GenVector/RotationZYX.h
  1914. +++ b/math/genvector/inc/Math/GenVector/RotationZYX.h
  1915. @@ -15,36 +15,28 @@
  1916.  //
  1917.  // Last update: $Id$
  1918.  //
  1919.  #ifndef ROOT_Math_GenVector_RotationZYX
  1920.  #define ROOT_Math_GenVector_RotationZYX  1
  1921.  
  1922.  #ifndef ROOT_Math_Math
  1923.  #include "Math/Math.h"
  1924.  #endif
  1925.  
  1926. -#ifndef ROOT_Math_GenVector_Rotation3D
  1927.  #include "Math/GenVector/Rotation3D.h"
  1928. -#endif
  1929.  
  1930.  
  1931. -#ifndef ROOT_Math_GenVector_DisplacementVector3D
  1932.  #include "Math/GenVector/DisplacementVector3D.h"
  1933. -#endif
  1934.  
  1935. -#ifndef ROOT_Math_GenVector_PositionVector3D
  1936.  #include "Math/GenVector/PositionVector3D.h"
  1937. -#endif
  1938.  
  1939. -#ifndef ROOT_Math_GenVector_LorentzVector
  1940.  #include "Math/GenVector/LorentzVector.h"
  1941. -#endif
  1942.  
  1943.  #ifndef ROOT_Math_GenVector_3DConversions
  1944.  #include "Math/GenVector/3DConversions.h"
  1945.  #endif
  1946.  
  1947.  
  1948.  #include <algorithm>
  1949.  #include <cassert>
  1950.  #include <iostream>
  1951.  
  1952. diff --git a/math/genvector/inc/Math/GenVector/Transform3D.h b/math/genvector/inc/Math/GenVector/Transform3D.h
  1953. index 316a0a5b4d..1071594a8f 100644
  1954. --- a/math/genvector/inc/Math/GenVector/Transform3D.h
  1955. +++ b/math/genvector/inc/Math/GenVector/Transform3D.h
  1956. @@ -11,35 +11,27 @@
  1957.  // Header file for class Transform3D
  1958.  //
  1959.  // Created by: Lorenzo Moneta  October 21 2005
  1960.  //
  1961.  //
  1962.  #ifndef ROOT_Math_GenVector_Transform3D
  1963.  #define ROOT_Math_GenVector_Transform3D  1
  1964.  
  1965.  
  1966.  
  1967. -#ifndef ROOT_Math_GenVector_DisplacementVector3D
  1968.  #include "Math/GenVector/DisplacementVector3D.h"
  1969. -#endif
  1970.  
  1971. -#ifndef ROOT_Math_GenVector_PositionVector3D
  1972.  #include "Math/GenVector/PositionVector3D.h"
  1973. -#endif
  1974.  
  1975. -#ifndef ROOT_Math_GenVector_Rotation3D
  1976.  #include "Math/GenVector/Rotation3D.h"
  1977. -#endif
  1978.  
  1979. -#ifndef ROOT_Math_GenVector_Translation3D
  1980.  #include "Math/GenVector/Translation3D.h"
  1981. -#endif
  1982.  
  1983.  
  1984.  #include "Math/GenVector/AxisAnglefwd.h"
  1985.  #include "Math/GenVector/EulerAnglesfwd.h"
  1986.  #include "Math/GenVector/Quaternionfwd.h"
  1987.  #include "Math/GenVector/RotationZYXfwd.h"
  1988.  #include "Math/GenVector/RotationXfwd.h"
  1989.  #include "Math/GenVector/RotationYfwd.h"
  1990.  #include "Math/GenVector/RotationZfwd.h"
  1991.  
  1992. diff --git a/math/genvector/inc/Math/GenVector/Translation3D.h b/math/genvector/inc/Math/GenVector/Translation3D.h
  1993. index e90ddffc93..1b9c7ca3f6 100644
  1994. --- a/math/genvector/inc/Math/GenVector/Translation3D.h
  1995. +++ b/math/genvector/inc/Math/GenVector/Translation3D.h
  1996. @@ -10,23 +10,21 @@
  1997.  
  1998.  // Header file for class Translation3D
  1999.  //
  2000.  // Created by: Lorenzo Moneta  October 21 2005
  2001.  //
  2002.  //
  2003.  #ifndef ROOT_Math_GenVector_Translation3D
  2004.  #define ROOT_Math_GenVector_Translation3D  1
  2005.  
  2006.  
  2007. -#ifndef ROOT_Math_GenVector_DisplacementVector3D
  2008.  #include "Math/GenVector/DisplacementVector3D.h"
  2009. -#endif
  2010.  
  2011.  #ifndef ROOT_Math_GenVector_PositionVector3Dfwd
  2012.  #include "Math/GenVector/PositionVector3Dfwd.h"
  2013.  #endif
  2014.  
  2015.  #ifndef ROOT_Math_GenVector_LorentzVectorfwd
  2016.  #include "Math/GenVector/LorentzVectorfwd.h"
  2017.  #endif
  2018.  
  2019.  #include <iostream>
  2020. diff --git a/math/mathcore/inc/Fit/BinData.h b/math/mathcore/inc/Fit/BinData.h
  2021. index 14d2cd2f58..21d89d7ff0 100644
  2022. --- a/math/mathcore/inc/Fit/BinData.h
  2023. +++ b/math/mathcore/inc/Fit/BinData.h
  2024. @@ -6,23 +6,21 @@
  2025.   * Copyright (c) 2006  LCG ROOT Math Team, CERN/PH-SFT                *
  2026.   *                                                                    *
  2027.   *                                                                    *
  2028.   **********************************************************************/
  2029.  
  2030.  // Header file for class BinData
  2031.  
  2032.  #ifndef ROOT_Fit_BinData
  2033.  #define ROOT_Fit_BinData
  2034.  
  2035. -#ifndef ROOT_Fit_DataVector
  2036.  #include "Fit/DataVector.h"
  2037. -#endif
  2038.  
  2039.  
  2040.  #ifdef USE_BINPOINT_CLASS
  2041.  
  2042.  #ifndef ROOT_Fit_BinPoint
  2043.  #include "Fit/BinPoint.h"
  2044.  #endif
  2045.  
  2046.  #endif
  2047.  
  2048. diff --git a/math/mathcore/inc/Fit/FitResult.h b/math/mathcore/inc/Fit/FitResult.h
  2049. index 16f7ca00b8..f89a74df42 100644
  2050. --- a/math/mathcore/inc/Fit/FitResult.h
  2051. +++ b/math/mathcore/inc/Fit/FitResult.h
  2052. @@ -6,26 +6,22 @@
  2053.   * Copyright (c) 2006  LCG ROOT Math Team, CERN/PH-SFT                *
  2054.   *                                                                    *
  2055.   *                                                                    *
  2056.   **********************************************************************/
  2057.  
  2058.  // Header file for class FitResult
  2059.  
  2060.  #ifndef ROOT_Fit_FitResult
  2061.  #define ROOT_Fit_FitResult
  2062.  
  2063. -#ifndef ROOT_Fit_IFunctionfwd
  2064.  #include "Math/IFunctionfwd.h"
  2065. -#endif
  2066. -#ifndef ROOT_Fit_IParamFunctionfwd
  2067.  #include "Math/IParamFunctionfwd.h"
  2068. -#endif
  2069.  
  2070.  #include <vector>
  2071.  #include <map>
  2072.  #include <string>
  2073.  #include <cmath>
  2074.  #include <cassert>
  2075.  #include <memory>
  2076.  
  2077.  namespace ROOT {
  2078.  
  2079. diff --git a/math/mathcore/inc/Fit/SparseData.h b/math/mathcore/inc/Fit/SparseData.h
  2080. index 148784d66c..494c27c5f5 100644
  2081. --- a/math/mathcore/inc/Fit/SparseData.h
  2082. +++ b/math/mathcore/inc/Fit/SparseData.h
  2083. @@ -8,23 +8,21 @@
  2084.   *                                                                    *
  2085.   **********************************************************************/
  2086.  
  2087.  // Header file for class SparseData
  2088.  
  2089.  #ifndef ROOT_Fit_SparseData
  2090.  #define ROOT_Fit_SparseData
  2091.  
  2092.  #include <vector>
  2093.  
  2094. -#ifndef ROOT_Fit_DataVector
  2095.  #include "Fit/DataVector.h"
  2096. -#endif
  2097.  #ifndef ROOT_Fit_BinData
  2098.  #include "Fit/BinData.h"
  2099.  #endif
  2100.  
  2101.  namespace ROOT {
  2102.  
  2103.     namespace Fit {
  2104.  
  2105.        // This is a proxy to a std::list<Box>
  2106.        class ProxyListBox;
  2107. diff --git a/math/mathcore/inc/Fit/UnBinData.h b/math/mathcore/inc/Fit/UnBinData.h
  2108. index ea5d6acceb..cba0cc8307 100644
  2109. --- a/math/mathcore/inc/Fit/UnBinData.h
  2110. +++ b/math/mathcore/inc/Fit/UnBinData.h
  2111. @@ -6,23 +6,21 @@
  2112.   * Copyright (c) 2006  LCG ROOT Math Team, CERN/PH-SFT                *
  2113.   *                                                                    *
  2114.   *                                                                    *
  2115.   **********************************************************************/
  2116.  
  2117.  // Header file for class UnBinData
  2118.  
  2119.  #ifndef ROOT_Fit_UnBinData
  2120.  #define ROOT_Fit_UnBinData
  2121.  
  2122. -#ifndef ROOT_Fit_DataVector
  2123.  #include "Fit/DataVector.h"
  2124. -#endif
  2125.  
  2126.  #ifndef ROOT_Math_Error
  2127.  #include "Math/Error.h"
  2128.  #endif
  2129.  
  2130.  
  2131.  
  2132.  namespace ROOT {
  2133.  
  2134.     namespace Fit {
  2135. diff --git a/math/mathcore/inc/Math/IntegratorMultiDim.h b/math/mathcore/inc/Math/IntegratorMultiDim.h
  2136. index c27c4ba142..f66dbeba48 100644
  2137. --- a/math/mathcore/inc/Math/IntegratorMultiDim.h
  2138. +++ b/math/mathcore/inc/Math/IntegratorMultiDim.h
  2139. @@ -12,23 +12,21 @@
  2140.  
  2141.  
  2142.  #ifndef ROOT_Math_IntegratorMultiDim
  2143.  #define ROOT_Math_IntegratorMultiDim
  2144.  
  2145.  
  2146.  #ifndef ROOT_Math_IFunctionfwd
  2147.  #include "Math/IFunctionfwd.h"
  2148.  #endif
  2149.  
  2150. -#ifndef ROOT_Math_IntegrationTypes
  2151.  #include "Math/AllIntegrationTypes.h"
  2152. -#endif
  2153.  
  2154.  #ifndef ROOT_Math_IntegratorOptions
  2155.  #include "Math/IntegratorOptions.h"
  2156.  #endif
  2157.  
  2158.  #ifndef ROOT_Math_VirtualIntegrator
  2159.  #include "Math/VirtualIntegrator.h"
  2160.  #endif
  2161.  
  2162.  #ifndef __CINT__
  2163. diff --git a/math/mathmore/inc/Math/RootFinderAlgorithms.h b/math/mathmore/inc/Math/RootFinderAlgorithms.h
  2164. index a98e828248..1058ff7fc1 100644
  2165. --- a/math/mathmore/inc/Math/RootFinderAlgorithms.h
  2166. +++ b/math/mathmore/inc/Math/RootFinderAlgorithms.h
  2167. @@ -29,23 +29,21 @@
  2168.  // Last update: Sun Nov 14 14:07:50 2004
  2169.  //
  2170.  #ifndef ROOT_Math_GSLRootFinderAlgorithms
  2171.  #define ROOT_Math_GSLRootFinderAlgorithms
  2172.  
  2173.  
  2174.  #ifndef ROOT_Math_GSLRootFinder
  2175.  #include "Math/GSLRootFinder.h"
  2176.  #endif
  2177.  
  2178. -#ifndef ROOT_Math_GSLRootFinderDeriv
  2179.  #include "Math/GSLRootFinderDeriv.h"
  2180. -#endif
  2181.  
  2182.  namespace ROOT {
  2183.  namespace Math {
  2184.  
  2185.    /**
  2186.       Root-Finding Algorithms
  2187.  
  2188.    */
  2189.  
  2190.  namespace Roots {
  2191. diff --git a/math/quadp/inc/TQpProbDens.h b/math/quadp/inc/TQpProbDens.h
  2192. index 8f52e1c581..38d50050d1 100644
  2193. --- a/math/quadp/inc/TQpProbDens.h
  2194. +++ b/math/quadp/inc/TQpProbDens.h
  2195. @@ -40,23 +40,21 @@
  2196.   * WITH THE DEPARTMENT OF ENERGY.                                        *
  2197.   *************************************************************************/
  2198.  
  2199.  #ifndef ROOT_TQpProbDens
  2200.  #define ROOT_TQpProbDens
  2201.  
  2202.  #include "TQpProbBase.h"
  2203.  #ifndef ROOT_TQpDataDens
  2204.  #include "TQpDataDens.h"
  2205.  #endif
  2206. -#ifndef ROOT_TQpVars
  2207.  #include "TQpVar.h"
  2208. -#endif
  2209.  
  2210.  //////////////////////////////////////////////////////////////////////////
  2211.  //                                                                      //
  2212.  // TQpProbDens                                                          //
  2213.  //                                                                      //
  2214.  // dense matrix problem formulation                                     //
  2215.  //                                                                      //
  2216.  //////////////////////////////////////////////////////////////////////////
  2217.  
  2218.  class TQpLinSolverBase;
  2219. diff --git a/math/quadp/inc/TQpProbSparse.h b/math/quadp/inc/TQpProbSparse.h
  2220. index 77aa83354b..5cc9aee794 100644
  2221. --- a/math/quadp/inc/TQpProbSparse.h
  2222. +++ b/math/quadp/inc/TQpProbSparse.h
  2223. @@ -40,23 +40,21 @@
  2224.   * WITH THE DEPARTMENT OF ENERGY.                                        *
  2225.   *************************************************************************/
  2226.  
  2227.  #ifndef ROOT_TQpProbSparse
  2228.  #define ROOT_TQpProbSparse
  2229.  
  2230.  #include "TQpProbBase.h"
  2231.  #ifndef ROOT_TQpDataSparse
  2232.  #include "TQpDataSparse.h"
  2233.  #endif
  2234. -#ifndef ROOT_TQpVars
  2235.  #include "TQpVar.h"
  2236. -#endif
  2237.  
  2238.  //////////////////////////////////////////////////////////////////////////
  2239.  //                                                                      //
  2240.  // TQpProbSparse                                                        //
  2241.  //                                                                      //
  2242.  // sparse matrix problem formulation                                    //
  2243.  //                                                                      //
  2244.  //////////////////////////////////////////////////////////////////////////
  2245.  
  2246.  class TQpProbSparse : public TQpProbBase
  2247. diff --git a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
  2248. index b84fcf405d..56e315d2ac 100644
  2249. --- a/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
  2250. +++ b/math/smatrix/inc/Math/MatrixRepresentationsStatic.h
  2251. @@ -12,23 +12,21 @@
  2252.  
  2253.      @author Juan Palacios
  2254.      @date   2006-01-15
  2255.  
  2256.      Classes MatRepStd and MatRepSym for generic and symmetric matrix
  2257.      data storage and manipulation. Define data storage and access, plus
  2258.      operators =, +=, -=, ==.
  2259.  
  2260.   */
  2261.  
  2262. -#ifndef ROOT_Math_StaticCheck
  2263.  #include "Math/StaticCheck.h"
  2264. -#endif
  2265.  
  2266.  #include <cstddef>
  2267.  #include <utility>
  2268.  #include <type_traits>
  2269.  #include <array>
  2270.  
  2271.  namespace ROOT {
  2272.  
  2273.  namespace Math {
  2274.  
  2275. diff --git a/math/smatrix/inc/Math/SMatrix.h b/math/smatrix/inc/Math/SMatrix.h
  2276. index 7adf4c988b..ea837d83f3 100644
  2277. --- a/math/smatrix/inc/Math/SMatrix.h
  2278. +++ b/math/smatrix/inc/Math/SMatrix.h
  2279. @@ -32,23 +32,21 @@
  2280.  // 09 Apr 2001 (TG) CTOR from array added
  2281.  // 11 Apr 2001 (TG) rows(), cols(), size() replaced by rows, cols, size
  2282.  // 25 Mai 2001 (TG) row(), col() added
  2283.  // 04 Sep 2001 (TG) moved inlined functions to .icc file
  2284.  // 11 Jan 2002 (TG) added operator==(), operator!=()
  2285.  // 14 Jan 2002 (TG) added more operator==(), operator!=(), operator>(), operator<()
  2286.  //
  2287.  ***************************************************************************/
  2288.  // for platform specific configurations
  2289.  
  2290. -#ifndef ROOT_Math_MnConfig
  2291.  #include "Math/MConfig.h"
  2292. -#endif
  2293.  
  2294.  #include <iosfwd>
  2295.  
  2296.  
  2297.  
  2298.  
  2299.  //doxygen tag
  2300.  
  2301.  /**
  2302.     @defgroup SMatrixGroup SMatrix
  2303. diff --git a/math/smatrix/inc/Math/SMatrix.icc b/math/smatrix/inc/Math/SMatrix.icc
  2304. index cf0386258a..2967a3cc4b 100644
  2305. --- a/math/smatrix/inc/Math/SMatrix.icc
  2306. +++ b/math/smatrix/inc/Math/SMatrix.icc
  2307. @@ -52,23 +52,21 @@
  2308.  #endif
  2309.  #ifndef ROOT_Math_Dinv
  2310.  #include "Math/Dinv.h"
  2311.  #endif
  2312.  #ifndef ROOT_Math_Functions
  2313.  #include "Math/Functions.h"
  2314.  #endif
  2315.  #ifndef ROOT_Math_HelperOps
  2316.  #include "Math/HelperOps.h"
  2317.  #endif
  2318. -#ifndef ROOT_Math_StaticCheck
  2319.  #include "Math/StaticCheck.h"
  2320. -#endif
  2321.  
  2322.  
  2323.  
  2324.  
  2325.  
  2326.  
  2327.  
  2328.  namespace ROOT {
  2329.  
  2330.  namespace Math {
  2331. diff --git a/math/smatrix/inc/Math/SVector.h b/math/smatrix/inc/Math/SVector.h
  2332. index 638e602bd7..a22f5a39f2 100644
  2333. --- a/math/smatrix/inc/Math/SVector.h
  2334. +++ b/math/smatrix/inc/Math/SVector.h
  2335. @@ -28,23 +28,21 @@
  2336.  // 26 Mar 2001 (TG) added place_at()
  2337.  // 03 Apr 2001 (TG) Array() added
  2338.  // 06 Apr 2001 (TG) CTORS added
  2339.  // 07 Apr 2001 (TG) CTORS added
  2340.  // 22 Aug 2001 (TG) CTOR(T*,len) added
  2341.  // 04 Sep 2001 (TG) moved inlined functions to .icc file
  2342.  // 14 Jan 2002 (TG) added operator==(), operator!=(), operator>(), operator<()
  2343.  //
  2344.  ********************************************************************/
  2345.  
  2346. -#ifndef ROOT_Math_MnConfig
  2347.  #include "Math/MConfig.h"
  2348. -#endif
  2349.  
  2350.  #include <iosfwd>
  2351.  
  2352.  // expression engine
  2353.  
  2354.  #ifndef ROOT_Math_Expression
  2355.  #include "Math/Expression.h"
  2356.  #endif
  2357.  
  2358.  
  2359. diff --git a/math/smatrix/inc/Math/SVector.icc b/math/smatrix/inc/Math/SVector.icc
  2360. index d8db32a604..2bab9f525a 100644
  2361. --- a/math/smatrix/inc/Math/SVector.icc
  2362. +++ b/math/smatrix/inc/Math/SVector.icc
  2363. @@ -32,23 +32,21 @@
  2364.  // ********************************************************************
  2365.  
  2366.  #ifndef ROOT_Math_SVector
  2367.  #error "Do not use SVector.icc directly. #include \"Math/SVector.h\" instead."
  2368.  #endif // ROOT_Math_SVector
  2369.  
  2370.  #include <iostream>
  2371.  #include <assert.h>
  2372.  #include <algorithm>
  2373.  
  2374. -#ifndef ROOT_Math_StaticCheck
  2375.  #include "Math/StaticCheck.h"
  2376. -#endif
  2377.  
  2378.  namespace ROOT {
  2379.  
  2380.  namespace Math {
  2381.  
  2382.  
  2383.  //==============================================================================
  2384.  // Constructors
  2385.  //==============================================================================
  2386.  template <class T, unsigned int D>
  2387. diff --git a/montecarlo/eg/inc/TDatabasePDG.h b/montecarlo/eg/inc/TDatabasePDG.h
  2388. index adc72d8f72..d4aab33738 100644
  2389. --- a/montecarlo/eg/inc/TDatabasePDG.h
  2390. +++ b/montecarlo/eg/inc/TDatabasePDG.h
  2391. @@ -5,26 +5,22 @@
  2392.   * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers.               *
  2393.   * All rights reserved.                                                  *
  2394.   *                                                                       *
  2395.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2396.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2397.   *************************************************************************/
  2398.  
  2399.  #ifndef ROOT_TDatabasePDG
  2400.  #define ROOT_TDatabasePDG
  2401.  
  2402. -#ifndef ROOT_TParticlePDG
  2403.  #include "TParticlePDG.h"
  2404. -#endif
  2405. -#ifndef ROOT_TParticleClassPDG
  2406.  #include "TParticleClassPDG.h"
  2407. -#endif
  2408.  
  2409.  class THashList;
  2410.  class TExMap;
  2411.  
  2412.  class TDatabasePDG: public TNamed {
  2413.  
  2414.  protected:
  2415.     THashList           *fParticleList;     // list of PDG particles
  2416.     TObjArray           *fListOfClasses;    // list of classes (leptons etc.)
  2417.     mutable TExMap      *fPdgMap;           //!hash-map from pdg-code to particle
  2418. diff --git a/net/alien/inc/TAlienDirectory.h b/net/alien/inc/TAlienDirectory.h
  2419. index 7d94e36836..4dadfe52c3 100644
  2420. --- a/net/alien/inc/TAlienDirectory.h
  2421. +++ b/net/alien/inc/TAlienDirectory.h
  2422. @@ -13,23 +13,21 @@
  2423.  #define ROOT_TAlienDirectory
  2424.  
  2425.  //////////////////////////////////////////////////////////////////////////
  2426.  //                                                                      //
  2427.  // TAlienDirectory                                                      //
  2428.  //                                                                      //
  2429.  // Class which creates Directory files for the AliEn middleware.        //
  2430.  //                                                                      //
  2431.  //////////////////////////////////////////////////////////////////////////
  2432.  
  2433. -#ifndef ROOT_Tlist
  2434.  #include "TList.h"
  2435. -#endif
  2436.  #ifndef ROOT_TBrowser
  2437.  #include "TBrowser.h"
  2438.  #endif
  2439.  #ifndef ROOT_TNamed
  2440.  #include "TNamed.h"
  2441.  #endif
  2442.  #ifndef ROOT_TMap
  2443.  #include "TMap.h"
  2444.  #endif
  2445.  
  2446. diff --git a/net/netx/inc/TXNetSystem.h b/net/netx/inc/TXNetSystem.h
  2447. index 37e06ca1f6..d1fc4dd67a 100644
  2448. --- a/net/netx/inc/TXNetSystem.h
  2449. +++ b/net/netx/inc/TXNetSystem.h
  2450. @@ -18,23 +18,21 @@
  2451.  //                                                                      //
  2452.  // Authors: Frank Winklmeier,  Fabrizio Furano                          //
  2453.  //          INFN Padova, 2005                                           //
  2454.  //                                                                      //
  2455.  // TXNetSystem is an extension of TNetSystem able to deal with new      //
  2456.  // xrootd servers. The class detects the nature of the server and       //
  2457.  // redirects the calls to TNetSystem in case of a rootd server.         //
  2458.  //                                                                      //
  2459.  //////////////////////////////////////////////////////////////////////////
  2460.  
  2461. -#ifndef ROOT_TNetSystem
  2462.  #include "TNetFile.h"
  2463. -#endif
  2464.  
  2465.  #ifndef ROOT_Rtypes
  2466.  #include "Rtypes.h"
  2467.  #endif
  2468.  
  2469.  #ifndef ROOT_TString
  2470.  #include "TString.h"
  2471.  #endif
  2472.  
  2473.  #ifndef ROOT_THashList
  2474. diff --git a/net/rpdutils/res/rpdp.h b/net/rpdutils/res/rpdp.h
  2475. index ffcf6377e6..7441d95cbb 100644
  2476. --- a/net/rpdutils/res/rpdp.h
  2477. +++ b/net/rpdutils/res/rpdp.h
  2478. @@ -15,23 +15,21 @@
  2479.  
  2480.  //////////////////////////////////////////////////////////////////////////
  2481.  //                                                                      //
  2482.  // rpdp                                                                 //
  2483.  //                                                                      //
  2484.  // This header file contains private definitions and declarations       //
  2485.  // used by modules in rpdutils/src.                                     //
  2486.  //                                                                      //
  2487.  //////////////////////////////////////////////////////////////////////////
  2488.  
  2489. -#ifndef ROOT_VarArgs
  2490.  #include "Varargs.h"
  2491. -#endif
  2492.  #ifndef ROOT_MessageTypes
  2493.  #include "MessageTypes.h"
  2494.  #endif
  2495.  #ifndef ROOT_rpderr
  2496.  #include "rpderr.h"
  2497.  #endif
  2498.  #include <string>
  2499.  #ifdef R__GLOBALSTL
  2500.  namespace std { using ::string; }
  2501.  #endif
  2502. diff --git a/roofit/roostats/inc/RooStats/BayesianCalculator.h b/roofit/roostats/inc/RooStats/BayesianCalculator.h
  2503. index 514f4002c4..e37c25b410 100644
  2504. --- a/roofit/roostats/inc/RooStats/BayesianCalculator.h
  2505. +++ b/roofit/roostats/inc/RooStats/BayesianCalculator.h
  2506. @@ -16,23 +16,21 @@
  2507.  #include "Math/IFunctionfwd.h"
  2508.  
  2509.  #ifndef ROO_ARG_SET
  2510.  #include "RooArgSet.h"
  2511.  #endif
  2512.  
  2513.  #ifndef ROOSTATS_IntervalCalculator
  2514.  #include "RooStats/IntervalCalculator.h"
  2515.  #endif
  2516.  
  2517. -#ifndef ROOSTATS_SimpleInterval
  2518.  #include "RooStats/SimpleInterval.h"
  2519. -#endif
  2520.  
  2521.  class RooAbsData;
  2522.  class RooAbsPdf;
  2523.  class RooPlot;
  2524.  class RooAbsReal;
  2525.  class TF1;
  2526.  
  2527.  
  2528.  namespace RooStats {
  2529.  
  2530. diff --git a/roofit/roostats/inc/RooStats/ConfidenceBelt.h b/roofit/roostats/inc/RooStats/ConfidenceBelt.h
  2531. index a2832c3ad0..032521b8dd 100644
  2532. --- a/roofit/roostats/inc/RooStats/ConfidenceBelt.h
  2533. +++ b/roofit/roostats/inc/RooStats/ConfidenceBelt.h
  2534. @@ -7,26 +7,22 @@
  2535.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2536.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2537.   *************************************************************************/
  2538.  
  2539.  #ifndef RooStats_ConfidenceBelt
  2540.  #define RooStats_ConfidenceBelt
  2541.  
  2542.  #ifndef ROO_ARG_SET
  2543.  #include "RooArgSet.h"
  2544.  #endif
  2545. -#ifndef ROO_TREE_DATA
  2546.  #include "RooAbsData.h"
  2547. -#endif
  2548. -#ifndef RooStats_ConfInterval
  2549.  #include "RooStats/ConfInterval.h"
  2550. -#endif
  2551.  
  2552.  #include "RooStats/SamplingDistribution.h"
  2553.  
  2554.  #include "TRef.h"
  2555.  
  2556.  #include <vector>
  2557.  #include <map>
  2558.  
  2559.  
  2560.  namespace RooStats {
  2561. diff --git a/roofit/roostats/inc/RooStats/HypoTestInverterResult.h b/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
  2562. index 16996930f6..51a8385a29 100644
  2563. --- a/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
  2564. +++ b/roofit/roostats/inc/RooStats/HypoTestInverterResult.h
  2565. @@ -6,23 +6,21 @@
  2566.   *                                                                       *
  2567.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2568.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2569.   *************************************************************************/
  2570.  
  2571.  #ifndef ROOSTATS_HypoTestInverterResult
  2572.  #define ROOSTATS_HypoTestInverterResult
  2573.  
  2574.  
  2575.  
  2576. -#ifndef ROOSTATS_SimpleInterval
  2577.  #include "RooStats/SimpleInterval.h"
  2578. -#endif
  2579.  
  2580.  #include "RooStats/HypoTestResult.h"
  2581.  
  2582.  class RooRealVar;
  2583.  
  2584.  namespace RooStats {
  2585.  
  2586.  class SamplingDistribution;
  2587.  
  2588.  class HypoTestInverterResult : public SimpleInterval {
  2589. diff --git a/roofit/roostats/inc/RooStats/LikelihoodInterval.h b/roofit/roostats/inc/RooStats/LikelihoodInterval.h
  2590. index c12b679a27..a5e9ec2bb0 100644
  2591. --- a/roofit/roostats/inc/RooStats/LikelihoodInterval.h
  2592. +++ b/roofit/roostats/inc/RooStats/LikelihoodInterval.h
  2593. @@ -4,23 +4,21 @@
  2594.   * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers.               *
  2595.   * All rights reserved.                                                  *
  2596.   *                                                                       *
  2597.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2598.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2599.   *************************************************************************/
  2600.  
  2601.  #ifndef RooStats_LikelihoodInterval
  2602.  #define RooStats_LikelihoodInterval
  2603.  
  2604. -#ifndef RooStats_ConfInterval
  2605.  #include "RooStats/ConfInterval.h"
  2606. -#endif
  2607.  
  2608.  #ifndef ROO_ARG_SET
  2609.  #include "RooArgSet.h"
  2610.  #endif
  2611.  
  2612.  #ifndef ROO_ABS_REAL
  2613.  #include "RooAbsReal.h"
  2614.  #endif
  2615.  
  2616.  #ifndef ROOT_Math_IFunctionfwd
  2617. diff --git a/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h b/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
  2618. index 44508ef937..0c1526be9b 100644
  2619. --- a/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
  2620. +++ b/roofit/roostats/inc/RooStats/MCMCIntervalPlot.h
  2621. @@ -23,23 +23,21 @@
  2622.  #endif
  2623.  #ifndef ROOT_TNamed
  2624.  #include "TNamed.h"
  2625.  #endif
  2626.  #ifndef ROOT_TH1
  2627.  #include "TH1.h"
  2628.  #endif
  2629.  #ifndef RooStats_MCMCInterval
  2630.  #include "RooStats/MCMCInterval.h"
  2631.  #endif
  2632. -#ifndef ROO_KEYS_PDF
  2633.  #include "RooNDKeysPdf.h"
  2634. -#endif
  2635.  #ifndef ROO_PRODUCT
  2636.  #include "RooProduct.h"
  2637.  #endif
  2638.  
  2639.  namespace RooStats {
  2640.  
  2641.     class MCMCIntervalPlot : public TNamed, public RooPrintable {
  2642.  
  2643.     public:
  2644.        MCMCIntervalPlot();
  2645. diff --git a/roofit/roostats/inc/RooStats/MetropolisHastings.h b/roofit/roostats/inc/RooStats/MetropolisHastings.h
  2646. index 37e703d863..a65e8ed72e 100644
  2647. --- a/roofit/roostats/inc/RooStats/MetropolisHastings.h
  2648. +++ b/roofit/roostats/inc/RooStats/MetropolisHastings.h
  2649. @@ -5,23 +5,21 @@
  2650.   * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers.               *
  2651.   * All rights reserved.                                                  *
  2652.   *                                                                       *
  2653.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2654.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2655.   *************************************************************************/
  2656.  
  2657.  #ifndef ROOSTATS_MetropolisHastings
  2658.  #define ROOSTATS_MetropolisHastings
  2659.  
  2660. -#ifndef RooStats_RooStatsUtils
  2661.  #include "RooStats/RooStatsUtils.h"
  2662. -#endif
  2663.  #ifndef ROOT_Rtypes
  2664.  #include "Rtypes.h"
  2665.  #endif
  2666.  #ifndef ROOT_TObject
  2667.  #include "TObject.h"
  2668.  #endif
  2669.  #ifndef ROO_ARG_SET
  2670.  #include "RooArgSet.h"
  2671.  #endif
  2672.  #ifndef ROOSTATS_ProposalFunction
  2673. diff --git a/roofit/roostats/inc/RooStats/PointSetInterval.h b/roofit/roostats/inc/RooStats/PointSetInterval.h
  2674. index f055d256b8..ec8af1ded4 100644
  2675. --- a/roofit/roostats/inc/RooStats/PointSetInterval.h
  2676. +++ b/roofit/roostats/inc/RooStats/PointSetInterval.h
  2677. @@ -7,26 +7,22 @@
  2678.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2679.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2680.   *************************************************************************/
  2681.  
  2682.  #ifndef RooStats_PointSetInterval
  2683.  #define RooStats_PointSetInterval
  2684.  
  2685.  #ifndef ROO_ARG_SET
  2686.  #include "RooArgSet.h"
  2687.  #endif
  2688. -#ifndef ROO_TREE_DATA
  2689.  #include "RooAbsData.h"
  2690. -#endif
  2691. -#ifndef RooStats_ConfInterval
  2692.  #include "RooStats/ConfInterval.h"
  2693. -#endif
  2694.  
  2695.  
  2696.  namespace RooStats {
  2697.  
  2698.   class PointSetInterval : public ConfInterval {
  2699.  
  2700.    public:
  2701.  
  2702.       /// default constructors
  2703.      explicit PointSetInterval(const char* name = 0);
  2704. diff --git a/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h b/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
  2705. index 36bd32da7c..1b9f73b4ec 100644
  2706. --- a/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
  2707. +++ b/roofit/roostats/inc/RooStats/ProfileLikelihoodTestStat.h
  2708. @@ -23,23 +23,21 @@
  2709.  
  2710.  
  2711.  #ifndef ROO_REAL_VAR
  2712.  #include "RooRealVar.h"
  2713.  #endif
  2714.  
  2715.  #ifndef ROO_NLL_VAR
  2716.  #include "RooNLLVar.h"
  2717.  #endif
  2718.  
  2719. -#ifndef ROOTT_Math_MinimizerOptions
  2720.  #include "Math/MinimizerOptions.h"
  2721. -#endif
  2722.  
  2723.  #ifndef ROOSTATS_RooStatsUtils
  2724.  #include "RooStats/RooStatsUtils.h"
  2725.  #endif
  2726.  
  2727.  
  2728.  namespace RooStats {
  2729.  
  2730.  /**
  2731.  
  2732. diff --git a/roofit/roostats/inc/RooStats/SimpleInterval.h b/roofit/roostats/inc/RooStats/SimpleInterval.h
  2733. index 8ed233c645..045b824a5f 100644
  2734. --- a/roofit/roostats/inc/RooStats/SimpleInterval.h
  2735. +++ b/roofit/roostats/inc/RooStats/SimpleInterval.h
  2736. @@ -7,23 +7,21 @@
  2737.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2738.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2739.   *************************************************************************/
  2740.  
  2741.  #ifndef RooStats_SimpleInterval
  2742.  #define RooStats_SimpleInterval
  2743.  
  2744.  #ifndef ROO_ARG_SET
  2745.  #include "RooArgSet.h"
  2746.  #endif
  2747. -#ifndef RooStats_ConfInterval
  2748.  #include "RooStats/ConfInterval.h"
  2749. -#endif
  2750.  
  2751.  class RooRealVar;
  2752.  
  2753.  namespace RooStats {
  2754.   class SimpleInterval : public ConfInterval {
  2755.  
  2756.    public:
  2757.      // default constructors
  2758.      explicit SimpleInterval(const char* name = 0);
  2759.  
  2760. diff --git a/roofit/roostats/src/BernsteinCorrection.cxx b/roofit/roostats/src/BernsteinCorrection.cxx
  2761. index a3b21a41bd..401e6ceede 100644
  2762. --- a/roofit/roostats/src/BernsteinCorrection.cxx
  2763. +++ b/roofit/roostats/src/BernsteinCorrection.cxx
  2764. @@ -37,23 +37,21 @@ of this class allows you to directly set this tolerance (in terms of probability
  2765.  To do:
  2766.  Add another method to the utility that will make the sampling distribution for -2 log lambda
  2767.  for various m vs. m+1 order corrections using a nominal model and perhaps having two ways of
  2768.  generating the toys (either via a histogram or via an independent model that is supposed to
  2769.   reflect reality).  That will allow one to make plots like Glen has at the end of his DRAFT
  2770.   very easily.
  2771.  
  2772.  */
  2773.  
  2774.  
  2775. -#ifndef RooStats_BernsteinCorrection
  2776.  #include "RooStats/BernsteinCorrection.h"
  2777. -#endif
  2778.  
  2779.  #include "RooGlobalFunc.h"
  2780.  #include "RooDataSet.h"
  2781.  #include "RooRealVar.h"
  2782.  #include "RooAbsPdf.h"
  2783.  #include "RooFit.h"
  2784.  #include "RooFitResult.h"
  2785.  #include "TMath.h"
  2786.  #include <string>
  2787.  #include <vector>
  2788. diff --git a/roofit/roostats/src/FeldmanCousins.cxx b/roofit/roostats/src/FeldmanCousins.cxx
  2789. index 9bfa5445b8..4bd7e96645 100644
  2790. --- a/roofit/roostats/src/FeldmanCousins.cxx
  2791. +++ b/roofit/roostats/src/FeldmanCousins.cxx
  2792. @@ -3,27 +3,23 @@
  2793.  
  2794.  /*************************************************************************
  2795.   * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers.               *
  2796.   * All rights reserved.                                                  *
  2797.   *                                                                       *
  2798.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  2799.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  2800.   *************************************************************************/
  2801.  
  2802.  
  2803. -#ifndef RooStats_FeldmanCousins
  2804.  #include "RooStats/FeldmanCousins.h"
  2805. -#endif
  2806.  
  2807. -#ifndef RooStats_RooStatsUtils
  2808.  #include "RooStats/RooStatsUtils.h"
  2809. -#endif
  2810.  
  2811.  #ifndef RooStats_PointSetInterval
  2812.  #include "RooStats/PointSetInterval.h"
  2813.  #endif
  2814.  
  2815.  #include "RooStats/ModelConfig.h"
  2816.  
  2817.  #include "RooStats/SamplingDistribution.h"
  2818.  
  2819.  #include "RooStats/ProfileLikelihoodTestStat.h"
  2820. diff --git a/roofit/roostats/src/HypoTestResult.cxx b/roofit/roostats/src/HypoTestResult.cxx
  2821. index 237bc1c447..55bb93ac0c 100644
  2822. --- a/roofit/roostats/src/HypoTestResult.cxx
  2823. +++ b/roofit/roostats/src/HypoTestResult.cxx
  2824. @@ -53,23 +53,21 @@ close to one.
  2825.  For results of Hypothesis tests,
  2826.  \f$CL_{s}\f$ has no similar direct interpretation as for exclusion and can
  2827.  be larger than one.
  2828.  
  2829.  */
  2830.  
  2831.  #include "RooStats/HypoTestResult.h"
  2832.  #include "RooStats/SamplingDistribution.h"
  2833.  #include "RooAbsReal.h"
  2834.  
  2835. -#ifndef RooStats_RooStatsUtils
  2836.  #include "RooStats/RooStatsUtils.h"
  2837. -#endif
  2838.  
  2839.  #include <limits>
  2840.  #define NaN numeric_limits<float>::quiet_NaN()
  2841.  #define IsNaN(a) TMath::IsNaN(a)
  2842.  
  2843.  ClassImp(RooStats::HypoTestResult) ;
  2844.  
  2845.  using namespace RooStats;
  2846.  using namespace std;
  2847.  
  2848. diff --git a/roofit/roostats/src/MCMCCalculator.cxx b/roofit/roostats/src/MCMCCalculator.cxx
  2849. index f5809da630..b1e521cf76 100644
  2850. --- a/roofit/roostats/src/MCMCCalculator.cxx
  2851. +++ b/roofit/roostats/src/MCMCCalculator.cxx
  2852. @@ -43,23 +43,21 @@
  2853.  #endif
  2854.  #ifndef ROO_ARG_SET
  2855.  #include "RooArgSet.h"
  2856.  #endif
  2857.  #ifndef ROO_ARG_LIST
  2858.  #include "RooArgList.h"
  2859.  #endif
  2860.  #ifndef ROOSTATS_ModelConfig
  2861.  #include "RooStats/ModelConfig.h"
  2862.  #endif
  2863. -#ifndef RooStats_RooStatsUtils
  2864.  #include "RooStats/RooStatsUtils.h"
  2865. -#endif
  2866.  #ifndef ROOSTATS_MCMCCalculator
  2867.  #include "RooStats/MCMCCalculator.h"
  2868.  #endif
  2869.  #ifndef ROOSTATS_MetropolisHastings
  2870.  #include "RooStats/MetropolisHastings.h"
  2871.  #endif
  2872.  #ifndef ROOSTATS_MarkovChain
  2873.  #include "RooStats/MarkovChain.h"
  2874.  #endif
  2875.  #ifndef RooStats_MCMCInterval
  2876. diff --git a/roofit/roostats/src/MCMCInterval.cxx b/roofit/roostats/src/MCMCInterval.cxx
  2877. index 5d6c81b500..f9fe994e3e 100644
  2878. --- a/roofit/roostats/src/MCMCInterval.cxx
  2879. +++ b/roofit/roostats/src/MCMCInterval.cxx
  2880. @@ -68,29 +68,25 @@
  2881.  #endif
  2882.  #ifndef ROOSTATS_MarkovChain
  2883.  #include "RooStats/MarkovChain.h"
  2884.  #endif
  2885.  #ifndef RooStats_Heaviside
  2886.  #include "RooStats/Heaviside.h"
  2887.  #endif
  2888.  #ifndef ROO_DATA_HIST
  2889.  #include "RooDataHist.h"
  2890.  #endif
  2891. -#ifndef ROO_KEYS_PDF
  2892.  #include "RooNDKeysPdf.h"
  2893. -#endif
  2894.  #ifndef ROO_PRODUCT
  2895.  #include "RooProduct.h"
  2896.  #endif
  2897. -#ifndef RooStats_RooStatsUtils
  2898.  #include "RooStats/RooStatsUtils.h"
  2899. -#endif
  2900.  #ifndef ROO_REAL_VAR
  2901.  #include "RooRealVar.h"
  2902.  #endif
  2903.  #ifndef ROO_ARG_LIST
  2904.  #include "RooArgList.h"
  2905.  #endif
  2906.  #ifndef ROOT_TIterator
  2907.  #include "TIterator.h"
  2908.  #endif
  2909.  #ifndef ROOT_TH1
  2910. diff --git a/roofit/roostats/src/MarkovChain.cxx b/roofit/roostats/src/MarkovChain.cxx
  2911. index 40002164be..c293da3380 100644
  2912. --- a/roofit/roostats/src/MarkovChain.cxx
  2913. +++ b/roofit/roostats/src/MarkovChain.cxx
  2914. @@ -30,23 +30,21 @@ MarkovChain.
  2915.  #endif
  2916.  #ifndef ROO_DATA_SET
  2917.  #include "RooDataSet.h"
  2918.  #endif
  2919.  #ifndef ROO_ARG_SET
  2920.  #include "RooArgSet.h"
  2921.  #endif
  2922.  #ifndef ROO_REAL_VAR
  2923.  #include "RooRealVar.h"
  2924.  #endif
  2925. -#ifndef RooStats_RooStatsUtils
  2926.  #include "RooStats/RooStatsUtils.h"
  2927. -#endif
  2928.  #ifndef ROO_DATA_HIST
  2929.  #include "RooDataHist.h"
  2930.  #endif
  2931.  #ifndef ROOT_THnSparse
  2932.  #include "THnSparse.h"
  2933.  #endif
  2934.  
  2935.  using namespace std;
  2936.  
  2937.  ClassImp(RooStats::MarkovChain);
  2938. diff --git a/roofit/roostats/src/MetropolisHastings.cxx b/roofit/roostats/src/MetropolisHastings.cxx
  2939. index 894a4f0b7d..02730c41c0 100644
  2940. --- a/roofit/roostats/src/MetropolisHastings.cxx
  2941. +++ b/roofit/roostats/src/MetropolisHastings.cxx
  2942. @@ -41,23 +41,21 @@ uniformly over their intervals before construction of the MarkovChain begins.
  2943.  */
  2944.  
  2945.  #include "RooStats/MetropolisHastings.h"
  2946.  
  2947.  #ifndef ROOSTATS_MarkovChain
  2948.  #include "RooStats/MarkovChain.h"
  2949.  #endif
  2950.  #ifndef RooStats_MCMCInterval
  2951.  #include "RooStats/MCMCInterval.h"
  2952.  #endif
  2953. -#ifndef RooStats_RooStatsUtils
  2954.  #include "RooStats/RooStatsUtils.h"
  2955. -#endif
  2956.  #include "RooStats/ProposalFunction.h"
  2957.  
  2958.  #ifndef ROOT_Rtypes
  2959.  #include "Rtypes.h"
  2960.  #endif
  2961.  #ifndef ROO_REAL_VAR
  2962.  #include "RooRealVar.h"
  2963.  #endif
  2964.  #ifndef ROO_NLL_VAR
  2965.  #include "RooNLLVar.h"
  2966. diff --git a/roofit/roostats/src/ModelConfig.cxx b/roofit/roostats/src/ModelConfig.cxx
  2967. index f08937fee2..f72641f10b 100644
  2968. --- a/roofit/roostats/src/ModelConfig.cxx
  2969. +++ b/roofit/roostats/src/ModelConfig.cxx
  2970. @@ -18,23 +18,21 @@ ModelConfig requires a workspace to be set.
  2971.  */
  2972.  
  2973.  #include "RooStats/ModelConfig.h"
  2974.  
  2975.  #include "TROOT.h"
  2976.  
  2977.  #ifndef ROO_MSG_SERVICE
  2978.  #include "RooMsgService.h"
  2979.  #endif
  2980.  
  2981. -#ifndef RooStats_RooStatsUtils
  2982.  #include "RooStats/RooStatsUtils.h"
  2983. -#endif
  2984.  
  2985.  #include <sstream>
  2986.  
  2987.  
  2988.  ClassImp(RooStats::ModelConfig)
  2989.  
  2990.  using namespace std;
  2991.  
  2992.  namespace RooStats {
  2993.  
  2994. diff --git a/roofit/roostats/src/NeymanConstruction.cxx b/roofit/roostats/src/NeymanConstruction.cxx
  2995. index f4065c672b..8128ffbcfb 100644
  2996. --- a/roofit/roostats/src/NeymanConstruction.cxx
  2997. +++ b/roofit/roostats/src/NeymanConstruction.cxx
  2998. @@ -41,27 +41,23 @@ construction by:
  2999.      defined test statistic for each parameter point of interest,
  3000.    - defining the acceptance region in the data by finding the thresholds on the
  3001.      test statistic such that the integral of the sampling distribution is of the
  3002.      appropriate size and consistent with the limits of integration
  3003.      (eg. upper/lower/central limits),
  3004.    - and finally updating the PointSetInterval based on whether the value of the
  3005.      test statistic evaluated on the data are in the acceptance region.
  3006.  
  3007.  */
  3008.  
  3009. -#ifndef RooStats_NeymanConstruction
  3010.  #include "RooStats/NeymanConstruction.h"
  3011. -#endif
  3012.  
  3013. -#ifndef RooStats_RooStatsUtils
  3014.  #include "RooStats/RooStatsUtils.h"
  3015. -#endif
  3016.  
  3017.  #ifndef RooStats_PointSetInterval
  3018.  #include "RooStats/PointSetInterval.h"
  3019.  #endif
  3020.  
  3021.  #include "RooStats/SamplingDistribution.h"
  3022.  #include "RooStats/ToyMCSampler.h"
  3023.  #include "RooStats/ModelConfig.h"
  3024.  
  3025.  #include "RooMsgService.h"
  3026. diff --git a/roofit/roostats/src/NumberCountingPdfFactory.cxx b/roofit/roostats/src/NumberCountingPdfFactory.cxx
  3027. index dc44f07ee1..261718d6cc 100644
  3028. --- a/roofit/roostats/src/NumberCountingPdfFactory.cxx
  3029. +++ b/roofit/roostats/src/NumberCountingPdfFactory.cxx
  3030. @@ -29,23 +29,21 @@ The problem has been studied in these references:
  3031.  
  3032.  One can incorporate uncertainty on the expected signal by adding additional terms.
  3033.  For the future, perhaps this factory should be extended to include the efficiency terms automatically.
  3034.  
  3035.  */
  3036.  
  3037.  #ifndef RooStats_NumberCountingPdfFactory
  3038.  #include "RooStats/NumberCountingPdfFactory.h"
  3039.  #endif
  3040.  
  3041. -#ifndef RooStats_RooStatsUtils
  3042.  #include "RooStats/RooStatsUtils.h"
  3043. -#endif
  3044.  
  3045.  #include "RooRealVar.h"
  3046.  #include "RooAddition.h"
  3047.  #include "RooProduct.h"
  3048.  #include "RooDataSet.h"
  3049.  #include "RooProdPdf.h"
  3050.  #include "RooFitResult.h"
  3051.  #include "RooPoisson.h"
  3052.  #include "RooGlobalFunc.h"
  3053.  #include "RooCmdArg.h"
  3054. diff --git a/roofit/roostats/src/NumberCountingUtils.cxx b/roofit/roostats/src/NumberCountingUtils.cxx
  3055. index 8d8883d5c2..797c55c7ef 100644
  3056. --- a/roofit/roostats/src/NumberCountingUtils.cxx
  3057. +++ b/roofit/roostats/src/NumberCountingUtils.cxx
  3058. @@ -7,23 +7,21 @@
  3059.   *                                                                       *
  3060.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  3061.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  3062.   *************************************************************************/
  3063.  
  3064.  
  3065.  #ifndef RooStats_NumberCountingUtils
  3066.  #include "RooStats/NumberCountingUtils.h"
  3067.  #endif
  3068.  
  3069. -#ifndef RooStats_RooStatsUtils
  3070.  #include "RooStats/RooStatsUtils.h"
  3071. -#endif
  3072.  
  3073.  // // Without this macro the THtml doc  can not be generated
  3074.  // #if !defined(R__ALPHA) && !defined(R__SOLARIS) && !defined(R__ACC) && !defined(R__FBSD)
  3075.  // NamespaceImp(RooStats)
  3076.  // //NamespaceImp(NumberCountingUtils)
  3077.  // #endif
  3078.  
  3079.  //using namespace RooStats;
  3080.  
  3081.  Double_t RooStats::NumberCountingUtils::BinomialExpP(Double_t signalExp, Double_t backgroundExp, Double_t relativeBkgUncert){
  3082. diff --git a/roofit/roostats/src/PdfProposal.cxx b/roofit/roostats/src/PdfProposal.cxx
  3083. index 52d15e0903..c8ae22d809 100644
  3084. --- a/roofit/roostats/src/PdfProposal.cxx
  3085. +++ b/roofit/roostats/src/PdfProposal.cxx
  3086. @@ -49,23 +49,21 @@ for future versions.
  3087.  */
  3088.  
  3089.  
  3090.  #ifndef ROOT_Rtypes
  3091.  #include "Rtypes.h"
  3092.  #endif
  3093.  
  3094.  #ifndef ROOSTATS_PdfProposal
  3095.  #include "RooStats/PdfProposal.h"
  3096.  #endif
  3097. -#ifndef RooStats_RooStatsUtils
  3098.  #include "RooStats/RooStatsUtils.h"
  3099. -#endif
  3100.  #ifndef ROO_ARG_SET
  3101.  #include "RooArgSet.h"
  3102.  #endif
  3103.  #ifndef ROO_DATA_SET
  3104.  #include "RooDataSet.h"
  3105.  #endif
  3106.  #ifndef ROO_ABS_PDF
  3107.  #include "RooAbsPdf.h"
  3108.  #endif
  3109.  #ifndef ROO_MSG_SERVICE
  3110. diff --git a/roofit/roostats/src/ProfileLikelihoodCalculator.cxx b/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
  3111. index b5bdb7f32c..f7c9ebed1a 100644
  3112. --- a/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
  3113. +++ b/roofit/roostats/src/ProfileLikelihoodCalculator.cxx
  3114. @@ -40,27 +40,23 @@ After configuring the calculator, one only needs to ask GetHypoTest() (which wil
  3115.  The concrete implementations of this interface should deal with the details of how the nuisance parameters are
  3116.  dealt with (eg. integration vs. profiling) and which test-statistic is used (perhaps this should be added to the interface).
  3117.  </p>
  3118.  <p>
  3119.  The motivation for this interface is that we hope to be able to specify the problem in a common way for several concrete calculators.
  3120.  </p>
  3121.  END_HTML
  3122.  */
  3123.  //
  3124.  
  3125. -#ifndef RooStats_ProfileLikelihoodCalculator
  3126.  #include "RooStats/ProfileLikelihoodCalculator.h"
  3127. -#endif
  3128.  
  3129. -#ifndef RooStats_RooStatsUtils
  3130.  #include "RooStats/RooStatsUtils.h"
  3131. -#endif
  3132.  
  3133.  #include "RooStats/LikelihoodInterval.h"
  3134.  #include "RooStats/HypoTestResult.h"
  3135.  
  3136.  #include "RooFitResult.h"
  3137.  #include "RooRealVar.h"
  3138.  #include "RooProfileLL.h"
  3139.  #include "RooNLLVar.h"
  3140.  #include "RooGlobalFunc.h"
  3141.  #include "RooMsgService.h"
  3142. diff --git a/roofit/roostats/src/ProposalHelper.cxx b/roofit/roostats/src/ProposalHelper.cxx
  3143. index c6c7713d9f..1e0de54b11 100644
  3144. --- a/roofit/roostats/src/ProposalHelper.cxx
  3145. +++ b/roofit/roostats/src/ProposalHelper.cxx
  3146. @@ -19,38 +19,34 @@ END_HTML
  3147.  
  3148.  #ifndef ROOT_Rtypes
  3149.  #include "Rtypes.h"
  3150.  #endif
  3151.  #ifndef RooStats_ProposalHelper
  3152.  #include "RooStats/ProposalHelper.h"
  3153.  #endif
  3154.  #ifndef ROOSTATS_PdfProposal
  3155.  #include "RooStats/PdfProposal.h"
  3156.  #endif
  3157. -#ifndef RooStats_RooStatsUtils
  3158.  #include "RooStats/RooStatsUtils.h"
  3159. -#endif
  3160.  #ifndef ROO_ARG_SET
  3161.  #include "RooArgSet.h"
  3162.  #endif
  3163.  #ifndef ROO_DATA_SET
  3164.  #include "RooDataSet.h"
  3165.  #endif
  3166.  #ifndef ROO_ABS_PDF
  3167.  #include "RooAbsPdf.h"
  3168.  #endif
  3169.  #ifndef ROO_ADD_PDF
  3170.  #include "RooAddPdf.h"
  3171.  #endif
  3172. -#ifndef ROO_KEYS_PDF
  3173.  #include "RooNDKeysPdf.h"
  3174. -#endif
  3175.  #ifndef ROO_UNIFORM
  3176.  #include "RooUniform.h"
  3177.  #endif
  3178.  #ifndef ROO_MSG_SERVICE
  3179.  #include "RooMsgService.h"
  3180.  #endif
  3181.  #ifndef ROO_REAL_VAR
  3182.  #include "RooRealVar.h"
  3183.  #endif
  3184.  #ifndef ROOT_TIterator
  3185. diff --git a/roofit/roostats/src/UniformProposal.cxx b/roofit/roostats/src/UniformProposal.cxx
  3186. index 8e56a0b662..ba1a984370 100644
  3187. --- a/roofit/roostats/src/UniformProposal.cxx
  3188. +++ b/roofit/roostats/src/UniformProposal.cxx
  3189. @@ -9,23 +9,21 @@
  3190.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  3191.   *************************************************************************/
  3192.  
  3193.  ////////////////////////////////////////////////////////////////////////////////
  3194.  
  3195.  
  3196.  #ifndef ROOT_Rtypes
  3197.  #include "Rtypes.h"
  3198.  #endif
  3199.  
  3200. -#ifndef RooStats_RooStatsUtils
  3201.  #include "RooStats/RooStatsUtils.h"
  3202. -#endif
  3203.  #ifndef ROOSTATS_UniformProposal
  3204.  #include "RooStats/UniformProposal.h"
  3205.  #endif
  3206.  #ifndef ROO_ARG_SET
  3207.  #include "RooArgSet.h"
  3208.  #endif
  3209.  #ifndef ROO_MSG_SERVICE
  3210.  #include "RooMsgService.h"
  3211.  #endif
  3212.  #ifndef ROO_REAL_VAR
  3213. diff --git a/test/RootShower/RSHelpText.cxx b/test/RootShower/RSHelpText.cxx
  3214. index 6e387adcd1..0792025fda 100644
  3215. --- a/test/RootShower/RSHelpText.cxx
  3216. +++ b/test/RootShower/RSHelpText.cxx
  3217. @@ -1,22 +1,20 @@
  3218.  // Author: Bertrand Bellenot   22/08/02
  3219.  
  3220.  /*************************************************************************
  3221.   * Copyright (C) 1995-2002, Bertrand Bellenot.                           *
  3222.   * All rights reserved.                                                  *
  3223.   *                                                                       *
  3224.   * For the licensing terms see the LICENSE file.                         *
  3225.   *************************************************************************/
  3226.  
  3227. -#ifndef ROOTSHOWERHELPTEXT_H
  3228.  #include "RSHelpText.h"
  3229. -#endif
  3230.  
  3231.  const char gPhysicsHelpText[] =
  3232.  "\n                    Some physics recalls...\n\n"
  3233.  "Radiation length:\n"
  3234.  "High-energy electrons predominantly lose energy in matter by\n"
  3235.  "bremsstrahlung, and high-energy photons by e + e - pair production.\n"
  3236.  "The characteristic amount of matter traversed for these related\n"
  3237.  "interactions is called the radiation length X 0, usually measured\n"
  3238.  "in g cm - 2 . It is the mean distance over which a high-energy\n"
  3239.  "electron loses all but 1/e of its energy by bremsstrahlung, and\n"
  3240. diff --git a/test/RootShower/RootShower.cxx b/test/RootShower/RootShower.cxx
  3241. index c7ad6ad498..09f00da0dd 100644
  3242. --- a/test/RootShower/RootShower.cxx
  3243. +++ b/test/RootShower/RootShower.cxx
  3244. @@ -51,23 +51,21 @@
  3245.  #include <TGeoManager.h>
  3246.  #include <TView.h>
  3247.  #include <TGToolBar.h>
  3248.  #include <TGSplitter.h>
  3249.  #include <TColor.h>
  3250.  #include <THtml.h>
  3251.  
  3252.  #include <TPluginManager.h>
  3253.  #include <TVirtualGL.h>
  3254.  
  3255. -#ifndef _CONSTANTS_H_
  3256.  #include "constants.h"
  3257. -#endif
  3258.  
  3259.  enum RootShowerMessageTypes {
  3260.     M_FILE_OPEN,
  3261.     M_FILE_SAVEAS,
  3262.     M_FILE_HTML,
  3263.     M_FILE_EXIT,
  3264.     M_EVENT_NEXT,
  3265.     M_EVENT_SELECT,
  3266.     M_INTERRUPT_SIMUL,
  3267.     M_ZOOM_PLUS,
  3268. diff --git a/tmva/tmva/inc/TMVA/CCPruner.h b/tmva/tmva/inc/TMVA/CCPruner.h
  3269. index d3ba1d1a38..6fa4220b15 100644
  3270. --- a/tmva/tmva/inc/TMVA/CCPruner.h
  3271. +++ b/tmva/tmva/inc/TMVA/CCPruner.h
  3272. @@ -46,23 +46,21 @@
  3273.  
  3274.  
  3275.  #ifndef ROOT_TMVA_DecisionTree
  3276.  #include "TMVA/DecisionTree.h"
  3277.  #endif
  3278.  
  3279.  /* #ifndef ROOT_TMVA_DecisionTreeNode */
  3280.  /* #include "TMVA/DecisionTreeNode.h" */
  3281.  /* #endif */
  3282.  
  3283. -#ifndef ROOT_TMVA_Event
  3284.  #include "TMVA/Event.h"
  3285. -#endif
  3286.  
  3287.  namespace TMVA {
  3288.     class DataSet;
  3289.     class DecisionTreeNode;
  3290.     class SeparationBase;
  3291.  
  3292.     class CCPruner {
  3293.     public:
  3294.        typedef std::vector<Event*> EventList;
  3295.  
  3296. diff --git a/tmva/tmva/inc/TMVA/CCTreeWrapper.h b/tmva/tmva/inc/TMVA/CCTreeWrapper.h
  3297. index 2d0351a5e0..e2a6b5596b 100644
  3298. --- a/tmva/tmva/inc/TMVA/CCTreeWrapper.h
  3299. +++ b/tmva/tmva/inc/TMVA/CCTreeWrapper.h
  3300. @@ -17,23 +17,21 @@
  3301.   *      U. of Texas at Austin, USA                                                *
  3302.   *                                                                                *
  3303.   * Redistribution and use in source and binary forms, with or without             *
  3304.   * modification, are permitted according to the terms listed in LICENSE           *
  3305.   * (http://tmva.sourceforge.net/LICENSE)                                          *
  3306.   **********************************************************************************/
  3307.  
  3308.  #ifndef ROOT_TMVA_CCTreeWrapper
  3309.  #define ROOT_TMVA_CCTreeWrapper
  3310.  
  3311. -#ifndef ROOT_TMVA_Event
  3312.  #include "TMVA/Event.h"
  3313. -#endif
  3314.  #ifndef ROOT_TMVA_SeparationBase
  3315.  #include "TMVA/SeparationBase.h"
  3316.  #endif
  3317.  #ifndef ROOT_TMVA_DecisionTree
  3318.  #include "TMVA/DecisionTree.h"
  3319.  #endif
  3320.  #ifndef ROOT_TMVA_DataSet
  3321.  #include "TMVA/DataSet.h"
  3322.  #endif
  3323.  #ifndef ROOT_TMVA_Version
  3324. diff --git a/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h b/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
  3325. index 98017850ec..eb01a9ccf0 100644
  3326. --- a/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
  3327. +++ b/tmva/tmva/inc/TMVA/CostComplexityPruneTool.h
  3328. @@ -52,23 +52,21 @@
  3329.  
  3330.  #ifndef ROOT_TMVA_SeparationBase
  3331.  #include "TMVA/SeparationBase.h"
  3332.  #endif
  3333.  #ifndef ROOT_TMVA_GiniIndex
  3334.  #include "TMVA/GiniIndex.h"
  3335.  #endif
  3336.  #ifndef ROOT_TMVA_DecisionTree
  3337.  #include "TMVA/DecisionTree.h"
  3338.  #endif
  3339. -#ifndef ROOT_TMVA_Event
  3340.  #include "TMVA/Event.h"
  3341. -#endif
  3342.  #ifndef ROOT_TMVA_IPruneTool
  3343.  #include "TMVA/IPruneTool.h"
  3344.  #endif
  3345.  
  3346.  namespace TMVA {
  3347.  
  3348.     class CostComplexityPruneTool : public IPruneTool {
  3349.     public:
  3350.        CostComplexityPruneTool( SeparationBase* qualityIndex = NULL );
  3351.        virtual ~CostComplexityPruneTool( );
  3352. diff --git a/tmva/tmva/inc/TMVA/CrossValidation.h b/tmva/tmva/inc/TMVA/CrossValidation.h
  3353. index 093bf324dc..f18f50b222 100644
  3354. --- a/tmva/tmva/inc/TMVA/CrossValidation.h
  3355. +++ b/tmva/tmva/inc/TMVA/CrossValidation.h
  3356. @@ -21,31 +21,27 @@
  3357.  #endif
  3358.  
  3359.  #ifndef ROOT_TMVA_Types
  3360.  #include "TMVA/Types.h"
  3361.  #endif
  3362.  
  3363.  #ifndef ROOT_TMVA_DataSet
  3364.  #include "TMVA/DataSet.h"
  3365.  #endif
  3366.  
  3367. -#ifndef ROOT_TMVA_Event
  3368.  #include "TMVA/Event.h"
  3369. -#endif
  3370.  
  3371.  #ifndef ROOT_TMVA_Results
  3372.  #include <TMVA/Results.h>
  3373.  #endif
  3374.  
  3375. -#ifndef ROOT_TMVA_Factory
  3376.  #include <TMVA/Factory.h>
  3377. -#endif
  3378.  
  3379.  #ifndef ROOT_TMVA_DataLoader
  3380.  #include <TMVA/DataLoader.h>
  3381.  #endif
  3382.  
  3383.  #ifndef ROOT_TMVA_OptionMap
  3384.  #include <TMVA/OptionMap.h>
  3385.  #endif
  3386.  
  3387.  #ifndef ROOT_TMVA_Envelope
  3388. diff --git a/tmva/tmva/inc/TMVA/DataLoader.h b/tmva/tmva/inc/TMVA/DataLoader.h
  3389. index 2c881ccd8f..f750812492 100644
  3390. --- a/tmva/tmva/inc/TMVA/DataLoader.h
  3391. +++ b/tmva/tmva/inc/TMVA/DataLoader.h
  3392. @@ -29,23 +29,21 @@
  3393.  #define ROOT_TMVA_DataLoader
  3394.  
  3395.  
  3396.  #include <string>
  3397.  #include <vector>
  3398.  #include <map>
  3399.  #ifndef ROOT_TCut
  3400.  #include "TCut.h"
  3401.  #endif
  3402.  
  3403. -#ifndef ROOT_TMVA_Factory
  3404.  #include "TMVA/Factory.h"
  3405. -#endif
  3406.  #ifndef ROOT_TMVA_Types
  3407.  #include "TMVA/Types.h"
  3408.  #endif
  3409.  #ifndef ROOT_TMVA_DataSet
  3410.  #include "TMVA/DataSet.h"
  3411.  #endif
  3412.  
  3413.  class TFile;
  3414.  class TTree;
  3415.  class TDirectory;
  3416. diff --git a/tmva/tmva/inc/TMVA/DataSetFactory.h b/tmva/tmva/inc/TMVA/DataSetFactory.h
  3417. index e139aa73af..1ce3752903 100644
  3418. --- a/tmva/tmva/inc/TMVA/DataSetFactory.h
  3419. +++ b/tmva/tmva/inc/TMVA/DataSetFactory.h
  3420. @@ -61,23 +61,21 @@
  3421.  #ifndef ROOT_TRandom3
  3422.  #include "TRandom3.h"
  3423.  #endif
  3424.  
  3425.  #ifndef ROOT_TMVA_Types
  3426.  #include "TMVA/Types.h"
  3427.  #endif
  3428.  #ifndef ROOT_TMVA_VariableInfo
  3429.  #include "TMVA/VariableInfo.h"
  3430.  #endif
  3431. -#ifndef ROOT_TMVA_Event
  3432.  #include "TMVA/Event.h"
  3433. -#endif
  3434.  
  3435.  namespace TMVA {
  3436.  
  3437.     class DataSet;
  3438.     class DataSetInfo;
  3439.     class DataInputHandler;
  3440.     class TreeInfo;
  3441.     class MsgLogger;
  3442.  
  3443.     // =============== maybe move these elswhere (e.g. into the tools )
  3444. diff --git a/tmva/tmva/inc/TMVA/DataSetInfo.h b/tmva/tmva/inc/TMVA/DataSetInfo.h
  3445. index 8977b86fda..cecaa16aeb 100644
  3446. --- a/tmva/tmva/inc/TMVA/DataSetInfo.h
  3447. +++ b/tmva/tmva/inc/TMVA/DataSetInfo.h
  3448. @@ -55,23 +55,21 @@
  3449.  
  3450.  #ifndef ROOT_TMVA_Types
  3451.  #include "TMVA/Types.h"
  3452.  #endif
  3453.  #ifndef ROOT_TMVA_VariableInfo
  3454.  #include "TMVA/VariableInfo.h"
  3455.  #endif
  3456.  #ifndef ROOT_TMVA_ClassInfo
  3457.  #include "TMVA/ClassInfo.h"
  3458.  #endif
  3459. -#ifndef ROOT_TMVA_Event
  3460.  #include "TMVA/Event.h"
  3461. -#endif
  3462.  
  3463.  class TH2;
  3464.  
  3465.  namespace TMVA {
  3466.  
  3467.     class DataSet;
  3468.     class VariableTransformBase;
  3469.     class MsgLogger;
  3470.     class DataSetManager;
  3471.  
  3472. diff --git a/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h b/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
  3473. index 956393ba79..332dc649c8 100644
  3474. --- a/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
  3475. +++ b/tmva/tmva/inc/TMVA/HyperParameterOptimisation.h
  3476. @@ -19,30 +19,26 @@
  3477.  #endif
  3478.  #ifndef ROOT_TMVA_Configurable
  3479.  #include "TMVA/Configurable.h"
  3480.  #endif
  3481.  #ifndef ROOT_TMVA_Types
  3482.  #include "TMVA/Types.h"
  3483.  #endif
  3484.  #ifndef ROOT_TMVA_DataSet
  3485.  #include "TMVA/DataSet.h"
  3486.  #endif
  3487. -#ifndef ROOT_TMVA_Event
  3488.  #include "TMVA/Event.h"
  3489. -#endif
  3490.  #ifndef ROOT_TMVA_Results
  3491.  #include<TMVA/Results.h>
  3492.  #endif
  3493.  
  3494. -#ifndef ROOT_TMVA_Factory
  3495. -#include<TMVA/Factory.h>
  3496. -#endif
  3497. +#include <TMVA/Factory.h>
  3498.  
  3499.  #ifndef ROOT_TMVA_DataLoader
  3500.  #include<TMVA/DataLoader.h>
  3501.  #endif
  3502.  
  3503.  #ifndef ROOT_TMVA_Envelope
  3504.  #include<TMVA/Envelope.h>
  3505.  #endif
  3506.  
  3507.  namespace TMVA {
  3508. diff --git a/tmva/tmva/inc/TMVA/LogInterval.h b/tmva/tmva/inc/TMVA/LogInterval.h
  3509. index a8d9119301..5d5c73c106 100644
  3510. --- a/tmva/tmva/inc/TMVA/LogInterval.h
  3511. +++ b/tmva/tmva/inc/TMVA/LogInterval.h
  3512. @@ -65,23 +65,21 @@
  3513.  //    i=7 --> 128                                                           //
  3514.  //    i=8 --> 256                                                           //
  3515.  //    i=9 --> 512                                                           //
  3516.  //    i=10 --> 1024                                                         //
  3517.  //                                                                          //
  3518.  //////////////////////////////////////////////////////////////////////////////
  3519.  #ifndef ROOT_Rtypes
  3520.  #include "Rtypes.h"
  3521.  #endif
  3522.  
  3523. -#ifndef TMVA_Interval
  3524.  #include "Interval.h"
  3525. -#endif
  3526.  
  3527.  
  3528.  
  3529.  class TRandom3;
  3530.  
  3531.  namespace TMVA {
  3532.  
  3533.     class MsgLogger;
  3534.  
  3535.     class LogInterval : public Interval {
  3536. diff --git a/tmva/tmva/inc/TMVA/MethodANNBase.h b/tmva/tmva/inc/TMVA/MethodANNBase.h
  3537. index 06b2b8ab85..666f905077 100644
  3538. --- a/tmva/tmva/inc/TMVA/MethodANNBase.h
  3539. +++ b/tmva/tmva/inc/TMVA/MethodANNBase.h
  3540. @@ -58,23 +58,21 @@
  3541.  #ifndef ROOT_TMatrix
  3542.  #include "TMatrix.h"
  3543.  #endif
  3544.  
  3545.  #ifndef ROOT_TMVA_MethodBase
  3546.  #include "TMVA/MethodBase.h"
  3547.  #endif
  3548.  #ifndef ROOT_TMVA_TActivation
  3549.  #include "TMVA/TActivation.h"
  3550.  #endif
  3551. -#ifndef ROOT_TMVA_TNeuron
  3552.  #include "TMVA/TNeuron.h"
  3553. -#endif
  3554.  #ifndef ROOT_TMVA_TNeuronInput
  3555.  #include "TMVA/TNeuronInput.h"
  3556.  #endif
  3557.  
  3558.  class TH1;
  3559.  class TH1F;
  3560.  
  3561.  namespace TMVA {
  3562.  
  3563.     class MethodANNBase : public MethodBase {
  3564. diff --git a/tmva/tmva/inc/TMVA/MethodBDT.h b/tmva/tmva/inc/TMVA/MethodBDT.h
  3565. index 17f4bd1d71..b0ee444a55 100644
  3566. --- a/tmva/tmva/inc/TMVA/MethodBDT.h
  3567. +++ b/tmva/tmva/inc/TMVA/MethodBDT.h
  3568. @@ -45,23 +45,21 @@
  3569.  #endif
  3570.  #ifndef ROOT_TTree
  3571.  #include "TTree.h"
  3572.  #endif
  3573.  #ifndef ROOT_TMVA_MethodBase
  3574.  #include "TMVA/MethodBase.h"
  3575.  #endif
  3576.  #ifndef ROOT_TMVA_DecisionTree
  3577.  #include "TMVA/DecisionTree.h"
  3578.  #endif
  3579. -#ifndef ROOT_TMVA_Event
  3580.  #include "TMVA/Event.h"
  3581. -#endif
  3582.  #include "TMVA/LossFunction.h"
  3583.  
  3584.  namespace TMVA {
  3585.  
  3586.     class SeparationBase;
  3587.  
  3588.     class MethodBDT : public MethodBase {
  3589.  
  3590.     public:
  3591.        // constructor for training and reading
  3592. diff --git a/tmva/tmva/inc/TMVA/MethodBase.h b/tmva/tmva/inc/TMVA/MethodBase.h
  3593. index c7f9a99f2c..1d4e9bdd03 100644
  3594. --- a/tmva/tmva/inc/TMVA/MethodBase.h
  3595. +++ b/tmva/tmva/inc/TMVA/MethodBase.h
  3596. @@ -55,23 +55,21 @@
  3597.  #endif
  3598.  #ifndef ROOT_TMVA_Configurable
  3599.  #include "TMVA/Configurable.h"
  3600.  #endif
  3601.  #ifndef ROOT_TMVA_Types
  3602.  #include "TMVA/Types.h"
  3603.  #endif
  3604.  #ifndef ROOT_TMVA_DataSet
  3605.  #include "TMVA/DataSet.h"
  3606.  #endif
  3607. -#ifndef ROOT_TMVA_Event
  3608.  #include "TMVA/Event.h"
  3609. -#endif
  3610.  #ifndef ROOT_TMVA_TransformationHandler
  3611.  #include "TMVA/TransformationHandler.h"
  3612.  #endif
  3613.  #ifndef ROOT_TMVA_Results
  3614.  #include<TMVA/Results.h>
  3615.  #endif
  3616.  
  3617.  #ifndef ROOT_TFile
  3618.  #include<TFile.h>
  3619.  #endif
  3620. diff --git a/tmva/tmva/inc/TMVA/MethodCuts.h b/tmva/tmva/inc/TMVA/MethodCuts.h
  3621. index 96cc192bbc..4e3278bff5 100644
  3622. --- a/tmva/tmva/inc/TMVA/MethodCuts.h
  3623. +++ b/tmva/tmva/inc/TMVA/MethodCuts.h
  3624. @@ -54,24 +54,22 @@
  3625.  #endif
  3626.  #ifndef ROOT_TMVA_PDF
  3627.  #include "TMVA/PDF.h"
  3628.  #endif
  3629.  #ifndef ROOT_TMVA_TMatrixDfwd
  3630.  #ifndef ROOT_TMatrixDfwd
  3631.  #include "TMatrixDfwd.h"
  3632.  #endif
  3633.  #endif
  3634.  #ifndef ROOT_TMVA_IFitterTarget
  3635. -#ifndef ROOT_IFitterTarget
  3636.  #include "IFitterTarget.h"
  3637.  #endif
  3638. -#endif
  3639.  
  3640.  class TRandom;
  3641.  
  3642.  namespace TMVA {
  3643.  
  3644.     class Interval;
  3645.  
  3646.     class MethodCuts : public MethodBase, public IFitterTarget {
  3647.  
  3648.     public:
  3649. diff --git a/tmva/tmva/inc/TMVA/MethodDT.h b/tmva/tmva/inc/TMVA/MethodDT.h
  3650. index cf6f747095..4b2c077c09 100644
  3651. --- a/tmva/tmva/inc/TMVA/MethodDT.h
  3652. +++ b/tmva/tmva/inc/TMVA/MethodDT.h
  3653. @@ -44,23 +44,21 @@
  3654.  #endif
  3655.  #ifndef ROOT_TTree
  3656.  #include "TTree.h"
  3657.  #endif
  3658.  #ifndef ROOT_TMVA_MethodBase
  3659.  #include "TMVA/MethodBase.h"
  3660.  #endif
  3661.  #ifndef ROOT_TMVA_DecisionTree
  3662.  #include "TMVA/DecisionTree.h"
  3663.  #endif
  3664. -#ifndef ROOT_TMVA_Event
  3665.  #include "TMVA/Event.h"
  3666. -#endif
  3667.  
  3668.  namespace TMVA {
  3669.     class MethodBoost;
  3670.  
  3671.     class MethodDT : public MethodBase {
  3672.     public:
  3673.        MethodDT( const TString& jobName,
  3674.                  const TString& methodTitle,
  3675.                  DataSetInfo& theData,
  3676.                  const TString& theOption = "");
  3677. diff --git a/tmva/tmva/inc/TMVA/MethodMLP.h b/tmva/tmva/inc/TMVA/MethodMLP.h
  3678. index b8419ddc59..91594457c0 100644
  3679. --- a/tmva/tmva/inc/TMVA/MethodMLP.h
  3680. +++ b/tmva/tmva/inc/TMVA/MethodMLP.h
  3681. @@ -68,23 +68,21 @@
  3682.  
  3683.  #ifndef ROOT_TMVA_IFitterTarget
  3684.  #include "TMVA/IFitterTarget.h"
  3685.  #endif
  3686.  #ifndef ROOT_TMVA_MethodBase
  3687.  #include "TMVA/MethodBase.h"
  3688.  #endif
  3689.  #ifndef ROOT_TMVA_MethodANNBase
  3690.  #include "TMVA/MethodANNBase.h"
  3691.  #endif
  3692. -#ifndef ROOT_TMVA_TNeuron
  3693.  #include "TMVA/TNeuron.h"
  3694. -#endif
  3695.  #ifndef ROOT_TMVA_TActivation
  3696.  #include "TMVA/TActivation.h"
  3697.  #endif
  3698.  #ifndef ROOT_TMVA_ConvergenceTest
  3699.  #include "TMVA/ConvergenceTest.h"
  3700.  #endif
  3701.  
  3702.  #define MethodMLP_UseMinuit__
  3703.  #undef  MethodMLP_UseMinuit__
  3704.  
  3705. diff --git a/tmva/tmva/inc/TMVA/ModulekNN.h b/tmva/tmva/inc/TMVA/ModulekNN.h
  3706. index 5412185332..31fa75022a 100644
  3707. --- a/tmva/tmva/inc/TMVA/ModulekNN.h
  3708. +++ b/tmva/tmva/inc/TMVA/ModulekNN.h
  3709. @@ -38,23 +38,21 @@
  3710.  #include <cassert>
  3711.  #include <iosfwd>
  3712.  #include <map>
  3713.  #include <string>
  3714.  #include <vector>
  3715.  
  3716.  // ROOT
  3717.  #ifndef ROOT_Rtypes
  3718.  #include "Rtypes.h"
  3719.  #endif
  3720. -#ifndef ROOT_TRandom
  3721.  #include "TRandom3.h"
  3722. -#endif
  3723.  #ifndef ROOT_ThreadLocalStorage
  3724.  #include "ThreadLocalStorage.h"
  3725.  #endif
  3726.  #ifndef ROOT_TMVA_NodekNN
  3727.  #include "TMVA/NodekNN.h"
  3728.  #endif
  3729.  
  3730.  namespace TMVA {
  3731.  
  3732.     class MsgLogger;
  3733. diff --git a/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h b/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
  3734. index 4809597dc6..594f87c83e 100644
  3735. --- a/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
  3736. +++ b/tmva/tmva/inc/TMVA/OptimizeConfigParameters.h
  3737. @@ -40,24 +40,22 @@
  3738.  
  3739.  #ifndef ROOT_TMVA_Interval
  3740.  #include "TMVA/Interval.h"
  3741.  #endif
  3742.  
  3743.  #ifndef ROOT_TMVA_DataSet
  3744.  #include "TMVA/DataSet.h"
  3745.  #endif
  3746.  
  3747.  #ifndef ROOT_TMVA_IFitterTarget
  3748. -#ifndef ROOT_IFitterTarget
  3749.  #include "IFitterTarget.h"
  3750.  #endif
  3751. -#endif
  3752.  
  3753.  #ifndef ROOT_TH1
  3754.  #include "TH1.h"
  3755.  #endif
  3756.  
  3757.  namespace TMVA {
  3758.  
  3759.     class MethodBase;
  3760.     class MsgLogger;
  3761.     class OptimizeConfigParameters : public IFitterTarget  {
  3762. diff --git a/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h b/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
  3763. index e962ce633c..723d14cf29 100644
  3764. --- a/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
  3765. +++ b/tmva/tmva/inc/TMVA/PDEFoamDensityBase.h
  3766. @@ -32,23 +32,21 @@
  3767.  #ifndef ROOT_TMVA_PDEFoamDensityBase
  3768.  #define ROOT_TMVA_PDEFoamDensityBase
  3769.  
  3770.  #ifndef ROOT_TObject
  3771.  #include "TObject.h"
  3772.  #endif
  3773.  
  3774.  #ifndef ROOT_TMVA_BinarySearchTree
  3775.  #include "TMVA/BinarySearchTree.h"
  3776.  #endif
  3777. -#ifndef ROOT_TMVA_Event
  3778.  #include "TMVA/Event.h"
  3779. -#endif
  3780.  #ifndef ROOT_TMVA_MsgLogger
  3781.  #include "TMVA/MsgLogger.h"
  3782.  #endif
  3783.  
  3784.  namespace TMVA
  3785.  {
  3786.  
  3787.     // class definition of underlying density
  3788.     class PDEFoamDensityBase : public ::TObject
  3789.        {
  3790. diff --git a/tmva/tmva/inc/TMVA/ResultsMulticlass.h b/tmva/tmva/inc/TMVA/ResultsMulticlass.h
  3791. index e2537a3d3a..238189b0d9 100644
  3792. --- a/tmva/tmva/inc/TMVA/ResultsMulticlass.h
  3793. +++ b/tmva/tmva/inc/TMVA/ResultsMulticlass.h
  3794. @@ -44,26 +44,22 @@
  3795.  #ifndef ROOT_TH1F
  3796.  #include "TH1F.h"
  3797.  #endif
  3798.  #ifndef ROOT_TH2F
  3799.  #include "TH2F.h"
  3800.  #endif
  3801.  
  3802.  #ifndef ROOT_TMVA_Results
  3803.  #include "TMVA/Results.h"
  3804.  #endif
  3805. -#ifndef ROOT_TMVA_Event
  3806.  #include "TMVA/Event.h"
  3807. -#endif
  3808. -#ifndef ROOT_IFitterTarget
  3809.  #include "IFitterTarget.h"
  3810. -#endif
  3811.  
  3812.  namespace TMVA {
  3813.  
  3814.     class MsgLogger;
  3815.    
  3816.     class ResultsMulticlass : public Results, public IFitterTarget {
  3817.  
  3818.     public:
  3819.  
  3820.        ResultsMulticlass( const DataSetInfo* dsi, TString resultsName  );
  3821. diff --git a/tmva/tmva/inc/TMVA/ResultsRegression.h b/tmva/tmva/inc/TMVA/ResultsRegression.h
  3822. index b2ed92d4f0..3a9a0d9882 100644
  3823. --- a/tmva/tmva/inc/TMVA/ResultsRegression.h
  3824. +++ b/tmva/tmva/inc/TMVA/ResultsRegression.h
  3825. @@ -42,23 +42,21 @@
  3826.  #ifndef ROOT_TH1F
  3827.  #include "TH1F.h"
  3828.  #endif
  3829.  #ifndef ROOT_TH2F
  3830.  #include "TH2F.h"
  3831.  #endif
  3832.  
  3833.  #ifndef ROOT_TMVA_Results
  3834.  #include "TMVA/Results.h"
  3835.  #endif
  3836. -#ifndef ROOT_TMVA_Event
  3837.  #include "TMVA/Event.h"
  3838. -#endif
  3839.  
  3840.  namespace TMVA {
  3841.  
  3842.     class MsgLogger;
  3843.  
  3844.     class ResultsRegression : public Results {
  3845.  
  3846.     public:
  3847.  
  3848.        ResultsRegression( const DataSetInfo* dsi, TString resultsName  );
  3849. diff --git a/tmva/tmva/inc/TMVA/Rule.h b/tmva/tmva/inc/TMVA/Rule.h
  3850. index e1db091920..60def90a1c 100644
  3851. --- a/tmva/tmva/inc/TMVA/Rule.h
  3852. +++ b/tmva/tmva/inc/TMVA/Rule.h
  3853. @@ -31,23 +31,21 @@
  3854.  #ifndef ROOT_TMVA_Rule
  3855.  #define ROOT_TMVA_Rule
  3856.  
  3857.  #ifndef ROOT_TMath
  3858.  #include "TMath.h"
  3859.  #endif
  3860.  
  3861.  #ifndef ROOT_TMVA_DecisionTree
  3862.  #include "TMVA/DecisionTree.h"
  3863.  #endif
  3864. -#ifndef ROOT_TMVA_Event
  3865.  #include "TMVA/Event.h"
  3866. -#endif
  3867.  #ifndef ROOT_TMVA_RuleCut
  3868.  #include "TMVA/RuleCut.h"
  3869.  #endif
  3870.  
  3871.  namespace TMVA {
  3872.  
  3873.     class RuleEnsemble;
  3874.     class MsgLogger;
  3875.     class Rule;
  3876.  
  3877. diff --git a/tmva/tmva/inc/TMVA/RuleCut.h b/tmva/tmva/inc/TMVA/RuleCut.h
  3878. index 6768c4e572..bfa49e0b45 100644
  3879. --- a/tmva/tmva/inc/TMVA/RuleCut.h
  3880. +++ b/tmva/tmva/inc/TMVA/RuleCut.h
  3881. @@ -17,23 +17,21 @@
  3882.   *      CERN, Switzerland                                                         *
  3883.   *      Iowa State U.                                                             *
  3884.   *                                                                                *
  3885.   * Redistribution and use in source and binary forms, with or without             *
  3886.   * modification, are permitted according to the terms listed in LICENSE           *
  3887.   * (http://tmva.sourceforge.net/LICENSE)                                          *
  3888.   **********************************************************************************/
  3889.  #ifndef ROOT_TMVA_RuleCut
  3890.  #define ROOT_TMVA_RuleCut
  3891.  
  3892. -#ifndef ROOT_TMVA_Event
  3893.  #include "TMVA/Event.h"
  3894. -#endif
  3895.  
  3896.  namespace TMVA {
  3897.  
  3898.     class Node;
  3899.     class MsgLogger;
  3900.  
  3901.     class RuleCut {
  3902.  
  3903.     public:
  3904.  
  3905. diff --git a/tmva/tmva/inc/TMVA/RuleEnsemble.h b/tmva/tmva/inc/TMVA/RuleEnsemble.h
  3906. index 293c1406d2..4fc0b1bd3b 100644
  3907. --- a/tmva/tmva/inc/TMVA/RuleEnsemble.h
  3908. +++ b/tmva/tmva/inc/TMVA/RuleEnsemble.h
  3909. @@ -35,23 +35,21 @@
  3910.  // #endif
  3911.  // #else
  3912.  #ifndef ROOT_TMath
  3913.  #include "TMath.h"
  3914.  #endif
  3915.  // #endif
  3916.  
  3917.  #ifndef ROOT_TMVA_DecisionTree
  3918.  #include "TMVA/DecisionTree.h"
  3919.  #endif
  3920. -#ifndef ROOT_TMVA_Event
  3921.  #include "TMVA/Event.h"
  3922. -#endif
  3923.  #ifndef ROOT_TMVA_Rule
  3924.  #include "TMVA/Rule.h"
  3925.  #endif
  3926.  #ifndef ROOT_TMVA_Types
  3927.  #include "TMVA/Types.h"
  3928.  #endif
  3929.  
  3930.  class TH1F;
  3931.  
  3932.  namespace TMVA {
  3933. diff --git a/tmva/tmva/inc/TMVA/RuleFit.h b/tmva/tmva/inc/TMVA/RuleFit.h
  3934. index f3b8f492e6..7580e897f2 100644
  3935. --- a/tmva/tmva/inc/TMVA/RuleFit.h
  3936. +++ b/tmva/tmva/inc/TMVA/RuleFit.h
  3937. @@ -31,23 +31,21 @@
  3938.  
  3939.  #ifndef ROOT_TMVA_DecisionTree
  3940.  #include "TMVA/DecisionTree.h"
  3941.  #endif
  3942.  #ifndef ROOT_TMVA_RuleEnsemble
  3943.  #include "TMVA/RuleEnsemble.h"
  3944.  #endif
  3945.  #ifndef ROOT_TMVA_RuleFitParams
  3946.  #include "TMVA/RuleFitParams.h"
  3947.  #endif
  3948. -#ifndef ROOT_TMVA_Event
  3949.  #include "TMVA/Event.h"
  3950. -#endif
  3951.  
  3952.  namespace TMVA {
  3953.  
  3954.  
  3955.     class MethodBase;
  3956.     class MethodRuleFit;
  3957.     class MsgLogger;
  3958.  
  3959.     class RuleFit {
  3960.  
  3961. diff --git a/tmva/tmva/inc/TMVA/RuleFitParams.h b/tmva/tmva/inc/TMVA/RuleFitParams.h
  3962. index cea0bd1fcd..17459388f9 100644
  3963. --- a/tmva/tmva/inc/TMVA/RuleFitParams.h
  3964. +++ b/tmva/tmva/inc/TMVA/RuleFitParams.h
  3965. @@ -36,23 +36,21 @@
  3966.  // #if ROOT_VERSION_CODE >= 364802
  3967.  #ifndef ROOT_TMathBase
  3968.  #include "TMathBase.h"
  3969.  #endif
  3970.  // #else
  3971.  // #ifndef ROOT_TMath
  3972.  // #include "TMath.h"
  3973.  // #endif
  3974.  // #endif
  3975.  
  3976. -#ifndef ROOT_TMVA_Event
  3977.  #include "TMVA/Event.h"
  3978. -#endif
  3979.  
  3980.  class TTree;
  3981.  
  3982.  namespace TMVA {
  3983.  
  3984.     class RuleEnsemble;
  3985.     class MsgLogger;
  3986.     class RuleFit;
  3987.     class RuleFitParams {
  3988.  
  3989. diff --git a/tmva/tmva/inc/TMVA/TNeuron.h b/tmva/tmva/inc/TMVA/TNeuron.h
  3990. index f3283be56d..a4313986a0 100644
  3991. --- a/tmva/tmva/inc/TMVA/TNeuron.h
  3992. +++ b/tmva/tmva/inc/TMVA/TNeuron.h
  3993. @@ -37,23 +37,21 @@
  3994.  #ifndef ROOT_TString
  3995.  #include "TString.h"
  3996.  #endif
  3997.  #ifndef ROOT_TObjArray
  3998.  #include "TObjArray.h"
  3999.  #endif
  4000.  #ifndef ROOT_TFormula
  4001.  #include "TFormula.h"
  4002.  #endif
  4003.  
  4004. -#ifndef ROOT_TMVA_TSynapse
  4005.  #include "TMVA/TSynapse.h"
  4006. -#endif
  4007.  #ifndef ROOT_TMVA_TActivation
  4008.  #include "TMVA/TActivation.h"
  4009.  #endif
  4010.  #ifndef ROOT_TMVA_Types
  4011.  #include "TMVA/Types.h"
  4012.  #endif
  4013.  
  4014.  namespace TMVA {
  4015.  
  4016.     class TNeuronInput;
  4017. diff --git a/tmva/tmva/inc/TMVA/TNeuronInputAbs.h b/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
  4018. index 64783d20e6..dcf9411ab3 100644
  4019. --- a/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
  4020. +++ b/tmva/tmva/inc/TMVA/TNeuronInputAbs.h
  4021. @@ -54,23 +54,21 @@
  4022.  #include "TObject.h"
  4023.  #endif
  4024.  #ifndef ROOT_TString
  4025.  #include "TString.h"
  4026.  #endif
  4027.  
  4028.  #ifndef ROOT_TMVA_TNeuronInput
  4029.  #include "TMVA/TNeuronInput.h"
  4030.  #endif
  4031.  
  4032. -#ifndef ROOT_TMVA_TNeuron
  4033.  #include "TMVA/TNeuron.h"
  4034. -#endif
  4035.  
  4036.  namespace TMVA {
  4037.    
  4038.     class TNeuronInputAbs : public TNeuronInput {
  4039.      
  4040.     public:
  4041.  
  4042.        TNeuronInputAbs() {}
  4043.        virtual ~TNeuronInputAbs() {}
  4044.  
  4045. diff --git a/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h b/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
  4046. index d56d8abbc8..1fe3f7cfec 100644
  4047. --- a/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
  4048. +++ b/tmva/tmva/inc/TMVA/TNeuronInputSqSum.h
  4049. @@ -38,23 +38,21 @@
  4050.  #ifndef ROOT_TObject
  4051.  #include "TObject.h"
  4052.  #endif
  4053.  #ifndef ROOT_TString
  4054.  #include "TString.h"
  4055.  #endif
  4056.  
  4057.  #ifndef ROOT_TMVA_TNeuronInput
  4058.  #include "TMVA/TNeuronInput.h"
  4059.  #endif
  4060. -#ifndef ROOT_TMVA_TNeuron
  4061.  #include "TMVA/TNeuron.h"
  4062. -#endif
  4063.  
  4064.  namespace TMVA {
  4065.    
  4066.     class TNeuronInputSqSum : public TNeuronInput {
  4067.      
  4068.     public:
  4069.  
  4070.        TNeuronInputSqSum() {}
  4071.        virtual ~TNeuronInputSqSum() {}
  4072.  
  4073. diff --git a/tmva/tmva/inc/TMVA/TNeuronInputSum.h b/tmva/tmva/inc/TMVA/TNeuronInputSum.h
  4074. index 318d75612c..f3f4b812ea 100644
  4075. --- a/tmva/tmva/inc/TMVA/TNeuronInputSum.h
  4076. +++ b/tmva/tmva/inc/TMVA/TNeuronInputSum.h
  4077. @@ -36,23 +36,21 @@
  4078.  #ifndef ROOT_TObject
  4079.  #include "TObject.h"
  4080.  #endif
  4081.  #ifndef ROOT_TString
  4082.  #include "TString.h"
  4083.  #endif
  4084.  
  4085.  #ifndef ROOT_TMVA_TNeuronInput
  4086.  #include "TMVA/TNeuronInput.h"
  4087.  #endif
  4088. -#ifndef ROOT_TMVA_TNeuron
  4089.  #include "TMVA/TNeuron.h"
  4090. -#endif
  4091.  
  4092.  namespace TMVA {
  4093.  
  4094.     class TNeuronInputSum : public TNeuronInput {
  4095.      
  4096.     public:
  4097.  
  4098.        TNeuronInputSum() {}
  4099.        virtual ~TNeuronInputSum() {}
  4100.  
  4101. diff --git a/tmva/tmva/inc/TMVA/VariableImportance.h b/tmva/tmva/inc/TMVA/VariableImportance.h
  4102. index a964c7dcd4..94f97fbbcc 100644
  4103. --- a/tmva/tmva/inc/TMVA/VariableImportance.h
  4104. +++ b/tmva/tmva/inc/TMVA/VariableImportance.h
  4105. @@ -11,23 +11,21 @@
  4106.  #endif
  4107.  
  4108.  
  4109.  #ifndef ROOT_TMVA_Configurable
  4110.  #include "TMVA/Configurable.h"
  4111.  #endif
  4112.  #ifndef ROOT_TMVA_Types
  4113.  #include "TMVA/Types.h"
  4114.  #endif
  4115.  
  4116. -#ifndef ROOT_TMVA_Factory
  4117. -#include<TMVA/Factory.h>
  4118. -#endif
  4119. +#include <TMVA/Factory.h>
  4120.  
  4121.  #ifndef ROOT_TMVA_DataLoader
  4122.  #include<TMVA/DataLoader.h>
  4123.  #endif
  4124.  
  4125.  #ifndef ROOT_TMVA_OptionMap
  4126.  #include<TMVA/OptionMap.h>
  4127.  #endif
  4128.  
  4129.  #ifndef ROOT_TMVA_Envelope
  4130. diff --git a/tmva/tmva/inc/TMVA/VariableTransformBase.h b/tmva/tmva/inc/TMVA/VariableTransformBase.h
  4131. index 63d43dcced..2fdd2aeda8 100644
  4132. --- a/tmva/tmva/inc/TMVA/VariableTransformBase.h
  4133. +++ b/tmva/tmva/inc/TMVA/VariableTransformBase.h
  4134. @@ -45,23 +45,21 @@
  4135.  #ifndef ROOT_TDirectory
  4136.  #include "TDirectory.h"
  4137.  #endif
  4138.  #ifndef ROOT_TString
  4139.  #include "TString.h"
  4140.  #endif
  4141.  
  4142.  #ifndef ROOT_TMVA_Types
  4143.  #include "TMVA/Types.h"
  4144.  #endif
  4145. -#ifndef ROOT_TMVA_Event
  4146.  #include "TMVA/Event.h"
  4147. -#endif
  4148.  #ifndef ROOT_TMVA_VariableInfo
  4149.  #include "TMVA/VariableInfo.h"
  4150.  #endif
  4151.  #ifndef ROOT_TMVA_DataSetInfo
  4152.  #include "TMVA/DataSetInfo.h"
  4153.  #endif
  4154.  
  4155.  namespace TMVA {
  4156.  
  4157.     class VariableTransformBase : public TObject {
  4158. diff --git a/tmva/tmva/src/BinarySearchTree.cxx b/tmva/tmva/src/BinarySearchTree.cxx
  4159. index 88ea60065e..914d652fb1 100644
  4160. --- a/tmva/tmva/src/BinarySearchTree.cxx
  4161. +++ b/tmva/tmva/src/BinarySearchTree.cxx
  4162. @@ -56,23 +56,21 @@ A simple Binary search tree including a volume search method.
  4163.  
  4164.  #ifndef ROOT_TMVA_MsgLogger
  4165.  #include "TMVA/MsgLogger.h"
  4166.  #endif
  4167.  #ifndef ROOT_TMVA_MethodBase
  4168.  #include "TMVA/MethodBase.h"
  4169.  #endif
  4170.  #ifndef ROOT_TMVA_Tools
  4171.  #include "TMVA/Tools.h"
  4172.  #endif
  4173. -#ifndef ROOT_TMVA_Event
  4174.  #include "TMVA/Event.h"
  4175. -#endif
  4176.  #ifndef ROOT_TMVA_BinarySearchTree
  4177.  #include "TMVA/BinarySearchTree.h"
  4178.  #endif
  4179.  
  4180.  #include "TMVA/BinaryTree.h"
  4181.  #include "TMVA/Types.h"
  4182.  #include "TMVA/Node.h"
  4183.  
  4184.  ClassImp(TMVA::BinarySearchTree)
  4185.  
  4186. diff --git a/tmva/tmva/src/ClassInfo.cxx b/tmva/tmva/src/ClassInfo.cxx
  4187. index 291265fed5..0931dbed99 100644
  4188. --- a/tmva/tmva/src/ClassInfo.cxx
  4189. +++ b/tmva/tmva/src/ClassInfo.cxx
  4190. @@ -32,23 +32,21 @@ Class that contains all the information of a class.
  4191.  
  4192.  */
  4193.  
  4194.  #include "TMVA/ClassInfo.h"
  4195.  
  4196.  #include <vector>
  4197.  
  4198.  #ifndef ROOT_TCut
  4199.  #include "TCut.h"
  4200.  #endif
  4201. -#ifndef ROOT_TMatrix
  4202.  #include "TMatrixD.h"
  4203. -#endif
  4204.  
  4205.  #include "TMVA/MsgLogger.h"
  4206.  #include "TMVA/Types.h"
  4207.  
  4208.  ////////////////////////////////////////////////////////////////////////////////
  4209.  /// constructor
  4210.  
  4211.  TMVA::ClassInfo::ClassInfo( const TString& name )
  4212.      : TNamed(name.Data(),name.Data()),
  4213.       fWeight( "" ),
  4214. diff --git a/tmva/tmva/src/DataSet.cxx b/tmva/tmva/src/DataSet.cxx
  4215. index f1064598fb..9fbbde08dd 100644
  4216. --- a/tmva/tmva/src/DataSet.cxx
  4217. +++ b/tmva/tmva/src/DataSet.cxx
  4218. @@ -36,23 +36,21 @@ Class that contains all the data information
  4219.  #include <cstdlib>
  4220.  #include <stdexcept>
  4221.  #include <algorithm>
  4222.  
  4223.  #ifndef ROOT_TMVA_DataSetInfo
  4224.  #include "TMVA/DataSetInfo.h"
  4225.  #endif
  4226.  #ifndef ROOT_TMVA_DataSet
  4227.  #include "TMVA/DataSet.h"
  4228.  #endif
  4229. -#ifndef ROOT_TMVA_Event
  4230.  #include "TMVA/Event.h"
  4231. -#endif
  4232.  #ifndef ROOT_TMVA_MsgLogger
  4233.  #include "TMVA/MsgLogger.h"
  4234.  #endif
  4235.  #ifndef ROOT_TMVA_ResultsRegression
  4236.  #include "TMVA/ResultsRegression.h"
  4237.  #endif
  4238.  #ifndef ROOT_TMVA_ResultsClassification
  4239.  #include "TMVA/ResultsClassification.h"
  4240.  #endif
  4241.  #ifndef ROOT_TMVA_ResultsMulticlass
  4242. diff --git a/tmva/tmva/src/DataSetFactory.cxx b/tmva/tmva/src/DataSetFactory.cxx
  4243. index f80acf0fc8..72d3a997c9 100644
  4244. --- a/tmva/tmva/src/DataSetFactory.cxx
  4245. +++ b/tmva/tmva/src/DataSetFactory.cxx
  4246. @@ -74,23 +74,21 @@ Class that contains all the data information
  4247.  #endif
  4248.  #ifndef ROOT_TMVA_DataSet
  4249.  #include "TMVA/DataSet.h"
  4250.  #endif
  4251.  #ifndef ROOT_TMVA_DataSetInfo
  4252.  #include "TMVA/DataSetInfo.h"
  4253.  #endif
  4254.  #ifndef ROOT_TMVA_DataInputHandler
  4255.  #include "TMVA/DataInputHandler.h"
  4256.  #endif
  4257. -#ifndef ROOT_TMVA_Event
  4258.  #include "TMVA/Event.h"
  4259. -#endif
  4260.  
  4261.  #include "TMVA/Types.h"
  4262.  #include "TMVA/VariableInfo.h"
  4263.  
  4264.  using namespace std;
  4265.  
  4266.  //TMVA::DataSetFactory* TMVA::DataSetFactory::fgInstance = 0;
  4267.  
  4268.  namespace TMVA {
  4269.     // calculate the largest common divider
  4270. diff --git a/tmva/tmva/src/DataSetInfo.cxx b/tmva/tmva/src/DataSetInfo.cxx
  4271. index cc6eb8e09a..7e5df187cb 100644
  4272. --- a/tmva/tmva/src/DataSetInfo.cxx
  4273. +++ b/tmva/tmva/src/DataSetInfo.cxx
  4274. @@ -53,23 +53,21 @@ Class that contains all the data information.
  4275.  #endif
  4276.  #ifndef ROOT_TMVA_DataSet
  4277.  #include "TMVA/DataSet.h"
  4278.  #endif
  4279.  #ifndef ROOT_TMVA_DataSetInfo
  4280.  #include "TMVA/DataSetInfo.h"
  4281.  #endif
  4282.  #ifndef ROOT_TMVA_DataSetManager
  4283.  #include "TMVA/DataSetManager.h"
  4284.  #endif
  4285. -#ifndef ROOT_TMVA_Event
  4286.  #include "TMVA/Event.h"
  4287. -#endif
  4288.  
  4289.  #include "TMVA/Types.h"
  4290.  #include "TMVA/VariableInfo.h"
  4291.  
  4292.  ////////////////////////////////////////////////////////////////////////////////
  4293.  /// constructor
  4294.  
  4295.  TMVA::DataSetInfo::DataSetInfo(const TString& name)
  4296.     : TObject(),
  4297.       fDataSetManager(NULL),
  4298. diff --git a/tmva/tmva/src/ROCCalc.cxx b/tmva/tmva/src/ROCCalc.cxx
  4299. index 50a3f9a1eb..ed72539256 100644
  4300. --- a/tmva/tmva/src/ROCCalc.cxx
  4301. +++ b/tmva/tmva/src/ROCCalc.cxx
  4302. @@ -30,23 +30,21 @@
  4303.  
  4304.  #ifndef ROOT_TMVA_Tools
  4305.  #include "TMVA/Tools.h"
  4306.  #endif
  4307.  #ifndef ROOT_TMVA_ROCCalc
  4308.  #include "TMVA/ROCCalc.h"
  4309.  #endif
  4310.  #ifndef ROOT_TMVA_Config
  4311.  #include "TMVA/Config.h"
  4312.  #endif
  4313. -#ifndef ROOT_TMVA_Event
  4314.  #include "TMVA/Event.h"
  4315. -#endif
  4316.  #ifndef ROOT_TMVA_Version
  4317.  #include "TMVA/Version.h"
  4318.  #endif
  4319.  #ifndef ROOT_TMVA_PDF
  4320.  #include "TMVA/PDF.h"
  4321.  #endif
  4322.  #ifndef ROOT_TMVA_MsgLogger
  4323.  #include "TMVA/MsgLogger.h"
  4324.  #endif
  4325.  
  4326. diff --git a/tmva/tmva/src/TSynapse.cxx b/tmva/tmva/src/TSynapse.cxx
  4327. index 6e7c939740..c73770da79 100644
  4328. --- a/tmva/tmva/src/TSynapse.cxx
  4329. +++ b/tmva/tmva/src/TSynapse.cxx
  4330. @@ -21,23 +21,21 @@
  4331.   * (http://tmva.sourceforge.net/LICENSE)                                          *
  4332.   **********************************************************************************/
  4333.  
  4334.  /*! \class TMVA::TSynapse
  4335.  \ingroup TMVA
  4336.  Synapse class used by TMVA artificial neural network methods
  4337.  */
  4338.  
  4339.  #include "TMVA/TSynapse.h"
  4340.  
  4341. -#ifndef ROOT_TMVA_TNeuron
  4342.  #include "TMVA/TNeuron.h"
  4343. -#endif
  4344.  
  4345.  #ifndef ROOT_TMVA_MsgLogger
  4346.  #include "TMVA/MsgLogger.h"
  4347.  #endif
  4348.  
  4349.  #include "TMVA/Types.h"
  4350.  
  4351.  #include "ThreadLocalStorage.h"
  4352.  #include "TObject.h"
  4353.  
  4354. diff --git a/tmva/tmva/src/Tools.cxx b/tmva/tmva/src/Tools.cxx
  4355. index 85f9bee155..df2ae6ca16 100644
  4356. --- a/tmva/tmva/src/Tools.cxx
  4357. +++ b/tmva/tmva/src/Tools.cxx
  4358. @@ -31,23 +31,21 @@
  4359.  /*! \class TMVA::Tools
  4360.  \ingroup TMVA
  4361.  Global auxiliary applications and data treatment routines.
  4362.  */
  4363.  
  4364.  #include "TMVA/Tools.h"
  4365.  
  4366.  #ifndef ROOT_TMVA_Config
  4367.  #include "TMVA/Config.h"
  4368.  #endif
  4369. -#ifndef ROOT_TMVA_Event
  4370.  #include "TMVA/Event.h"
  4371. -#endif
  4372.  #ifndef ROOT_TMVA_Version
  4373.  #include "TMVA/Version.h"
  4374.  #endif
  4375.  #ifndef ROOT_TMVA_PDF
  4376.  #include "TMVA/PDF.h"
  4377.  #endif
  4378.  #ifndef ROOT_TMVA_MsgLogger
  4379.  #include "TMVA/MsgLogger.h"
  4380.  #endif
  4381.  #include "TMVA/Types.h"
  4382. diff --git a/tree/treeplayer/inc/TTreeFormula.h b/tree/treeplayer/inc/TTreeFormula.h
  4383. index 81c48a626a..e239853a54 100644
  4384. --- a/tree/treeplayer/inc/TTreeFormula.h
  4385. +++ b/tree/treeplayer/inc/TTreeFormula.h
  4386. @@ -16,23 +16,21 @@
  4387.  
  4388.  
  4389.  //////////////////////////////////////////////////////////////////////////
  4390.  //                                                                      //
  4391.  // TTreeFormula                                                         //
  4392.  //                                                                      //
  4393.  // The Tree formula class                                               //
  4394.  //                                                                      //
  4395.  //////////////////////////////////////////////////////////////////////////
  4396.  
  4397. -#ifndef ROOT_v5_TFormula
  4398.  #include "v5/TFormula.h"
  4399. -#endif
  4400.  
  4401.  #ifndef ROOT_TLeaf
  4402.  #include "TLeaf.h"
  4403.  #endif
  4404.  
  4405.  #ifndef ROOT_TObjArray
  4406.  #include "TObjArray.h"
  4407.  #endif
  4408.  
  4409.  #include <string>
  4410. diff --git a/tree/treeplayer/inc/TTreeGeneratorBase.h b/tree/treeplayer/inc/TTreeGeneratorBase.h
  4411. index ea8cee226b..12212ce87d 100644
  4412. --- a/tree/treeplayer/inc/TTreeGeneratorBase.h
  4413. +++ b/tree/treeplayer/inc/TTreeGeneratorBase.h
  4414. @@ -14,23 +14,21 @@
  4415.  
  4416.  //////////////////////////////////////////////////////////////////////////
  4417.  //                                                                      //
  4418.  // TTreeGeneratorBase                                                   //
  4419.  //                                                                      //
  4420.  // Base class for code generators like TTreeProxyGenerator and          //
  4421.  // TTreeReaderGenerator                                                 //
  4422.  //                                                                      //
  4423.  //////////////////////////////////////////////////////////////////////////
  4424.  
  4425. -#ifndef ROOT_Tlist
  4426.  #include "TList.h"
  4427. -#endif
  4428.  #ifndef ROOT_TString
  4429.  #include "TString.h"
  4430.  #endif
  4431.  
  4432.  class TBranch;
  4433.  class TBranchElement;
  4434.  class TClass;
  4435.  class TStreamerElement;
  4436.  class TTree;
  4437.  class TVirtualStreamerInfo;
  4438. diff --git a/tree/treeviewer/inc/TSpider.h b/tree/treeviewer/inc/TSpider.h
  4439. index 8af121641c..5fad85d37e 100644
  4440. --- a/tree/treeviewer/inc/TSpider.h
  4441. +++ b/tree/treeviewer/inc/TSpider.h
  4442. @@ -14,23 +14,21 @@
  4443.  
  4444.  //////////////////////////////////////////////////////////////////////////
  4445.  //                                                                      //
  4446.  // TSpider                                                              //
  4447.  //                                                                      //
  4448.  // TSpider is a manager used to paint a spider view                     //
  4449.  // of the events of a TNtuple.                                          //
  4450.  //                                                                      //
  4451.  //////////////////////////////////////////////////////////////////////////
  4452.  
  4453. -#ifndef ROOT_Object
  4454.  #include "TObject.h"
  4455. -#endif
  4456.  
  4457.  #ifndef ROOT_TAttFill
  4458.  #include "TAttFill.h"
  4459.  #endif
  4460.  
  4461.  #ifndef ROOT_TAttLine
  4462.  #include "TAttLine.h"
  4463.  #endif
  4464.  
  4465.  #ifndef ROOT_TAttText
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!