diff --git a/inc/load.php b/inc/load.php
index 3f1f3429fa0b3ad71aae53f907d6331a7b8cb07f..f3ab5bcdd8ab03fe527588da9c15fd0689529e1e 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -77,6 +77,7 @@ function load_autoload($name){
         'Sitemapper'            => DOKU_INC.'inc/Sitemapper.php',
         'PassHash'              => DOKU_INC.'inc/PassHash.class.php',
         'RemoteAPI'             => DOKU_INC.'inc/remote.php',
+        'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php', 
 
         'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
         'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',
diff --git a/inc/remote.php b/inc/remote.php
index 0347bd9001a4004d99c85953e50ccddef6c3a0b9..2ef28afd2765e018f56c51e9e98fcb7efe990063 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -1,7 +1,6 @@
 <?php
 
 if (!defined('DOKU_INC')) die();
-require_once(DOKU_INC.'inc/RemoteAPICore.php');
 
 class RemoteException extends Exception {}
 class RemoteAccessDeniedException extends RemoteException {}
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index cbec90bfffa8ab10444396374fdf13d24b88de01..cf3682f11b6f3c7e506bff7dc8144001d00b5055 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -2,10 +2,9 @@
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
 
 require_once(DOKU_INC.'inc/init.php');
-require_once(DOKU_INC.'inc/remote.php');
 session_write_close();  //close session
 
-if(!$conf['xmlrpc']) die('XML-RPC server not enabled.');
+if(!$conf['remote']) die('XML-RPC server not enabled.');
 
 /**
  * Contains needed wrapper functions and registers all available