diff --git a/libs/xmlrpc-c/src/system_method.c b/libs/xmlrpc-c/src/system_method.c
index ad13878f7b..0707099165 100644
--- a/libs/xmlrpc-c/src/system_method.c
+++ b/libs/xmlrpc-c/src/system_method.c
@@ -256,7 +256,7 @@ system_listMethods(xmlrpc_env *   const envP,
 
     xmlrpc_registry * const registryP = serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
 
     XMLRPC_ASSERT_ENV_OK(envP);
     XMLRPC_ASSERT_VALUE_OK(paramArrayP);
@@ -378,7 +378,7 @@ system_methodHelp(xmlrpc_env *   const envP,
 
     xmlrpc_registry * const registryP = serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
     
     const char * methodName;
 
@@ -546,7 +546,7 @@ system_methodSignature(xmlrpc_env *   const envP,
 
     xmlrpc_registry * const registryP = (xmlrpc_registry *) serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
     const char * methodName;
     xmlrpc_env env;
 
@@ -615,7 +615,7 @@ system_shutdown(xmlrpc_env *   const envP,
     
     xmlrpc_registry * const registryP = (xmlrpc_registry *) serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
     const char * comment;
     xmlrpc_env env;
 
@@ -700,7 +700,7 @@ system_capabilities(xmlrpc_env *   const envP,
     
     xmlrpc_registry * const registryP = serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
     
     unsigned int paramCount;
 
@@ -766,7 +766,7 @@ system_getCapabilities(xmlrpc_env *   const envP,
     
     xmlrpc_registry * const registryP = serverInfo;
 
-    xmlrpc_value * retvalP;
+    xmlrpc_value * retvalP = NULL;
     
     unsigned int paramCount;
 
diff --git a/libs/xmlrpc-c/src/xmlrpc_datetime.c b/libs/xmlrpc-c/src/xmlrpc_datetime.c
index a36925f5a4..8e76309826 100644
--- a/libs/xmlrpc-c/src/xmlrpc_datetime.c
+++ b/libs/xmlrpc-c/src/xmlrpc_datetime.c
@@ -299,7 +299,7 @@ xmlrpc_value *
 xmlrpc_datetime_new(xmlrpc_env *    const envP, 
                     xmlrpc_datetime const dt) {
 
-    xmlrpc_value * valP;
+    xmlrpc_value * valP = NULL;
 
     const char ** readBufferP;
         
@@ -502,7 +502,7 @@ xmlrpc_datetime_new_str(xmlrpc_env * const envP,
    Do not extend this.  The user should use more normal C representations
    of datetimes.
 -----------------------------------------------------------------------------*/
-    xmlrpc_value * retval;
+    xmlrpc_value * retval = NULL;
 
     validateFormat(envP, datetimeString);
     if (!envP->fault_occurred) {
@@ -533,7 +533,7 @@ xmlrpc_datetime_new_usec(xmlrpc_env * const envP,
                          time_t       const secs,
                          unsigned int const usecs) {
 
-    xmlrpc_value * valueP;
+    xmlrpc_value * valueP = NULL;
 
     if (usecs >= 1000000)
         xmlrpc_faultf(envP, "Number of fractional microseconds must be less "