diff --git modules/aggregator/aggregator.info modules/aggregator/aggregator.info
index ae67bbb..d97d68b 100644
--- modules/aggregator/aggregator.info
+++ modules/aggregator/aggregator.info
@@ -4,13 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = aggregator.module
-files[] = aggregator.admin.inc
-files[] = aggregator.pages.inc
-files[] = aggregator.fetcher.inc
-files[] = aggregator.parser.inc
-files[] = aggregator.processor.inc
-files[] = aggregator.install
 files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
diff --git modules/aggregator/tests/aggregator_test.info modules/aggregator/tests/aggregator_test.info
index 1cc6ebf..1a66513 100644
--- modules/aggregator/tests/aggregator_test.info
+++ modules/aggregator/tests/aggregator_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = aggregator_test.module
 hidden = TRUE
diff --git modules/block/block.info modules/block/block.info
index c371607..194b6bf 100644
--- modules/block/block.info
+++ modules/block/block.info
@@ -4,8 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = block.module
-files[] = block.admin.inc
-files[] = block.install
 files[] = block.test
 configure = admin/structure/block
diff --git modules/block/tests/block_test.info modules/block/tests/block_test.info
index 3b9b80b..e394740 100644
--- modules/block/tests/block_test.info
+++ modules/block/tests/block_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = block_test.module
 hidden = TRUE
diff --git modules/blog/blog.info modules/blog/blog.info
index 938993c..cacb217 100644
--- modules/blog/blog.info
+++ modules/blog/blog.info
@@ -5,6 +5,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = blog.module
-files[] = blog.pages.inc
 files[] = blog.test
diff --git modules/book/book.info modules/book/book.info
index c9dd5b9..14b72d0 100644
--- modules/book/book.info
+++ modules/book/book.info
@@ -4,10 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = book.module
-files[] = book.admin.inc
-files[] = book.pages.inc
-files[] = book.install
 files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
diff --git modules/color/color.info modules/color/color.info
index 47a93ba..560fd9c 100644
--- modules/color/color.info
+++ modules/color/color.info
@@ -5,6 +5,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = color.module
-files[] = color.install
 files[] = color.test
diff --git modules/comment/comment.info modules/comment/comment.info
index b4374c3..d244ddf 100644
--- modules/comment/comment.info
+++ modules/comment/comment.info
@@ -6,10 +6,6 @@
 core = 7.x
 dependencies[] = text
 files[] = comment.module
-files[] = comment.admin.inc
-files[] = comment.pages.inc
-files[] = comment.install
 files[] = comment.test
-files[] = comment.tokens.inc
 configure = admin/content/comment
 stylesheets[all][] = comment.css
diff --git modules/contact/contact.info modules/contact/contact.info
index a2f7f4c..adefb11 100644
--- modules/contact/contact.info
+++ modules/contact/contact.info
@@ -4,9 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = contact.module
-files[] = contact.admin.inc
-files[] = contact.pages.inc
-files[] = contact.install
 files[] = contact.test
 configure = admin/structure/contact
diff --git modules/contextual/contextual.info modules/contextual/contextual.info
index 71f465b..83839b4 100644
--- modules/contextual/contextual.info
+++ modules/contextual/contextual.info
@@ -4,4 +4,3 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = contextual.module
diff --git modules/dashboard/dashboard.info modules/dashboard/dashboard.info
index 5ad675d..6b07965 100644
--- modules/dashboard/dashboard.info
+++ modules/dashboard/dashboard.info
@@ -4,7 +4,6 @@
 core = 7.x
 package = Core
 version = VERSION
-files[] = dashboard.module
 files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
diff --git modules/dblog/dblog.info modules/dblog/dblog.info
index 6b9f823..35b0148 100644
--- modules/dblog/dblog.info
+++ modules/dblog/dblog.info
@@ -4,7 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = dblog.module
-files[] = dblog.admin.inc
-files[] = dblog.install
 files[] = dblog.test
diff --git modules/field/field.info modules/field/field.info
index 06de408..3a1b20d 100644
--- modules/field/field.info
+++ modules/field/field.info
@@ -5,13 +5,7 @@
 version = VERSION
 core = 7.x
 files[] = field.module
-files[] = field.install
-files[] = field.crud.inc
-files[] = field.info.inc
-files[] = field.default.inc
-files[] = field.multilingual.inc
 files[] = field.attach.inc
-files[] = field.form.inc
 files[] = tests/field.test
 dependencies[] = field_sql_storage
 required = TRUE
diff --git modules/field/modules/field_sql_storage/field_sql_storage.info modules/field/modules/field_sql_storage/field_sql_storage.info
index fe21172..4d7a2e8 100644
--- modules/field/modules/field_sql_storage/field_sql_storage.info
+++ modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -5,7 +5,5 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = field_sql_storage.module
-files[] = field_sql_storage.install
 files[] = field_sql_storage.test
 required = TRUE
diff --git modules/field/modules/list/list.info modules/field/modules/list/list.info
index 3f64b0b..250b1ba 100644
--- modules/field/modules/list/list.info
+++ modules/field/modules/list/list.info
@@ -6,5 +6,4 @@
 core = 7.x
 dependencies[] = field
 dependencies[] = options
-files[] = list.module
 files[] = tests/list.test
diff --git modules/field/modules/number/number.info modules/field/modules/number/number.info
index 02997ae..ea1c365 100644
--- modules/field/modules/number/number.info
+++ modules/field/modules/number/number.info
@@ -5,5 +5,4 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = number.module
 files[] = number.test
diff --git modules/field/modules/options/options.info modules/field/modules/options/options.info
index 0612afc..f040ae9 100644
--- modules/field/modules/options/options.info
+++ modules/field/modules/options/options.info
@@ -5,5 +5,4 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = options.module
 files[] = options.test
diff --git modules/field/modules/text/text.info modules/field/modules/text/text.info
index 4e50e0b..0117dc1 100644
--- modules/field/modules/text/text.info
+++ modules/field/modules/text/text.info
@@ -5,6 +5,5 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = text.module
 files[] = text.test
 required = TRUE
diff --git modules/field/tests/field_test.info modules/field/tests/field_test.info
index b875e59..15fb065 100644
--- modules/field/tests/field_test.info
+++ modules/field/tests/field_test.info
@@ -3,10 +3,6 @@
 description = "Support module for the Field API tests."
 core = 7.x
 package = Testing
-files[] = field_test.module
 files[] = field_test.entity.inc
-files[] = field_test.field.inc
-files[] = field_test.storage.inc
-files[] = field_test.install
 version = VERSION
 hidden = TRUE
diff --git modules/field_ui/field_ui.info modules/field_ui/field_ui.info
index 46e3eb7..8524473 100644
--- modules/field_ui/field_ui.info
+++ modules/field_ui/field_ui.info
@@ -5,6 +5,4 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = field_ui.module
-files[] = field_ui.admin.inc
 files[] = field_ui.test
diff --git modules/file/file.info modules/file/file.info
index 5c36ac9..ac34022 100644
--- modules/file/file.info
+++ modules/file/file.info
@@ -5,7 +5,4 @@
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = file.module
-files[] = file.field.inc
-files[] = file.install
 files[] = tests/file.test
diff --git modules/file/tests/file_module_test.info modules/file/tests/file_module_test.info
index 1f154e0..50e2bd4 100644
--- modules/file/tests/file_module_test.info
+++ modules/file/tests/file_module_test.info
@@ -4,5 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = file_module_test.module
 hidden = TRUE
diff --git modules/filter/filter.info modules/filter/filter.info
index 0135de7..b830bc6 100644
--- modules/filter/filter.info
+++ modules/filter/filter.info
@@ -4,10 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = filter.module
-files[] = filter.admin.inc
-files[] = filter.pages.inc
-files[] = filter.install
 files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
diff --git modules/forum/forum.info modules/forum/forum.info
index d4998fc..3478e66 100644
--- modules/forum/forum.info
+++ modules/forum/forum.info
@@ -6,10 +6,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = forum.module
-files[] = forum.admin.inc
-files[] = forum.pages.inc
-files[] = forum.install
 files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
diff --git modules/help/help.info modules/help/help.info
index 4c84b26..cdae549 100644
--- modules/help/help.info
+++ modules/help/help.info
@@ -4,6 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = help.module
-files[] = help.admin.inc
 files[] = help.test
diff --git modules/image/image.info modules/image/image.info
index 137acc2..97b947b 100644
--- modules/image/image.info
+++ modules/image/image.info
@@ -5,10 +5,5 @@
 version = VERSION
 core = 7.x
 dependencies[] = file
-files[] = image.module
-files[] = image.admin.inc
-files[] = image.effects.inc
-files[] = image.field.inc
-files[] = image.install
 files[] = image.test
 configure = admin/config/media/image-styles
diff --git modules/image/tests/image_module_test.info modules/image/tests/image_module_test.info
index 144a904..8664ff1 100644
--- modules/image/tests/image_module_test.info
+++ modules/image/tests/image_module_test.info
@@ -4,5 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = image_module_test.module
 hidden = TRUE
diff --git modules/locale/locale.info modules/locale/locale.info
index 461f207..79bd6c0 100644
--- modules/locale/locale.info
+++ modules/locale/locale.info
@@ -4,8 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = locale.module
-files[] = locale.install
-files[] = locale.admin.inc
 files[] = locale.test
 configure = admin/config/regional/language
diff --git modules/locale/tests/locale_test.info modules/locale/tests/locale_test.info
index 3d8d2f1..f3eb2f1 100644
--- modules/locale/tests/locale_test.info
+++ modules/locale/tests/locale_test.info
@@ -3,6 +3,5 @@
 description = "Support module for the locale layer tests."
 core = 7.x
 package = Testing
-files[] = locale_test.module
 version = VERSION
 hidden = TRUE
diff --git modules/menu/menu.info modules/menu/menu.info
index 2854295..2d700e6 100644
--- modules/menu/menu.info
+++ modules/menu/menu.info
@@ -4,8 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = menu.module
-files[] = menu.admin.inc
-files[] = menu.install
 files[] = menu.test
 configure = admin/structure/menu
diff --git modules/node/node.info modules/node/node.info
index 23cc230..9767f7e 100644
--- modules/node/node.info
+++ modules/node/node.info
@@ -5,12 +5,7 @@
 version = VERSION
 core = 7.x
 files[] = node.module
-files[] = content_types.inc
-files[] = node.admin.inc
-files[] = node.pages.inc
-files[] = node.install
 files[] = node.test
-files[] = node.tokens.inc
 required = TRUE
 configure = admin/structure/types
 stylesheets[all][] = node.css
diff --git modules/node/tests/node_access_test.info modules/node/tests/node_access_test.info
index e973c8f..e3f041d 100644
--- modules/node/tests/node_access_test.info
+++ modules/node/tests/node_access_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = node_access_test.module
 hidden = TRUE
diff --git modules/openid/openid.info modules/openid/openid.info
index e8ac98d..79a4f38 100644
--- modules/openid/openid.info
+++ modules/openid/openid.info
@@ -4,8 +4,4 @@
 version = VERSION
 package = Core
 core = 7.x
-files[] = openid.module
-files[] = openid.inc
-files[] = openid.pages.inc
-files[] = openid.install
 files[] = openid.test
diff --git modules/openid/tests/openid_test.info modules/openid/tests/openid_test.info
index 7b8a0f6..121515f 100644
--- modules/openid/tests/openid_test.info
+++ modules/openid/tests/openid_test.info
@@ -4,7 +4,5 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = openid_test.install
-files[] = openid_test.module
 dependencies[] = openid
 hidden = TRUE
diff --git modules/overlay/overlay.info modules/overlay/overlay.info
index 7afc059..3572fe4 100644
--- modules/overlay/overlay.info
+++ modules/overlay/overlay.info
@@ -4,5 +4,3 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = overlay.module
-files[] = overlay.install
diff --git modules/path/path.info modules/path/path.info
index f49c877..df26d54 100644
--- modules/path/path.info
+++ modules/path/path.info
@@ -4,7 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = path.module
-files[] = path.admin.inc
 files[] = path.test
 configure = admin/config/search/path
diff --git modules/php/php.info modules/php/php.info
index 2f15883..d87b7ea 100644
--- modules/php/php.info
+++ modules/php/php.info
@@ -4,6 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = php.module
-files[] = php.install
 files[] = php.test
diff --git modules/poll/poll.info modules/poll/poll.info
index a61b1ec..29bed4e 100644
--- modules/poll/poll.info
+++ modules/poll/poll.info
@@ -4,9 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = poll.module
-files[] = poll.pages.inc
-files[] = poll.install
 files[] = poll.test
-files[] = poll.tokens.inc
 stylesheets[all][] = poll.css
diff --git modules/profile/profile.info modules/profile/profile.info
index 0374563..c9711b2 100644
--- modules/profile/profile.info
+++ modules/profile/profile.info
@@ -4,10 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = profile.module
-files[] = profile.admin.inc
-files[] = profile.pages.inc
-files[] = profile.install
 files[] = profile.test
 configure = admin/config/people/profile
 ; The Profile module is deprecated, and included in Drupal 7 for legacy
diff --git modules/rdf/rdf.info modules/rdf/rdf.info
index a4abfdd..6a1e3a3 100644
--- modules/rdf/rdf.info
+++ modules/rdf/rdf.info
@@ -4,6 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = rdf.install
-files[] = rdf.module
 files[] = rdf.test
diff --git modules/rdf/tests/rdf_test.info modules/rdf/tests/rdf_test.info
index 72f6518..6f1344c 100644
--- modules/rdf/tests/rdf_test.info
+++ modules/rdf/tests/rdf_test.info
@@ -4,6 +4,5 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = rdf_test.install
 files[] = rdf_test.module
 hidden = TRUE
diff --git modules/search/search.info modules/search/search.info
index 1483074..07d11e5 100644
--- modules/search/search.info
+++ modules/search/search.info
@@ -4,10 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = search.module
-files[] = search.admin.inc
-files[] = search.pages.inc
-files[] = search.install
 files[] = search.test
 files[] = search.extender.inc
 configure = admin/config/search/settings
diff --git modules/search/tests/search_extra_type.info modules/search/tests/search_extra_type.info
index 3a9a1f3..e87a065 100644
--- modules/search/tests/search_extra_type.info
+++ modules/search/tests/search_extra_type.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = search_extra_type.module
 hidden = TRUE
diff --git modules/shortcut/shortcut.info modules/shortcut/shortcut.info
index 4c3c9e1..bea9d5a 100644
--- modules/shortcut/shortcut.info
+++ modules/shortcut/shortcut.info
@@ -4,8 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = shortcut.module
-files[] = shortcut.admin.inc
-files[] = shortcut.install
 files[] = shortcut.test
 configure = admin/config/user-interface/shortcut
diff --git modules/simpletest/simpletest.info modules/simpletest/simpletest.info
index 69f9d6e..33b911f 100644
--- modules/simpletest/simpletest.info
+++ modules/simpletest/simpletest.info
@@ -4,9 +4,6 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = simpletest.module
-files[] = simpletest.pages.inc
-files[] = simpletest.install
 files[] = simpletest.test
 files[] = drupal_web_test_case.php
 configure = admin/config/development/testing/settings
@@ -44,6 +41,7 @@
 files[] = tests/upgrade/upgrade.comment.test
 files[] = tests/upgrade/upgrade.filter.test
 files[] = tests/upgrade/upgrade.node.test
+files[] = tests/upgrade/upgrade.poll.test
 files[] = tests/upgrade/upgrade.taxonomy.test
 files[] = tests/upgrade/upgrade.upload.test
 files[] = tests/upgrade/upgrade.locale.test
diff --git modules/simpletest/tests/actions_loop_test.info modules/simpletest/tests/actions_loop_test.info
index b842bbf..ca33145 100644
--- modules/simpletest/tests/actions_loop_test.info
+++ modules/simpletest/tests/actions_loop_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = actions_loop_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/ajax_forms_test.info modules/simpletest/tests/ajax_forms_test.info
index 3b8f5f2..d682bfa 100644
--- modules/simpletest/tests/ajax_forms_test.info
+++ modules/simpletest/tests/ajax_forms_test.info
@@ -3,6 +3,5 @@
 description = "Test for AJAX form calls."
 core = 7.x
 package = Testing
-files[] = ajax_forms_test.module
 version = VERSION
 hidden = TRUE
diff --git modules/simpletest/tests/ajax_test.info modules/simpletest/tests/ajax_test.info
index 0d9c32a..aeaadbb 100644
--- modules/simpletest/tests/ajax_test.info
+++ modules/simpletest/tests/ajax_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = ajax_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/batch_test.info modules/simpletest/tests/batch_test.info
index 432c17f..301df51 100644
--- modules/simpletest/tests/batch_test.info
+++ modules/simpletest/tests/batch_test.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = batch_test.module
-files[] = batch_test.callbacks.inc
 hidden = TRUE
diff --git modules/simpletest/tests/common_test.info modules/simpletest/tests/common_test.info
index 7b27416..cc16c25 100644
--- modules/simpletest/tests/common_test.info
+++ modules/simpletest/tests/common_test.info
@@ -4,7 +4,6 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = common_test.module
 stylesheets[all][] = common_test.css
 stylesheets[print][] = common_test.print.css
 hidden = TRUE
diff --git modules/simpletest/tests/database_test.info modules/simpletest/tests/database_test.info
index b8751d7..e357b30 100644
--- modules/simpletest/tests/database_test.info
+++ modules/simpletest/tests/database_test.info
@@ -3,7 +3,5 @@
 description = "Support module for Database layer tests."
 core = 7.x
 package = Testing
-files[] = database_test.module
-files[] = database_test.install
 version = VERSION
 hidden = TRUE
diff --git modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 155de2e..d367ad9 100644
--- modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = drupal_system_listing_compatible_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 491fbda..a86bbca 100644
--- modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = drupal_system_listing_incompatible_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/entity_cache_test.info modules/simpletest/tests/entity_cache_test.info
index 567bf74..01c6d5d 100644
--- modules/simpletest/tests/entity_cache_test.info
+++ modules/simpletest/tests/entity_cache_test.info
@@ -4,6 +4,5 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = entity_cache_test.module
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
diff --git modules/simpletest/tests/entity_crud_hook_test.info modules/simpletest/tests/entity_crud_hook_test.info
index 41119ae..e2ae351 100644
--- modules/simpletest/tests/entity_crud_hook_test.info
+++ modules/simpletest/tests/entity_crud_hook_test.info
@@ -4,6 +4,5 @@
 description = "Support module for CRUD hook tests."
 core = 7.x
 package = Testing
-files[] = entity_crud_hook_test.module
 version = VERSION
 hidden = TRUE
diff --git modules/simpletest/tests/error_test.info modules/simpletest/tests/error_test.info
index 1dac662..0486297 100644
--- modules/simpletest/tests/error_test.info
+++ modules/simpletest/tests/error_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = error_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/filter_test.info modules/simpletest/tests/filter_test.info
index b379267..db1ce6d 100644
--- modules/simpletest/tests/filter_test.info
+++ modules/simpletest/tests/filter_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = filter_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/form_test.info modules/simpletest/tests/form_test.info
index b7030c3..16845f0 100644
--- modules/simpletest/tests/form_test.info
+++ modules/simpletest/tests/form_test.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = form_test.module
-files[] = form_test.file.inc
 hidden = TRUE
diff --git modules/simpletest/tests/image_test.info modules/simpletest/tests/image_test.info
index fb1545d..ded6157 100644
--- modules/simpletest/tests/image_test.info
+++ modules/simpletest/tests/image_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = image_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/menu_test.info modules/simpletest/tests/menu_test.info
index e74dc38..a9f5191 100644
--- modules/simpletest/tests/menu_test.info
+++ modules/simpletest/tests/menu_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = menu_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/module_test.info modules/simpletest/tests/module_test.info
index 4581793..8d0c4e8 100644
--- modules/simpletest/tests/module_test.info
+++ modules/simpletest/tests/module_test.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = module_test.module
-files[] = module_test.file.inc
 hidden = TRUE
diff --git modules/simpletest/tests/requirements1_test.info modules/simpletest/tests/requirements1_test.info
index 6b075df..0a1cf3a 100644
--- modules/simpletest/tests/requirements1_test.info
+++ modules/simpletest/tests/requirements1_test.info
@@ -4,6 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = requirements1_test.install
-files[] = requirements1_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/requirements2_test.info modules/simpletest/tests/requirements2_test.info
index 9f2ae0a..bcf613c 100644
--- modules/simpletest/tests/requirements2_test.info
+++ modules/simpletest/tests/requirements2_test.info
@@ -6,5 +6,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = requirements2_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/session_test.info modules/simpletest/tests/session_test.info
index 08034ff..2ae4b82 100644
--- modules/simpletest/tests/session_test.info
+++ modules/simpletest/tests/session_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = session_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/system_dependencies_test.info modules/simpletest/tests/system_dependencies_test.info
index c5748cf..55d8971 100644
--- modules/simpletest/tests/system_dependencies_test.info
+++ modules/simpletest/tests/system_dependencies_test.info
@@ -4,6 +4,5 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = system_dependencies_test.module
 hidden = TRUE
 dependencies[] = _missing_dependency
diff --git modules/simpletest/tests/system_test.info modules/simpletest/tests/system_test.info
index f70a1a7..e176596 100644
--- modules/simpletest/tests/system_test.info
+++ modules/simpletest/tests/system_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = system_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/taxonomy_test.info modules/simpletest/tests/taxonomy_test.info
index 6c5cd2f..eaa9c04 100644
--- modules/simpletest/tests/taxonomy_test.info
+++ modules/simpletest/tests/taxonomy_test.info
@@ -4,6 +4,5 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = taxonomy_test.module
 hidden = TRUE
 dependencies[] = taxonomy
diff --git modules/simpletest/tests/theme_test.info modules/simpletest/tests/theme_test.info
index 2a35cad..d3b8a7e 100644
--- modules/simpletest/tests/theme_test.info
+++ modules/simpletest/tests/theme_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = theme_test.module
 hidden = TRUE
diff --git modules/simpletest/tests/update_test_1.info modules/simpletest/tests/update_test_1.info
index 7f12812..a55878e 100644
--- modules/simpletest/tests/update_test_1.info
+++ modules/simpletest/tests/update_test_1.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_1.module
-files[] = update_test_1.install
 hidden = TRUE
diff --git modules/simpletest/tests/update_test_2.info modules/simpletest/tests/update_test_2.info
index 00db1eb..a55878e 100644
--- modules/simpletest/tests/update_test_2.info
+++ modules/simpletest/tests/update_test_2.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_2.module
-files[] = update_test_2.install
 hidden = TRUE
diff --git modules/simpletest/tests/update_test_3.info modules/simpletest/tests/update_test_3.info
index c193f42..a55878e 100644
--- modules/simpletest/tests/update_test_3.info
+++ modules/simpletest/tests/update_test_3.info
@@ -4,6 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_3.module
-files[] = update_test_3.install
 hidden = TRUE
diff --git modules/simpletest/tests/url_alter_test.info modules/simpletest/tests/url_alter_test.info
index 7e72b4f..0d1deb2 100644
--- modules/simpletest/tests/url_alter_test.info
+++ modules/simpletest/tests/url_alter_test.info
@@ -4,6 +4,4 @@
 core = 7.x
 package = Testing
 version = VERSION
-files[] = url_alter_test.module
-files[] = url_alter_test.install
 hidden = TRUE
diff --git modules/simpletest/tests/xmlrpc_test.info modules/simpletest/tests/xmlrpc_test.info
index 3fdffc3..773015d 100644
--- modules/simpletest/tests/xmlrpc_test.info
+++ modules/simpletest/tests/xmlrpc_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = xmlrpc_test.module
 hidden = TRUE
diff --git modules/statistics/statistics.info modules/statistics/statistics.info
index de07d15..4075e6e 100644
--- modules/statistics/statistics.info
+++ modules/statistics/statistics.info
@@ -4,10 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = statistics.module
-files[] = statistics.admin.inc
-files[] = statistics.pages.inc
-files[] = statistics.install
 files[] = statistics.test
-files[] = statistics.tokens.inc
 configure = admin/config/system/statistics
diff --git modules/syslog/syslog.info modules/syslog/syslog.info
index ff6246a..01a5b88 100644
--- modules/syslog/syslog.info
+++ modules/syslog/syslog.info
@@ -4,5 +4,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = syslog.module
 files[] = syslog.test
diff --git modules/system/system.info modules/system/system.info
index 394eea9..469add6 100644
--- modules/system/system.info
+++ modules/system/system.info
@@ -4,15 +4,9 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = system.module
-files[] = system.admin.inc
 files[] = system.archiver.inc
 files[] = system.queue.inc
-files[] = image.gd.inc
-files[] = system.install
 files[] = system.test
-files[] = system.tar.inc
-files[] = system.tokens.inc
 files[] = system.updater.inc
 files[] = system.mail.inc
 required = TRUE
diff --git modules/taxonomy/taxonomy.info modules/taxonomy/taxonomy.info
index 3c8c62e..88e51e3 100644
--- modules/taxonomy/taxonomy.info
+++ modules/taxonomy/taxonomy.info
@@ -6,9 +6,5 @@
 core = 7.x
 dependencies[] = options
 files[] = taxonomy.module
-files[] = taxonomy.admin.inc
-files[] = taxonomy.pages.inc
-files[] = taxonomy.install
 files[] = taxonomy.test
-files[] = taxonomy.tokens.inc
 configure = admin/structure/taxonomy
diff --git modules/toolbar/toolbar.info modules/toolbar/toolbar.info
index 92fd7bb..3178279 100644
--- modules/toolbar/toolbar.info
+++ modules/toolbar/toolbar.info
@@ -4,4 +4,3 @@
 core = 7.x
 package = Core
 version = VERSION
-files[] = toolbar.module
diff --git modules/tracker/tracker.info modules/tracker/tracker.info
index 253e83f..095efcb 100644
--- modules/tracker/tracker.info
+++ modules/tracker/tracker.info
@@ -5,6 +5,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = tracker.module
-files[] = tracker.pages.inc
 files[] = tracker.test
diff --git modules/translation/tests/translation_test.info modules/translation/tests/translation_test.info
index c4c1a8e..0b9856f 100644
--- modules/translation/tests/translation_test.info
+++ modules/translation/tests/translation_test.info
@@ -3,6 +3,5 @@
 description = "Support module for the content translation tests."
 core = 7.x
 package = Testing
-files[] = translation_test.module
 version = VERSION
 hidden = TRUE
diff --git modules/translation/translation.info modules/translation/translation.info
index 3f6841c..de3a316 100644
--- modules/translation/translation.info
+++ modules/translation/translation.info
@@ -5,6 +5,4 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = translation.module
-files[] = translation.pages.inc
 files[] = translation.test
diff --git modules/trigger/tests/trigger_test.info modules/trigger/tests/trigger_test.info
index 878f9f9..39de978 100644
--- modules/trigger/tests/trigger_test.info
+++ modules/trigger/tests/trigger_test.info
@@ -3,5 +3,4 @@
 description = "Support module for Trigger tests."
 package = Testing
 core = 7.x
-files[] = trigger_test.module
 hidden = TRUE
diff --git modules/trigger/trigger.info modules/trigger/trigger.info
index df5354d..4361965 100644
--- modules/trigger/trigger.info
+++ modules/trigger/trigger.info
@@ -4,8 +4,5 @@
 package = Core
 version = VERSION
 core = 7.x
-files[] = trigger.module
-files[] = trigger.admin.inc
-files[] = trigger.install
 files[] = trigger.test
 configure = admin/structure/trigger
diff --git modules/update/tests/update_test.info modules/update/tests/update_test.info
index 10445c2..cd02c4b 100644
--- modules/update/tests/update_test.info
+++ modules/update/tests/update_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test.module
 hidden = TRUE
diff --git modules/update/update.info modules/update/update.info
index 447d486..85944e5 100644
--- modules/update/update.info
+++ modules/update/update.info
@@ -4,13 +4,5 @@
 version = VERSION
 package = Core
 core = 7.x
-files[] = update.install
-files[] = update.module
-files[] = update.authorize.inc
-files[] = update.compare.inc
-files[] = update.fetch.inc
-files[] = update.manager.inc
-files[] = update.report.inc
-files[] = update.settings.inc
 files[] = update.test
 configure = admin/reports/updates/settings
diff --git modules/user/tests/user_form_test.info modules/user/tests/user_form_test.info
index ca7b9e7..07f92dc 100644
--- modules/user/tests/user_form_test.info
+++ modules/user/tests/user_form_test.info
@@ -4,5 +4,4 @@
 package = Testing
 version = VERSION
 core = 7.x
-files[] = user_form_test.module
 hidden = TRUE
diff --git modules/user/user.info modules/user/user.info
index cfe9c15..f692ae2 100644
--- modules/user/user.info
+++ modules/user/user.info
@@ -5,11 +5,7 @@
 version = VERSION
 core = 7.x
 files[] = user.module
-files[] = user.admin.inc
-files[] = user.pages.inc
-files[] = user.install
 files[] = user.test
-files[] = user.tokens.inc
 required = TRUE
 configure = admin/config/people
 stylesheets[all][] = user.css
diff --git profiles/minimal/minimal.info profiles/minimal/minimal.info
index f4794df..0679274 100644
--- profiles/minimal/minimal.info
+++ profiles/minimal/minimal.info
@@ -5,4 +5,3 @@
 core = 7.x
 dependencies[] = block
 dependencies[] = dblog
-files[] = minimal.profile
diff --git profiles/standard/standard.info profiles/standard/standard.info
index d49b3d1..97a5096 100644
--- profiles/standard/standard.info
+++ profiles/standard/standard.info
@@ -24,4 +24,3 @@
 dependencies[] = field_ui
 dependencies[] = file
 dependencies[] = rdf
-files[] = standard.profile
