Index: xmlrpc.php
===================================================================
RCS file: /cvs/drupal/drupal/xmlrpc.php,v
retrieving revision 1.6
diff -u -F^f -r1.6 xmlrpc.php
--- xmlrpc.php	26 Jan 2004 18:51:37 -0000	1.6
+++ xmlrpc.php	3 May 2004 21:32:55 -0000
@@ -3,6 +3,7 @@
 
 include_once "includes/bootstrap.inc";
 include_once "includes/common.inc";
+include_once "includes/xmlrpc.inc";
 include_once "includes/xmlrpcs.inc";
 
 $functions = module_invoke_all("xmlrpc");
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.345
diff -u -F^f -r1.345 common.inc
--- includes/common.inc	3 May 2004 11:53:59 -0000	1.345
+++ includes/common.inc	3 May 2004 21:32:56 -0000
@@ -1251,6 +1251,8 @@ function drupal_map_assoc($array, $funct
  * @param $data The XML data which will be parsed later.
  */
 function drupal_xml_parser_create(&$data) {
+  include_once "includes/xmlrpc.inc";
+
   $encoding = 'utf-8';
   if (ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) {
     $encoding = $match[1];
@@ -1304,7 +1306,6 @@ function truncate_utf8($string, $len) {
 include_once "includes/theme.inc";
 include_once "includes/pager.inc";
 include_once "includes/menu.inc";
-include_once "includes/xmlrpc.inc";
 include_once "includes/tablesort.inc";
 include_once "includes/file.inc";
 
Index: modules/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi.module,v
retrieving revision 1.6
diff -u -F^f -r1.6 blogapi.module
--- modules/blogapi.module	15 Apr 2004 21:40:37 -0000	1.6
+++ modules/blogapi.module	3 May 2004 21:32:56 -0000
@@ -43,6 +43,8 @@ function blogapi_get_users_blogs($req_pa
 
   $user = blogapi_validate_user($params[1], $params[2]);
   if ($user->uid) {
+    include_once "includes/xmlrpc.inc";
+
     $struct = new xmlrpcval(array('url' => new xmlrpcval(url('blog/' . $user->uid)),
                                   'blogid' => new xmlrpcval($user->uid),
                                   'blogName' => new xmlrpcval($user->name . "'s blog")),
@@ -61,6 +63,8 @@ function blogapi_get_user_info($req_para
   $user = blogapi_validate_user($params[1], $params[2]);
 
   if ($user->uid) {
+    include_once "includes/xmlrpc.inc";
+
     $name = explode(' ', $user->realname ? $user->realname : $user->name, 2);
     $struct = new xmlrpcval(array('userid' => new xmlrpcval($user->uid, 'string'),
                                   'lastname' => new xmlrpcval($name[1], 'string'),
@@ -130,6 +134,8 @@ function blogapi_new_post($req_params) {
 
   $nid = node_save($node);
   if ($nid) {
+    include_once "includes/xmlrpc.inc";
+
     watchdog("special", "$node->type: added '$node->title' using blog API", l(t("view post"), "node/view/$nid"));
     return new xmlrpcresp(new xmlrpcval($nid, 'string'));
   }
@@ -195,6 +201,8 @@ function blogapi_edit_post($req_params) 
 }
 
 function blogapi_get_post($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $params = blogapi_convert($req_params);
   $user = blogapi_validate_user($params[1], $params[2]);
   if (!$user->uid) {
@@ -213,6 +221,8 @@ function blogapi_get_post($req_params) {
 }
 
 function blogapi_delete_post($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $params = blogapi_convert($req_params);
 
   $user = blogapi_validate_user($params[2], $params[3]);
@@ -229,6 +239,8 @@ function blogapi_new_media_object($req_p
 }
 
 function blogapi_get_category_list($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $vocabularies = module_invoke('taxonomy', 'get_vocabularies', 'blog', 'vid');
   $categories = array();
   if ($vocabularies) {
@@ -249,6 +261,8 @@ function blogapi_get_category_list($req_
 }
 
 function blogapi_get_post_categories($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $params = blogapi_convert($req_params);
   $user = blogapi_validate_user($params[1], $params[2]);
   if (!$user->uid) {
@@ -271,6 +285,8 @@ function blogapi_get_post_categories($re
 }
 
 function blogapi_set_post_categories($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $params = blogapi_convert($req_params);
   $user = blogapi_validate_user($params[1], $params[2]);
   if (!$user->uid) {
@@ -287,6 +303,8 @@ function blogapi_set_post_categories($re
 }
 
 function blogapi_get_recent_posts($req_params) {
+  include_once "includes/xmlrpc.inc";
+
   $params = blogapi_convert($req_params);
 
   // Remove unused appkey (from bloggerAPI).
@@ -326,6 +344,8 @@ function blogapi_convert($params) {
 }
 
 function blogapi_error($message) {
+  include_once "includes/xmlrpc.inc";
+
   global $xmlrpcusererr;
 
   if (is_array($message)) {
Index: modules/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal.module,v
retrieving revision 1.76
diff -u -F^f -r1.76 drupal.module
--- modules/drupal.module	21 Apr 2004 13:56:37 -0000	1.76
+++ modules/drupal.module	3 May 2004 21:32:56 -0000
@@ -67,6 +67,7 @@ function drupal_cron() {
 }
 
 function drupal_directory_ping($arguments) {
+  include_once "includes/xmlrpc.inc";
 
   /*
   ** Parse our parameters:
@@ -116,6 +117,8 @@ function drupal_xmlrpc() {
 }
 
 function drupal_notify($server) {
+  include_once "includes/xmlrpc.inc";
+
   global $base_url;
 
   $url = parse_url($server);
@@ -145,6 +148,7 @@ function drupal_info($field = 0) {
 }
 
 function drupal_auth($username, $password, $server) {
+  include_once "includes/xmlrpc.inc";
 
   $message = new xmlrpcmsg("drupal.login", array(new xmlrpcval($username, "string"), new xmlrpcval($password, "string")));
 
@@ -174,6 +178,8 @@ function drupal_page() {
 }
 
 function drupal_login($arguments) {
+  include_once "includes/xmlrpc.inc";
+
    // an XML-RPC method called by external clients (usually other Drupal instances)
   $argument = $arguments->getparam(0);
   $username = $argument->scalarval();
Index: modules/ping.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/ping.module,v
retrieving revision 1.15
diff -u -F^f -r1.15 ping.module
--- modules/ping.module	23 Apr 2004 06:30:42 -0000	1.15
+++ modules/ping.module	3 May 2004 21:32:56 -0000
@@ -39,6 +39,8 @@ function _ping_notify($name, $url) {
 }
 
 function ping_ping($name = "", $url = "") {
+  include_once "includes/xmlrpc.inc";
+
   $feed = url("node/feed");
 
   $client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);