diff --git a/views.info b/views.info
index 122ed971b7a01dac7f1b6a70848c2745d4d44e8b..77763bb599a1022ba6588802cde0d60b8134971a 100644
--- a/views.info
+++ b/views.info
@@ -8,187 +8,6 @@ php = 5.2
 stylesheets[all][] = css/views.css
 
 dependencies[] = ctools
-; Handlers
-files[] = handlers/views_handler_area.inc
-files[] = handlers/views_handler_area_result.inc
-files[] = handlers/views_handler_area_text.inc
-files[] = handlers/views_handler_area_text_custom.inc
-files[] = handlers/views_handler_area_view.inc
-files[] = handlers/views_handler_argument.inc
-files[] = handlers/views_handler_argument_date.inc
-files[] = handlers/views_handler_argument_formula.inc
-files[] = handlers/views_handler_argument_many_to_one.inc
-files[] = handlers/views_handler_argument_null.inc
-files[] = handlers/views_handler_argument_numeric.inc
-files[] = handlers/views_handler_argument_string.inc
-files[] = handlers/views_handler_argument_group_by_numeric.inc
-files[] = handlers/views_handler_field.inc
-files[] = handlers/views_handler_field_counter.inc
-files[] = handlers/views_handler_field_boolean.inc
-files[] = handlers/views_handler_field_contextual_links.inc
-files[] = handlers/views_handler_field_custom.inc
-files[] = handlers/views_handler_field_date.inc
-files[] = handlers/views_handler_field_entity.inc
-files[] = handlers/views_handler_field_markup.inc
-files[] = handlers/views_handler_field_math.inc
-files[] = handlers/views_handler_field_numeric.inc
-files[] = handlers/views_handler_field_prerender_list.inc
-files[] = handlers/views_handler_field_time_interval.inc
-files[] = handlers/views_handler_field_serialized.inc
-files[] = handlers/views_handler_field_machine_name.inc
-files[] = handlers/views_handler_field_url.inc
-files[] = handlers/views_handler_filter.inc
-files[] = handlers/views_handler_filter_boolean_operator.inc
-files[] = handlers/views_handler_filter_boolean_operator_string.inc
-files[] = handlers/views_handler_filter_combine.inc
-files[] = handlers/views_handler_filter_date.inc
-files[] = handlers/views_handler_filter_equality.inc
-files[] = handlers/views_handler_filter_group_by_numeric.inc
-files[] = handlers/views_handler_filter_in_operator.inc
-files[] = handlers/views_handler_filter_many_to_one.inc
-files[] = handlers/views_handler_filter_numeric.inc
-files[] = handlers/views_handler_filter_string.inc
-files[] = handlers/views_handler_relationship.inc
-files[] = handlers/views_handler_relationship_groupwise_max.inc
-files[] = handlers/views_handler_sort.inc
-files[] = handlers/views_handler_sort_date.inc
-files[] = handlers/views_handler_sort_formula.inc
-files[] = handlers/views_handler_sort_group_by_numeric.inc
-files[] = handlers/views_handler_sort_menu_hierarchy.inc
-files[] = handlers/views_handler_sort_random.inc
-; Modules
-files[] = modules/aggregator/views_handler_argument_aggregator_fid.inc
-files[] = modules/aggregator/views_handler_argument_aggregator_iid.inc
-files[] = modules/aggregator/views_handler_argument_aggregator_category_cid.inc
-files[] = modules/aggregator/views_handler_field_aggregator_title_link.inc
-files[] = modules/aggregator/views_handler_field_aggregator_category.inc
-files[] = modules/aggregator/views_handler_field_aggregator_item_description.inc
-files[] = modules/aggregator/views_handler_field_aggregator_xss.inc
-files[] = modules/aggregator/views_handler_filter_aggregator_category_cid.inc
-files[] = modules/aggregator/views_plugin_row_aggregator_rss.inc
-files[] = modules/book/views_plugin_argument_default_book_root.inc
-files[] = modules/comment/views_handler_argument_comment_user_uid.inc
-files[] = modules/comment/views_handler_field_comment.inc
-files[] = modules/comment/views_handler_field_comment_depth.inc
-files[] = modules/comment/views_handler_field_comment_link.inc
-files[] = modules/comment/views_handler_field_comment_link_approve.inc
-files[] = modules/comment/views_handler_field_comment_link_delete.inc
-files[] = modules/comment/views_handler_field_comment_link_edit.inc
-files[] = modules/comment/views_handler_field_comment_link_reply.inc
-files[] = modules/comment/views_handler_field_comment_node_link.inc
-files[] = modules/comment/views_handler_field_comment_username.inc
-files[] = modules/comment/views_handler_field_ncs_last_comment_name.inc
-files[] = modules/comment/views_handler_field_ncs_last_updated.inc
-files[] = modules/comment/views_handler_field_node_comment.inc
-files[] = modules/comment/views_handler_field_node_new_comments.inc
-files[] = modules/comment/views_handler_field_last_comment_timestamp.inc
-files[] = modules/comment/views_handler_filter_comment_user_uid.inc
-files[] = modules/comment/views_handler_filter_ncs_last_updated.inc
-files[] = modules/comment/views_handler_filter_node_comment.inc
-files[] = modules/comment/views_handler_sort_comment_thread.inc
-files[] = modules/comment/views_handler_sort_ncs_last_comment_name.inc
-files[] = modules/comment/views_handler_sort_ncs_last_updated.inc
-files[] = modules/comment/views_plugin_row_comment_rss.inc
-files[] = modules/comment/views_plugin_row_comment_view.inc
-files[] = modules/contact/views_handler_field_contact_link.inc
-files[] = modules/field/views_handler_field_field.inc
-files[] = modules/field/views_handler_relationship_entity_reverse.inc
-files[] = modules/field/views_handler_argument_field_list.inc
-files[] = modules/field/views_handler_argument_field_list_string.inc
-files[] = modules/field/views_handler_filter_field_list.inc
-files[] = modules/filter/views_handler_field_filter_format_name.inc
-files[] = modules/locale/views_handler_field_node_language.inc
-files[] = modules/locale/views_handler_filter_node_language.inc
-files[] = modules/locale/views_handler_argument_locale_group.inc
-files[] = modules/locale/views_handler_argument_locale_language.inc
-files[] = modules/locale/views_handler_field_locale_group.inc
-files[] = modules/locale/views_handler_field_locale_language.inc
-files[] = modules/locale/views_handler_field_locale_link_edit.inc
-files[] = modules/locale/views_handler_filter_locale_group.inc
-files[] = modules/locale/views_handler_filter_locale_language.inc
-files[] = modules/locale/views_handler_filter_locale_version.inc
-files[] = modules/node/views_handler_argument_dates_various.inc
-files[] = modules/node/views_handler_argument_node_language.inc
-files[] = modules/node/views_handler_argument_node_nid.inc
-files[] = modules/node/views_handler_argument_node_type.inc
-files[] = modules/node/views_handler_argument_node_vid.inc
-files[] = modules/node/views_handler_argument_node_uid_revision.inc
-files[] = modules/node/views_handler_field_history_user_timestamp.inc
-files[] = modules/node/views_handler_field_node.inc
-files[] = modules/node/views_handler_field_node_link.inc
-files[] = modules/node/views_handler_field_node_link_delete.inc
-files[] = modules/node/views_handler_field_node_link_edit.inc
-files[] = modules/node/views_handler_field_node_revision.inc
-files[] = modules/node/views_handler_field_node_revision_link.inc
-files[] = modules/node/views_handler_field_node_revision_link_delete.inc
-files[] = modules/node/views_handler_field_node_revision_link_revert.inc
-files[] = modules/node/views_handler_field_node_path.inc
-files[] = modules/node/views_handler_field_node_type.inc
-files[] = modules/node/views_handler_filter_history_user_timestamp.inc
-files[] = modules/node/views_handler_filter_node_access.inc
-files[] = modules/node/views_handler_filter_node_status.inc
-files[] = modules/node/views_handler_filter_node_type.inc
-files[] = modules/node/views_handler_filter_node_uid_revision.inc
-files[] = modules/node/views_plugin_argument_default_node.inc
-files[] = modules/node/views_plugin_argument_validate_node.inc
-files[] = modules/node/views_plugin_row_node_rss.inc
-files[] = modules/node/views_plugin_row_node_view.inc
-files[] = modules/search/views_handler_argument_search.inc
-files[] = modules/search/views_handler_field_search_score.inc
-files[] = modules/search/views_handler_filter_search.inc
-files[] = modules/search/views_handler_sort_search_score.inc
-files[] = modules/search/views_plugin_row_search_view.inc
-files[] = modules/statistics/views_handler_field_accesslog_path.inc
-files[] = modules/system/views_handler_argument_file_fid.inc
-files[] = modules/system/views_handler_field_file.inc
-files[] = modules/system/views_handler_field_file_extension.inc
-files[] = modules/system/views_handler_field_file_filemime.inc
-files[] = modules/system/views_handler_field_file_uri.inc
-files[] = modules/system/views_handler_field_file_status.inc
-files[] = modules/system/views_handler_filter_file_status.inc
-files[] = modules/taxonomy/views_handler_argument_taxonomy.inc
-files[] = modules/taxonomy/views_handler_argument_term_node_tid.inc
-files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
-files[] = modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
-files[] = modules/taxonomy/views_handler_argument_vocabulary_vid.inc
-files[] = modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
-files[] = modules/taxonomy/views_handler_field_taxonomy.inc
-files[] = modules/taxonomy/views_handler_field_term_node_tid.inc
-files[] = modules/taxonomy/views_handler_field_term_link_edit.inc
-files[] = modules/taxonomy/views_handler_filter_term_node_tid.inc
-files[] = modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
-files[] = modules/taxonomy/views_handler_filter_vocabulary_vid.inc
-files[] = modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
-files[] = modules/taxonomy/views_handler_relationship_node_term_data.inc
-files[] = modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
-files[] = modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
-files[] = modules/system/views_handler_filter_system_type.inc
-files[] = modules/translation/views_handler_argument_node_tnid.inc
-files[] = modules/translation/views_handler_field_node_link_translate.inc
-files[] = modules/translation/views_handler_field_node_translation_link.inc
-files[] = modules/translation/views_handler_filter_node_tnid.inc
-files[] = modules/translation/views_handler_filter_node_tnid_child.inc
-files[] = modules/translation/views_handler_relationship_translation.inc
-files[] = modules/user/views_handler_argument_user_uid.inc
-files[] = modules/user/views_handler_argument_users_roles_rid.inc
-files[] = modules/user/views_handler_field_user.inc
-files[] = modules/user/views_handler_field_user_language.inc
-files[] = modules/user/views_handler_field_user_link.inc
-files[] = modules/user/views_handler_field_user_link_cancel.inc
-files[] = modules/user/views_handler_field_user_link_edit.inc
-files[] = modules/user/views_handler_field_user_mail.inc
-files[] = modules/user/views_handler_field_user_name.inc
-files[] = modules/user/views_handler_field_user_permissions.inc
-files[] = modules/user/views_handler_field_user_picture.inc
-files[] = modules/user/views_handler_field_user_roles.inc
-files[] = modules/user/views_handler_filter_user_current.inc
-files[] = modules/user/views_handler_filter_user_name.inc
-files[] = modules/user/views_handler_filter_user_permissions.inc
-files[] = modules/user/views_handler_filter_user_roles.inc
-files[] = modules/user/views_plugin_argument_default_current_user.inc
-files[] = modules/user/views_plugin_argument_default_user.inc
-files[] = modules/user/views_plugin_argument_validate_user.inc
-files[] = modules/user/views_plugin_row_user_view.inc
 
 ; Tests
 files[] = tests/views_test/views_test.views_default.inc
diff --git a/views_ui.info b/views_ui.info
index b131de9ddefbbcc757e504d9ade7701bd7100b84..c9eebf4192d9ce1e7078121e27b3518afc3eb1aa 100644
--- a/views_ui.info
+++ b/views_ui.info
@@ -4,5 +4,3 @@ package = Views
 core = 8.x
 configure = admin/structure/views
 dependencies[] = views
-files[] = views_ui.module
-files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php