diff --git a/eve/inc/TEveElement.h b/eve/inc/TEveElement.h
index 0ec972af1ebdd99701f121f64f9a68f75daed880..ba13ce965ad8f6a1d77462b984f2da205d177100 100644
--- a/eve/inc/TEveElement.h
+++ b/eve/inc/TEveElement.h
@@ -195,7 +195,7 @@ public:
    virtual TEveTrans* PtrMainHMTrans()     { return 0; }
 
    static  const TGPicture* GetCheckBoxPicture(Bool_t rnrElement, Bool_t rnrDaughter);
-   virtual const TGPicture* GetListTreeIcon() { return fgListTreeIcons[0]; }
+   virtual const TGPicture* GetListTreeIcon();
 
    ClassDef(TEveElement, 1); // Base class for TEveUtil visualization elements, providing hierarchy management, rendering control and list-tree item management.
 };
diff --git a/eve/inc/TEveTrack.h b/eve/inc/TEveTrack.h
index 363e3c5b600270afc203bacd08e4335477d31ea7..32f05d0ff687cfbff66ee4f330fb43442aa7b82c 100644
--- a/eve/inc/TEveTrack.h
+++ b/eve/inc/TEveTrack.h
@@ -96,7 +96,7 @@ public:
    virtual void CtrlClicked(TEveTrack*); // *SIGNAL*
    virtual void SetLineStyle(Style_t lstyle);
 
-   virtual const TGPicture* GetListTreeIcon() { return fgListTreeIcons[4]; };
+   virtual const TGPicture* GetListTreeIcon();
 
    virtual TClass* ProjectedClass() const;
 
diff --git a/eve/src/TEveElement.cxx b/eve/src/TEveElement.cxx
index 7f7d011c83dd0288c61ee1e0ba53b093b79b1e96..268de16da9004960f5e14524a662e37b8609a8fb 100644
--- a/eve/src/TEveElement.cxx
+++ b/eve/src/TEveElement.cxx
@@ -782,6 +782,15 @@ TEveElement::GetCheckBoxPicture(Bool_t rnrSelf, Bool_t rnrDaughters)
    return fgRnrIcons[idx];
 }
 
+//______________________________________________________________________________
+const TGPicture*
+TEveElement::GetListTreeIcon()
+{
+   // Returns pointer to first listtreeicon
+   
+   return fgListTreeIcons[0];
+}
+
 
 //______________________________________________________________________________
 // TEveElementObjectPtr
diff --git a/eve/src/TEveTrack.cxx b/eve/src/TEveTrack.cxx
index 4c3775d50db6a4f701b8299d0bedab1e7ca07bca..fb4a1de44747cc9576c795f38a7be74401d266d6 100644
--- a/eve/src/TEveTrack.cxx
+++ b/eve/src/TEveTrack.cxx
@@ -173,6 +173,17 @@ TEveTrack::~TEveTrack()
       delete *i;
 }
 
+
+//______________________________________________________________________________
+const TGPicture*
+TEveTrack::GetListTreeIcon()
+{
+   // Returns pointer to listtree track icon
+   
+   return fgListTreeIcons[4];
+}
+
+
 /******************************************************************************/
 
 //______________________________________________________________________________
diff --git a/fitpanel/inc/TFitEditor.h b/fitpanel/inc/TFitEditor.h
index 916bbb36adf1bb96a2ac0de41c3592584053d5ba..dac6526583857ba222fb3516cb7b56509aaed33f 100644
--- a/fitpanel/inc/TFitEditor.h
+++ b/fitpanel/inc/TFitEditor.h
@@ -162,7 +162,7 @@ public:
    TFitEditor(TVirtualPad* pad, TObject *obj);
    virtual ~TFitEditor();
 
-   static TFitEditor *&GetFP() { return fgFitDialog; }
+   static TFitEditor *&GetFP();
    static  void       Open(TVirtualPad* pad, TObject *obj);
    virtual Option_t  *GetDrawOption() const;
    virtual void       Hide();
diff --git a/fitpanel/src/TFitEditor.cxx b/fitpanel/src/TFitEditor.cxx
index 41a02a011b1711461e97762198c2ff94d433f14e..591d27aba42d06757724ff38c2d663c62565dcc3 100644
--- a/fitpanel/src/TFitEditor.cxx
+++ b/fitpanel/src/TFitEditor.cxx
@@ -971,6 +971,7 @@ void TFitEditor::Show(TVirtualPad* pad, TObject *obj)
    SetCanvas(pad->GetCanvas());
    fCanvas->Selected(pad, obj, kButton1Down);
 }
+
 //______________________________________________________________________________
 void TFitEditor::CloseWindow()
 {
@@ -979,6 +980,14 @@ void TFitEditor::CloseWindow()
    Hide();
 }
 
+//______________________________________________________________________________
+TFitEditor *&TFitEditor::GetFP()
+{
+   // Static: return main fit panel
+
+   return fgFitDialog;
+}
+
 //______________________________________________________________________________
 void TFitEditor::Terminate()
 {
diff --git a/ged/inc/TStyleManager.h b/ged/inc/TStyleManager.h
index c3321b678a67948e3cac1f8ab6d917b8deb85ec1..75cfa6959960ebd42f889abe85c9bbde334d75ce 100644
--- a/ged/inc/TStyleManager.h
+++ b/ged/inc/TStyleManager.h
@@ -458,7 +458,7 @@ public:
 
    static void Show();
    static void Terminate();
-   static TStyleManager *&GetSM() { return fgStyleManager; }
+   static TStyleManager *&GetSM();
 
    void Init();
    void Hide();
diff --git a/ged/src/TStyleManager.cxx b/ged/src/TStyleManager.cxx
index b9394fe055678efbd105556534e25abfcc86f818..c8ddfc4c2d57b5010b40f72a2fd27636215a24cb 100644
--- a/ged/src/TStyleManager.cxx
+++ b/ged/src/TStyleManager.cxx
@@ -751,6 +751,13 @@ TStyleManager::~TStyleManager()
    fgStyleManager = 0;
 }
 
+//______________________________________________________________________________
+TStyleManager *&TStyleManager::GetSM()
+{
+   //static: return style manager
+   return fgStyleManager; 
+}
+
 //______________________________________________________________________________
 void TStyleManager::Init()
 {
diff --git a/geombuilder/inc/TGeoTabManager.h b/geombuilder/inc/TGeoTabManager.h
index 889a3525975a97573e84c1863e7a96b74cee205a..b9ba2cfe57830ba6f21478833bd12bf40a9d8b7f 100644
--- a/geombuilder/inc/TGeoTabManager.h
+++ b/geombuilder/inc/TGeoTabManager.h
@@ -117,7 +117,7 @@ public:
    TGeoTreeDialog(TGFrame *caller, const TGWindow *main, UInt_t w = 1, UInt_t h = 1);
    virtual ~TGeoTreeDialog();
    
-   static TObject     *GetSelected() {return fgSelectedObj;}
+   static TObject     *GetSelected();
    // Slots
    virtual void        DoClose() = 0;
    virtual void        DoItemClick(TGListTreeItem *item, Int_t btn) = 0;
diff --git a/geombuilder/src/TGeoTabManager.cxx b/geombuilder/src/TGeoTabManager.cxx
index 26c2a4490f54095ab82bca7c1e84b89e88fbf40e..e21cede3c70fdab864f05f4f7843ee603172bd9b 100644
--- a/geombuilder/src/TGeoTabManager.cxx
+++ b/geombuilder/src/TGeoTabManager.cxx
@@ -259,6 +259,13 @@ ClassImp(TGeoTreeDialog)
 
 TObject *TGeoTreeDialog::fgSelectedObj = 0;
 
+//______________________________________________________________________________
+TObject *TGeoTreeDialog::GetSelected() 
+{
+   //static; return selected object
+   return fgSelectedObj;
+}
+
 //______________________________________________________________________________
 TGeoTreeDialog::TGeoTreeDialog(TGFrame *caller, const TGWindow *main, UInt_t w, UInt_t h)
                :TGTransientFrame(main, main, w, h)
diff --git a/gl/inc/TGLSelectBuffer.h b/gl/inc/TGLSelectBuffer.h
index cd39ec3f9cb22cc76aba4a368f32fef34adc6f8e..566066f224a098cad6eea9716d4630a47bdcae19 100644
--- a/gl/inc/TGLSelectBuffer.h
+++ b/gl/inc/TGLSelectBuffer.h
@@ -45,7 +45,7 @@ public:
    UInt_t* GetBuf()      const { return fBuf; }
    Int_t   GetNRecords() const { return fNRecords; }
 
-   Bool_t CanGrow() { return fBufSize < fgMaxBufSize; }
+   Bool_t CanGrow();
    void   Grow();
 
    void ProcessResult(Int_t glResult);
diff --git a/gl/inc/TGLUtil.h b/gl/inc/TGLUtil.h
index f6152d217181babdd4fed2c4dd6550d546fe2928..5bb00487df60bad8fe91901f1c6cc67ac32ac08a 100644
--- a/gl/inc/TGLUtil.h
+++ b/gl/inc/TGLUtil.h
@@ -919,14 +919,14 @@ public:
    enum ELineHeadShape { kLineHeadNone, kLineHeadArrow, kLineHeadBox };
    enum EAxesType      { kAxesNone, kAxesEdge, kAxesOrigin };
 
-   static void   SetDrawQuality(UInt_t dq)        { fgDrawQuality = dq; }
-   static void   ResetDrawQuality()               { fgDrawQuality = fgDefaultDrawQuality; }
-   static UInt_t GetDefaultDrawQuality()          { return fgDefaultDrawQuality; }
-   static void   SetDefaultDrawQuality(UInt_t dq) { fgDefaultDrawQuality = dq; }
+   static void   SetDrawQuality(UInt_t dq);
+   static void   ResetDrawQuality();
+   static UInt_t GetDefaultDrawQuality();
+   static void   SetDefaultDrawQuality(UInt_t dq);
 
    static UInt_t LockColor();
    static UInt_t UnlockColor();
-   static Bool_t IsColorLocked() { return fgColorLockCount != 0; }
+   static Bool_t IsColorLocked();
 
    static void Color(Color_t color_index, Float_t alpha=1);
    static void Color3ub(UChar_t r, UChar_t g, UChar_t b);
diff --git a/gl/src/TGLSelectBuffer.cxx b/gl/src/TGLSelectBuffer.cxx
index 85b23edf31ae2a420425ad8683350fc892e660ad..c8ca4e10a8a317807058b36d0d02579e8089f2b5 100644
--- a/gl/src/TGLSelectBuffer.cxx
+++ b/gl/src/TGLSelectBuffer.cxx
@@ -40,6 +40,13 @@ TGLSelectBuffer::~TGLSelectBuffer()
    delete [] fBuf;
 }
 
+//______________________________________________________________________________
+Bool_t TGLSelectBuffer::CanGrow()
+{
+   //static: return true if current buffer is smaller than the max buffer size
+   return fBufSize < fgMaxBufSize;
+}
+
 //______________________________________________________________________________
 void TGLSelectBuffer::Grow()
 {
diff --git a/gl/src/TGLUtil.cxx b/gl/src/TGLUtil.cxx
index 2183de1ec5039a015f00dec52b4eb303fe98361c..0d81a71f2c9cef7beb50e1262a7aec9b7f5f44eb 100644
--- a/gl/src/TGLUtil.cxx
+++ b/gl/src/TGLUtil.cxx
@@ -975,6 +975,42 @@ UInt_t TGLUtil::fgDefaultDrawQuality = 60;
 UInt_t TGLUtil::fgDrawQuality        = fgDefaultDrawQuality;
 UInt_t TGLUtil::fgColorLockCount     = 0;
 
+
+//______________________________________________________________________________
+void   TGLUtil::SetDrawQuality(UInt_t dq) 
+{ 
+   //static: set draw quality
+   fgDrawQuality = dq; 
+}
+
+//______________________________________________________________________________
+void   TGLUtil::ResetDrawQuality()               
+{ 
+   //static: reset draw quality
+   fgDrawQuality = fgDefaultDrawQuality; 
+}
+
+//______________________________________________________________________________
+UInt_t TGLUtil::GetDefaultDrawQuality()          
+{ 
+   //static: get default draw quality
+   return fgDefaultDrawQuality; 
+}
+
+//______________________________________________________________________________
+void   TGLUtil::SetDefaultDrawQuality(UInt_t dq) 
+{ 
+   //static: set default draw quality
+   fgDefaultDrawQuality = dq; 
+}
+
+//______________________________________________________________________________
+Bool_t   TGLUtil::IsColorLocked() 
+{ 
+   //static: return true if color lockcount is greater than 0
+   return fgColorLockCount != 0; 
+}
+
 //______________________________________________________________________________
 void TGLUtil::CheckError(const char * loc)
 {
diff --git a/table/inc/TDataSet.h b/table/inc/TDataSet.h
index 3cc5e9a3c38b899fdb654f5c385594be3b982d7c..b62a2ff97a2d957cce596e476815d53fd792cf9c 100644
--- a/table/inc/TDataSet.h
+++ b/table/inc/TDataSet.h
@@ -105,7 +105,7 @@ public:
    virtual TSeqCollection *GetCollection() const { return (TSeqCollection *)fList; }
    TList               *GetList()   const { return (TList *)fList; }
    virtual Int_t        GetListSize() const;
-   static  TDataSet    *GetMainSet(){ return fgMainSet;}
+   static  TDataSet    *GetMainSet();
    TObject             *GetMother() const { return (TObject*)GetParent();}
    virtual TObject     *GetObject() const;
    virtual TDataSet    *GetParent() const { return fParent;}
@@ -148,7 +148,6 @@ public:
 };
 
 inline void        TDataSet::Add(TDataSet *dataset){ AddLast(dataset); }
-inline void        TDataSet::AddMain(TDataSet *set){ if (fgMainSet && set) fgMainSet->AddFirst(set);}
 inline TDataSet   *TDataSet::At(Int_t idx) const {return fList ? (TDataSet *)fList->At(idx) : 0;  }
 inline Int_t       TDataSet::GetListSize() const {return (fList) ? fList->GetSize():0;}
 inline TDataSet   *TDataSet::instance() { return new TDataSet();}
diff --git a/table/inc/TDataSetIter.h b/table/inc/TDataSetIter.h
index a31c2aad3349af45a8afeda0a1847b35013c34d3..706441bb7f76c70c5346343c6e61dba231ecc86f 100644
--- a/table/inc/TDataSetIter.h
+++ b/table/inc/TDataSetIter.h
@@ -109,7 +109,5 @@ public:
   ClassDef(TDataSetIter,0) // class-iterator to navigate TDataSet structure
 };
 
-inline TDataSet *TDataSetIter::operator *() const { return fDataSet == fgNullDataSet ? fWorkingDataSet : fDataSet; }
-inline TDataSet *TDataSetIter::GetNullSet() { return (TDataSet *)fgNullDataSet; } // return a fake pointer == -1 casted to (TDataSet *)
 #endif
 
diff --git a/table/inc/TIndexTable.h b/table/inc/TIndexTable.h
index dddd0cb7e917b1875e7e4b7e014bfc5124648c52..ae18c73af4cac2b3d989d33d6f24f1c7461dd99b 100644
--- a/table/inc/TIndexTable.h
+++ b/table/inc/TIndexTable.h
@@ -69,8 +69,8 @@ protected:
 // define ClassDefTable(TIndexTable,int)
 protected:
    static TTableDescriptor *fgColDescriptors;
-   virtual TTableDescriptor *GetDescriptorPointer() const { return fgColDescriptors;}
-   virtual void SetDescriptorPointer(TTableDescriptor *list)  { fgColDescriptors = list;}
+   virtual TTableDescriptor *GetDescriptorPointer() const;
+   virtual void SetDescriptorPointer(TTableDescriptor *list);
 public:
    TIndexTable() : TTable("TIndexTable",sizeof(int))    {SetType("int");}
    TIndexTable(const Text_t *name) : TTable(name,sizeof(int)) {SetType("int");}
diff --git a/table/inc/TTableDescriptor.h b/table/inc/TTableDescriptor.h
index 4e1c71b0e0c57bbe10e87d237d07ea58f3b3e0a7..0db9ec275a549ba149d34b7935d5d4dd806d6d98 100644
--- a/table/inc/TTableDescriptor.h
+++ b/table/inc/TTableDescriptor.h
@@ -75,8 +75,8 @@ public:
 //    ClassDefTable(TTableDescriptor,tableDescriptor_st)
 protected:                                        
    static  TTableDescriptor *fgColDescriptors;     
-   virtual TTableDescriptor *GetDescriptorPointer() const     { return fgColDescriptors;}                 
-   virtual void SetDescriptorPointer(TTableDescriptor *list)  { fgColDescriptors = list;}                  
+   virtual TTableDescriptor *GetDescriptorPointer() const;
+   virtual void SetDescriptorPointer(TTableDescriptor *list);
 public:                                           
    typedef tableDescriptor_st* iterator;                   
    TTableDescriptor() : TTable("TTableDescriptor",sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}      
diff --git a/table/src/TDataSet.cxx b/table/src/TDataSet.cxx
index 8a0833eaa117a10a6c880b0a3ada2bc4b7b90298..c2f9fb23c3b045c0cb7f932123aef62ea6b3ae5f 100644
--- a/table/src/TDataSet.cxx
+++ b/table/src/TDataSet.cxx
@@ -389,6 +389,23 @@ TDataSet *TDataSet::First() const
    if (fList) return (TDataSet *)(fList->First());
    return 0;
 }
+
+//______________________________________________________________________________
+void TDataSet::AddMain(TDataSet *set)
+{
+   //add data set to main data set
+   
+   if (fgMainSet && set) fgMainSet->AddFirst(set);
+}
+
+//______________________________________________________________________________
+TDataSet *TDataSet::GetMainSet() 
+{
+   //return pointer to the main dataset
+   
+   return fgMainSet;
+}
+
 //______________________________________________________________________________
 TObject *TDataSet::GetObject() const
 {
diff --git a/table/src/TDataSetIter.cxx b/table/src/TDataSetIter.cxx
index f70ad0b18bf7f8d2204bd48432bb88eab8337535..540f5a17f7baa814d6108c5673b88306feadbcaa 100644
--- a/table/src/TDataSetIter.cxx
+++ b/table/src/TDataSetIter.cxx
@@ -92,6 +92,21 @@ TDataSetIter::~TDataSetIter()
    fDepth = 0;
 }
 
+
+//______________________________________________________________________________
+TDataSet *TDataSetIter::operator *() const 
+{ 
+   //operator *
+   return fDataSet == fgNullDataSet ? fWorkingDataSet : fDataSet; 
+}
+
+//______________________________________________________________________________
+TDataSet *TDataSetIter::GetNullSet() 
+{ 
+   // return a fake pointer == -1 casted to (TDataSet *)
+   return (TDataSet *)fgNullDataSet;  
+}
+
 //______________________________________________________________________________
 TDataSet *TDataSetIter::Add(TDataSet *set, TDataSet *dataset)
 {
diff --git a/table/src/TIndexTable.cxx b/table/src/TIndexTable.cxx
index a3ae9e99b7e2ce841d7d233945c82c380147e8f8..bc1efc71a0bda5dc70f9778f53366f7e0486fac2 100644
--- a/table/src/TIndexTable.cxx
+++ b/table/src/TIndexTable.cxx
@@ -106,6 +106,22 @@ TTableDescriptor *TIndexTable::CreateDescriptor()
    return fgColDescriptors;
 }
 
+//___________________________________________________________________
+TTableDescriptor *TIndexTable::GetDescriptorPointer() const 
+{ 
+   //return column descriptor
+   return fgColDescriptors;
+}
+
+//___________________________________________________________________
+void TIndexTable::SetDescriptorPointer(TTableDescriptor *list)  
+{ 
+   //set table descriptor
+   fgColDescriptors = list;
+}
+
+//___________________________________________________________________
+
 //___________________________________________________________________
 const TTable *TIndexTable::Table() const
 {
diff --git a/table/src/TTableDescriptor.cxx b/table/src/TTableDescriptor.cxx
index 555b32d7524169556c3f07b64512d7006cc98365..e92361494c35fcb0b0cc31a4a3e24dcc31686284 100644
--- a/table/src/TTableDescriptor.cxx
+++ b/table/src/TTableDescriptor.cxx
@@ -29,6 +29,21 @@ TTableDescriptor *TTableDescriptor::fgColDescriptors = 0;
 TString TTableDescriptor::fgCommentsName = ".comments";
 TableClassImp(TTableDescriptor,tableDescriptor_st)
 
+//___________________________________________________________________
+TTableDescriptor *TTableDescriptor::GetDescriptorPointer() const 
+{ 
+   //return column descriptor
+   return fgColDescriptors;
+}
+
+//___________________________________________________________________
+void TTableDescriptor::SetDescriptorPointer(TTableDescriptor *list)  
+{ 
+   //set table descriptor
+   fgColDescriptors = list;
+}
+
+
 //______________________________________________________________________________
 void TTableDescriptor::Streamer(TBuffer &R__b)
 {
diff --git a/vmc/inc/TVirtualMC.h b/vmc/inc/TVirtualMC.h
index 6827aedb83d3785e4280adbd8ae280881a8c8427..9d8119cc30395ee81b80c6bc320ddbc7365219f5 100644
--- a/vmc/inc/TVirtualMC.h
+++ b/vmc/inc/TVirtualMC.h
@@ -52,7 +52,7 @@ public:
    virtual ~TVirtualMC();
 
    // Static access method
-   static TVirtualMC* GetMC() { return fgMC; }
+   static TVirtualMC* GetMC();
 
    //
    // ------------------------------------------------
diff --git a/vmc/src/TVirtualMC.cxx b/vmc/src/TVirtualMC.cxx
index def7282aa27815f75b7e62b923b3485500483901..d76c1a62e38388ce2dabcdf91eeab29581d9f8ae 100644
--- a/vmc/src/TVirtualMC.cxx
+++ b/vmc/src/TVirtualMC.cxx
@@ -84,6 +84,14 @@ TVirtualMC::~TVirtualMC()
 //
 
 
+//_____________________________________________________________________________
+TVirtualMC *TVirtualMC::GetMC()
+{
+   //static: return virtual MC object
+   return fgMC;
+}
+
+
 //_____________________________________________________________________________
 void TVirtualMC::SetStack(TVirtualMCStack* stack)
 {