diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 6fb7c29..f0dc0f7 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -599,7 +599,7 @@ function template_preprocess_views_view_table(&$variables) {
           $variables['header'][$field]['content'] = '<' . $element_label_type . '>' . $variables['header'][$field]['content'] . '</' . $element_label_type . '>';
         }
         // Improves accessibility of complex tables.
-        $vars['header_classes'][$field]['id'] = drupal_html_id('view-' . $field . '-table-column');
+        $variables['header'][$field]['attributes']['id'] = drupal_html_id('view-' . $field . '-table-column');
       }
       // Check if header label is not empty.
       if (!empty($variables['header'][$field]['content'])) {
@@ -632,8 +632,8 @@ function template_preprocess_views_view_table(&$variables) {
       }
 
       // Improves accessibility of complex tables.
-      if (isset($vars['header_classes'][$field]['id'])) {
-        $vars['field_classes'][$field][$num]['headers'] = array($vars['header_classes'][$field]['id']);
+      if (isset($variables['header'][$field]['attributes']['id'])) {
+        $variables['rows'][$num]['columns'][$column]['attributes']['headers'] = array($variables['header'][$field]['attributes']['id']);
       }
 
       if (!empty($fields[$field]) && empty($fields[$field]->options['exclude'])) {