Remove unnecessary and bougus include.(ROOT-5123).

Author: CristinaCristescu

core/base/src/TROOT.cxx

@@ -113,10 +113,6 @@
 #include "TListOfFunctions.h"
 #include "TListOfFunctionTemplates.h"
 #include "TFunctionTemplate.h"
-#include "TGClient.h"
-#include "X3DBuffer.h"
-#include "TFile.h"
-#include "TVirtualGL.h"
 
 #include <string>
 namespace std {} using namespace std;

core/base/src/TVirtualGL.cxx

@@ -18,12 +18,24 @@
 
 #include "TVirtualGL.h"
 #include "TROOT.h"
+#include "TGlobal.h"
 
 
 ClassImp(TGLManager)
 
 TGLManager * (*gPtr2GLManager)() = 0;
 
+namespace {
+static struct AddPseudoGlobals {
+AddPseudoGlobals() {
+  // User "gCling" as synonym for "libCore static initialization has happened".
+   // This code here must not trigger it.
+   TGlobalMappedFunction::Add(new TGlobalMappedFunction("gGLManager", "TVirtualGL*",
+                                 (TGlobalMappedFunction::GlobalFunc_t)&gGLManager));
+}
+} gAddPseudoGlobals;
+}
+
 //____________________________________________________________________________
 TGLManager::TGLManager() : TNamed("gGLManager", "")
 {

gui/gui/src/TGClient.cxx

@@ -55,7 +55,9 @@ static TGClient *gClientGlobal = 0;
 namespace {
 static struct AddPseudoGlobals {
 AddPseudoGlobals() {
-  gROOT->GetListOfGlobals()->Add(new TGlobalMappedFunction("gClient", "TGClient*",
+   // User "gCling" as synonym for "libCore static initialization has happened".
+   // This code here must not trigger it.
+   TGlobalMappedFunction::Add(new TGlobalMappedFunction("gClient", "TGClient*",
                                  (TGlobalMappedFunction::GlobalFunc_t)&TGClient::Instance));
 }
 } gAddPseudoGlobals;