Index: trunk/MagicSoft/Mars/mbase/MAGIC.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MAGIC.h	(revision 3148)
+++ trunk/MagicSoft/Mars/mbase/MAGIC.h	(revision 3183)
@@ -44,16 +44,3 @@
 const Double_t kRad2Deg = 180.0/3.1415926535897932384626433832795028841971693993751;
 
-//
-// This is the definition of a global output stream, which by
-// default pipes all output to the stdout
-//
-
-#ifdef __LINUX__
-class MLog;
-#else
-#include "MLog.h"
 #endif
-
-R__EXTERN MLog gLog;
-
-#endif
Index: trunk/MagicSoft/Mars/mbase/MArgs.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MArgs.h	(revision 3148)
+++ trunk/MagicSoft/Mars/mbase/MArgs.h	(revision 3183)
@@ -1,8 +1,4 @@
 #ifndef MARS_MArgs
 #define MARS_MArgs
-
-#ifndef MARS_MAGIC
-#include "MAGIC.h"
-#endif
 
 #ifndef ROOT_TNamed
Index: trunk/MagicSoft/Mars/mbase/MLog.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MLog.h	(revision 3148)
+++ trunk/MagicSoft/Mars/mbase/MLog.h	(revision 3183)
@@ -201,3 +201,9 @@
 };
 
-#endif
+//
+// This is the definition of a global output stream, which by
+// default pipes all output to the stdout
+//
+R__EXTERN MLog gLog;
+
+#endif
Index: trunk/MagicSoft/Mars/mbase/MParContainer.cc
===================================================================
--- trunk/MagicSoft/Mars/mbase/MParContainer.cc	(revision 3148)
+++ trunk/MagicSoft/Mars/mbase/MParContainer.cc	(revision 3183)
@@ -60,4 +60,14 @@
 using namespace std;
 
+MParContainer::MParContainer(const char *name, const char *title) :
+    fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE)
+{
+}
+
+MParContainer::MParContainer(const TString &name, const TString &title) :
+    fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE)
+{
+}
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mbase/MParContainer.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MParContainer.h	(revision 3148)
+++ trunk/MagicSoft/Mars/mbase/MParContainer.h	(revision 3183)
@@ -12,5 +12,4 @@
 #include "MAGIC.h"
 #endif
-
 #ifndef ROOT_TObject
 #include <TObject.h>
@@ -28,4 +27,6 @@
 class TDataMember;
 class TMethodCall;
+
+class MLog;
 class MStatusDisplay;
 
@@ -60,6 +61,6 @@
     };
 
-    MParContainer(const char *name="", const char *title="") : fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE) {  }
-    MParContainer(const TString &name, const TString &title) : fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE) {  }
+    MParContainer(const char *name="", const char *title="");
+    MParContainer(const TString &name, const TString &title);
     MParContainer(const MParContainer &named);
     MParContainer& operator=(const MParContainer& rhs);