diff --git a/treeviewer/inc/TSessionViewer.h b/treeviewer/inc/TSessionViewer.h
index a0b995ad5817cb02d139433f0a8b9dff781b5aa7..6886b025c386c46ca6aab388171ae16072ab2e9e 100644
--- a/treeviewer/inc/TSessionViewer.h
+++ b/treeviewer/inc/TSessionViewer.h
@@ -13,7 +13,7 @@
 //                                                                      //
 // TSessionViewer                                                       //
 //                                                                      //
-// Widget used to manage Proof or local sessions, proof connections,    //
+// Widget used to manage PROOF or local sessions, PROOF connections,    //
 // queries construction and results handling.                           //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
@@ -84,14 +84,13 @@ class TCanvas;
 struct UserGroup_t;
 
 class TVirtualProof;
-class TProofServer;
 class TSessionViewer;
 class TSessionLogView;
 class TQueryResult;
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
-// TSessionViewer - A GUI for ROOT / Proof Sessions                     //
+// TSessionViewer - A GUI for ROOT / PROOF Sessions                     //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/treeviewer/src/TSessionViewer.cxx b/treeviewer/src/TSessionViewer.cxx
index 39292d9f807f38047fa15b73079122d42d02da5c..7afbb577c02834c63d4c2b6d9a6ed2cbae321777 100644
--- a/treeviewer/src/TSessionViewer.cxx
+++ b/treeviewer/src/TSessionViewer.cxx
@@ -13,12 +13,13 @@
 //                                                                      //
 // TSessionViewer                                                       //
 //                                                                      //
-// Widget used to manage Proof or local sessions, proof connections,    //
+// Widget used to manage PROOF or local sessions, PROOF connections,    //
 // queries construction and results handling.                           //
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
 #include "TApplication.h"
+#include "TSystem.h"
 #include "TGFileDialog.h"
 #include "TBrowser.h"
 #include "TGButton.h"
@@ -39,7 +40,7 @@
 #include "TGIcon.h"
 #include "TChain.h"
 #include "TDSet.h"
-#include "TProof.h"
+#include "TVirtualProof.h"
 #include "TRandom.h"
 #include "TSessionViewer.h"
 #include "TSessionLogView.h"
@@ -1462,14 +1463,14 @@ void TSessionFeedbackFrame::Build(TSessionViewer *gui)
    }
    fListBox->Resize(175, 80);
    fListBox->Select(1);
-   fListBox->Connect("Selected(Int_t)", "TSessionFeedbackFrame", this, 
+   fListBox->Connect("Selected(Int_t)", "TSessionFeedbackFrame", this,
                      "OnLBSelected(Int_t)");
 
    //Feedback
 
    fFeedbackChk = new TGCheckButton(frmFeed, "Feedback", 1);
    fFeedbackChk->SetState(kButtonDown);
-   fFeedbackChk->Connect("Toggled(Bool_t)", "TSessionViewer", fViewer, 
+   fFeedbackChk->Connect("Toggled(Bool_t)", "TSessionViewer", fViewer,
                          "OnFeedBackToggled(Bool_t)" );
    frmFeed->AddFrame(fFeedbackChk, new TGLayoutHints(kLHintsCenterY | kLHintsLeft,
                      15, 5, 2, 2));
@@ -1931,7 +1932,7 @@ TSessionViewer::~TSessionViewer()
 //______________________________________________________________________________
 void TSessionViewer::OnFeedBackToggled(Bool_t on)
 {
-   // If user wants to see feedback histos, automatically enable the filling 
+   // If user wants to see feedback histos, automatically enable the filling
    // of performance histograms by calling gEnv->SetValue("Proof.StatsHist",1)
    // and checking corresponding options menu entry
    if (on) {