diff --git a/includes/webform.components.inc b/includes/webform.components.inc
index 3c33aa9..24f0082 100644
--- a/includes/webform.components.inc
+++ b/includes/webform.components.inc
@@ -340,6 +340,9 @@ function webform_components_form_submit($form, &$form_state) {
   }
 }
 
+/**
+ * Form to configure a webform component.
+ */
 function webform_component_edit_form($form, $form_state, $node, $component, $clone = FALSE) {
   drupal_set_title(t('Edit component: @name', array('@name' => $component['name'])), PASS_THROUGH);
 
@@ -617,6 +620,9 @@ function webform_component_edit_form_validate($form, &$form_state) {
   }
 }
 
+/**
+ * Submit handler for webform_component_edit_form().
+ */
 function webform_component_edit_form_submit($form, &$form_state) {
   // Ensure a webform record exists.
   $node = node_load($form_state['values']['nid']);
@@ -666,6 +672,9 @@ function webform_component_edit_form_submit($form, &$form_state) {
   $form_state['redirect'] = array('node/' . $node->nid . '/webform/components', isset($cid) ? array('query' => array('cid' => $cid)) : array());
 }
 
+/**
+ * Form to confirm deletion of a component.
+ */
 function webform_component_delete_form($form, $form_state, $node, $component) {
   $cid = $component['cid'];
 
@@ -691,6 +700,9 @@ function webform_component_delete_form($form, $form_state, $node, $component) {
   return confirm_form($form, $question, 'node/' . $node->nid . '/webform/components', $description, t('Delete'));
 }
 
+/**
+ * Submit handler for webform_component_delete_form().
+ */
 function webform_component_delete_form_submit($form, &$form_state) {
   // Delete the component.
   $node = $form_state['values']['node'];
diff --git a/includes/webform.emails.inc b/includes/webform.emails.inc
index 4c44a01..cfd7cb5 100644
--- a/includes/webform.emails.inc
+++ b/includes/webform.emails.inc
@@ -484,7 +484,7 @@ function webform_email_delete_form($form, $form_state, $node, $email) {
 }
 
 /**
- * Submit handler for webform_component_delete_form().
+ * Submit handler for webform_email_delete_form().
  */
 function webform_email_delete_form_submit($form, &$form_state) {
   // Delete the e-mail settings.
diff --git a/webform.module b/webform.module
index d2bab7d..46e48e9 100644
--- a/webform.module
+++ b/webform.module
@@ -179,6 +179,7 @@ function webform_menu() {
     'page arguments' => array('webform_component_edit_form', 1, 4, FALSE),
     'access callback' => 'node_access',
     'access arguments' => array('update', 1),
+    'file' => 'includes/webform.components.inc',
     'type' => MENU_LOCAL_TASK,
   );
   $items['node/%webform_menu/webform/components/%webform_menu_component/clone'] = array(
@@ -187,6 +188,7 @@ function webform_menu() {
     'page arguments' => array('webform_component_edit_form', 1, 4, TRUE),
     'access callback' => 'node_access',
     'access arguments' => array('update', 1),
+    'file' => 'includes/webform.components.inc',
     'type' => MENU_LOCAL_TASK,
   );
   $items['node/%webform_menu/webform/components/%webform_menu_component/delete'] = array(
@@ -195,6 +197,7 @@ function webform_menu() {
     'page arguments' => array('webform_component_delete_form', 1, 4),
     'access callback' => 'node_access',
     'access arguments' => array('update', 1),
+    'file' => 'includes/webform.components.inc',
     'type' => MENU_LOCAL_TASK,
   );