--- sf_webform.module	2010-09-09 12:41:18.181562537 -0500
+++ sf_webform.module.fieldmap_include_fix	2010-09-09 12:24:36.049561733 -0500
@@ -153,7 +153,7 @@ function sf_webform_form_alter(&$form, $
  */
 function sf_webform_salesforce_form($form_state, $node, $exported = FALSE)  {
   // access webform submission funcitons webform_submissions.inc.
-  module_load_include('inc', 'webform', 'webform_submissions');
+  module_load_include('inc', 'webform', 'includes/webform.submissions');
 
   // list all submissions with SFID (use table setup)
   $webform_submissions = webform_get_submissions($node->nid);
@@ -350,7 +350,7 @@ function _sf_webform_get_access($salesfo
  * Redirect form map id when submitted
  */
 function sf_webform_fieldmap_add_form_submit($form, &$form_state) {
-  if (preg_match('/^node_webform_(\d+)$/', $form_state['values']['drupal_object'], $matches)) {
+  if (preg_match('/^node_webform_(\d+)$/', $form_state['values']['drupal'], $matches)) {
     // get the fieldmap id from the redirect url
     $redirect = split("/", $form_state['redirect']);
     if (!isset($redirect[4]) || !is_numeric($redirect[4])) {
@@ -524,7 +524,7 @@ function sf_webform_export($node = NULL,
   if (!is_null($sid)) {
     // if manually exporting or via cron
     // access webform submission functions webform_submissions.inc. to load submission
-    module_load_include('inc', 'webform', 'webform_submissions');
+    module_load_include('inc', 'webform', 'includes/webform.submissions');
     // map elements to correct object fields
 
     $submission = webform_get_submission($node->nid, $sid);
@@ -864,4 +864,4 @@ function sf_webform_cron() {
  */
 function sf_webform_fieldmap_delete_form_submit($form, $form_state) {
   return db_query("DELETE FROM {salesforce_webform} WHERE fmid = %d", $form_state['values']['fieldmap_index']);
-}
\ No newline at end of file
+}