diff --git a/livesupport/modules/archiveServer/var/Archive.php b/livesupport/modules/archiveServer/var/Archive.php
index 46d8df25d..2aae593a1 100644
--- a/livesupport/modules/archiveServer/var/Archive.php
+++ b/livesupport/modules/archiveServer/var/Archive.php
@@ -23,11 +23,11 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/Archive.php,v $
 
 ------------------------------------------------------------------------------*/
-require_once "../../../storageServer/var/LocStor.php";
+require_once dirname(__FILE__)."/../../storageServer/var/LocStor.php";
 
 /**
  *  Extension to StorageServer to act as ArchiveServer
diff --git a/livesupport/modules/archiveServer/var/xmlrpc/put.php b/livesupport/modules/archiveServer/var/xmlrpc/put.php
index 69a5ec4ba..02138cd0d 100644
--- a/livesupport/modules/archiveServer/var/xmlrpc/put.php
+++ b/livesupport/modules/archiveServer/var/xmlrpc/put.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/xmlrpc/put.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -55,9 +55,9 @@
  *  @see XR_LocStor
  */
 
-require_once '../conf.php';
+require_once dirname(__FILE__).'/../conf.php';
 require_once 'DB.php';
-require_once '../Archive.php';
+require_once dirname(__FILE__).'/../Archive.php';
 
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 $dbc = DB::connect($config['dsn'], TRUE);
diff --git a/livesupport/modules/archiveServer/var/xmlrpc/xrArchive.php b/livesupport/modules/archiveServer/var/xmlrpc/xrArchive.php
index 3c8f85408..93c2c1a0c 100644
--- a/livesupport/modules/archiveServer/var/xmlrpc/xrArchive.php
+++ b/livesupport/modules/archiveServer/var/xmlrpc/xrArchive.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.5 $
+    Version  : $Revision: 1.6 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/xmlrpc/xrArchive.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -51,8 +51,8 @@ header("Content-type: text/xml");
 
 /* ================================================================= includes */
 require_once 'DB.php';
-require_once "../../../storageServer/var/xmlrpc/XML/RPC/Server.php";
-require_once '../conf.php';
+require_once dirname(__FILE__)."/../../../storageServer/var/xmlrpc/XML/RPC/Server.php";
+require_once dirname(__FILE__).'/../conf.php';
 require_once 'XR_Archive.php';
 
 /* ============================================ setting default error handler */
diff --git a/livesupport/modules/archiveServer/var/xmlrpc/xr_cli_test.php b/livesupport/modules/archiveServer/var/xmlrpc/xr_cli_test.php
index 2f27fa05d..c7242a169 100644
--- a/livesupport/modules/archiveServer/var/xmlrpc/xr_cli_test.php
+++ b/livesupport/modules/archiveServer/var/xmlrpc/xr_cli_test.php
@@ -23,12 +23,12 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/xmlrpc/xr_cli_test.php,v $
 
 ------------------------------------------------------------------------------*/
 
-include_once "../../../storageServer/var/xmlrpc/XML/RPC.php";
+include_once dirname(__FILE__)."/../../../storageServer/var/xmlrpc/XML/RPC.php";
 
 $pars = $argv;
 array_shift($pars);
diff --git a/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php b/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php
index cc1f4eb07..f07afa9e4 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php
@@ -23,12 +23,12 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.19 $
+    Version  : $Revision: 1.20 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/XR_LocStor.php,v $
 
 ------------------------------------------------------------------------------*/
 
-require_once '../../../storageServer/var/LocStor.php';
+require_once dirname(__FILE__).'/../LocStor.php';
 
 /**
  *  XML-RPC interface for LocStor class 
@@ -1419,7 +1419,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once dirname(__FILE__).'/../Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->loadPref($r['sessid'], $r['key']);
         if(PEAR::isError($res)){
@@ -1470,7 +1470,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once dirname(__FILE__).'/../Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->savePref($r['sessid'], $r['key'], $r['value']);
         if(PEAR::isError($res)){
@@ -1520,7 +1520,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once dirname(__FILE__).'/../Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->delPref($r['sessid'], $r['key']);
         if(PEAR::isError($res)){
@@ -1572,7 +1572,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once dirname(__FILE__).'/../Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->loadGroupPref($r['sessid'], $r['group'], $r['key']);
         if(PEAR::isError($res)){
@@ -1628,7 +1628,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Prefs.php';
+        require_once dirname(__FILE__).'/../Prefs.php';
         $pr =& new Prefs($this);
         $res = $pr->saveGroupPref($r['sessid'], $r['group'], $r['key'], $r['value']);
         if(PEAR::isError($res)){
@@ -1678,7 +1678,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Transport.php';
+        require_once dirname(__FILE__).'/../Transport.php';
         $tr =& new Transport($this->dbc, $this, $this->config);
         $res = $tr->uploadToArchive($r['gunid'], $r['sessid']);
         if(PEAR::isError($res)){
@@ -1727,7 +1727,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Transport.php';
+        require_once dirname(__FILE__).'/../Transport.php';
         $tr =& new Transport($this->dbc, $this, $this->config);
         $res = $tr->downloadFromArchive($r['gunid'], $r['sessid']);
         if(PEAR::isError($res)){
@@ -1784,7 +1784,7 @@ class XR_LocStor extends LocStor{
     {
         list($ok, $r) = $this->_xr_getPars($input);
         if(!$ok) return $r;
-        require_once '../../../storageServer/var/Transport.php';
+        require_once dirname(__FILE__).'/../Transport.php';
         $tr =& new Transport($this->dbc, $this, $this->config);
         $res = $tr->getTransportInfo($r['trtok'], $r['sessid']);
         if(PEAR::isError($res)){
diff --git a/livesupport/modules/storageServer/var/xmlrpc/put.php b/livesupport/modules/storageServer/var/xmlrpc/put.php
index 20349ced0..1f2997853 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/put.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/put.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/put.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -55,9 +55,9 @@
  *  @see XR_LocStor
  */
 
-require_once '../conf.php';
+require_once dirname(__FILE__).'/../conf.php';
 require_once 'DB.php';
-require_once '../LocStor.php';
+require_once dirname(__FILE__).'/../LocStor.php';
 
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 $dbc = DB::connect($config['dsn'], TRUE);
diff --git a/livesupport/modules/storageServer/var/xmlrpc/schedulerPhpClient.php b/livesupport/modules/storageServer/var/xmlrpc/schedulerPhpClient.php
index 15af72124..da7de3832 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/schedulerPhpClient.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/schedulerPhpClient.php
@@ -23,15 +23,15 @@
 
 
     Author   : $Author: tomas $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/schedulerPhpClient.php,v $
 
 ------------------------------------------------------------------------------*/
 
 /* ================================================================= includes */
-include_once "../conf.php";
+include_once dirname(__FILE__)."/../conf.php";
 require_once 'DB.php';
-include_once "../xmlrpc/XML/RPC.php";
+include_once dirname(__FILE__)."/XML/RPC.php";
 
 /* ================================================== method definition array */
 /**
diff --git a/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php b/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php
index d06793283..b423aa00d 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.11 $
+    Version  : $Revision: 1.12 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/simpleGet.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -54,9 +54,9 @@
  *
  */
 
-require_once '../conf.php';
+require_once dirname(__FILE__).'/../conf.php';
 require_once 'DB.php';
-require_once '../LocStor.php';
+require_once dirname(__FILE__).'/../LocStor.php';
 
 $dbc = DB::connect($config['dsn'], TRUE);
 $dbc->setErrorHandling(PEAR_ERROR_RETURN);
diff --git a/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php b/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php
index fa65a38d5..4373f68ae 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.24 $
+    Version  : $Revision: 1.25 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -51,7 +51,7 @@ ini_set("error_append_string", "</string></value>
 header("Content-type: text/xml");
 
 /* ================================================================= includes */
-require_once '../conf.php';
+require_once dirname(__FILE__).'/../conf.php';
 require_once 'DB.php';
 require_once "XML/RPC/Server.php";
 require_once 'XR_LocStor.php';
diff --git a/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php b/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
index 29de43a53..0e9ca4e1f 100644
--- a/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
+++ b/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php
@@ -23,13 +23,13 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.7 $
+    Version  : $Revision: 1.8 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xr_cli_test.php,v $
 
 ------------------------------------------------------------------------------*/
 
-include_once "../xmlrpc/XML/RPC.php";
-include_once "../conf.php";
+include_once dirname(__FILE__)."/XML/RPC.php";
+include_once dirname(__FILE__)."/../conf.php";
 
 $pars = $argv;
 array_shift($pars);