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 @@ description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
 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/block/block.info modules/block/block.info
index c371607..194b6bf 100644
--- modules/block/block.info
+++ modules/block/block.info
@@ -4,8 +4,5 @@ description = Controls the visual building blocks a page is constructed with. Bl
 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/blog/blog.info modules/blog/blog.info
index 938993c..cacb217 100644
--- modules/blog/blog.info
+++ modules/blog/blog.info
@@ -5,6 +5,4 @@ description = Enables multi-user blogs.
 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 @@ description = Allows users to create and organize related content in an outline.
 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 @@ description = Allows administrators to change the color scheme of compatible the
 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 @@ version = VERSION
 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 @@ description = Enables the use of both personal and site-wide contact forms.
 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 @@ description = Provides contextual links to perform actions related to elements o
 package = Core
 version = VERSION
 core = 7.x
-files[] = contextual.module
diff --git modules/dashboard/dashboard.info modules/dashboard/dashboard.info
index 5ad675d..d63fe1c 100644
--- modules/dashboard/dashboard.info
+++ modules/dashboard/dashboard.info
@@ -4,7 +4,5 @@ description = Provides a dashboard page in the administrative interface for orga
 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 @@ description = Logs and records system events to the database.
 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 @@ package = Core
 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 @@ package = Core
 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 08b7e22..6b9879c 100644
--- modules/field/modules/list/list.info
+++ modules/field/modules/list/list.info
@@ -5,6 +5,5 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = list.module
 files[] = tests/list.test
 required = TRUE
diff --git modules/field/modules/number/number.info modules/field/modules/number/number.info
index 8d9756f..3762a93 100644
--- modules/field/modules/number/number.info
+++ modules/field/modules/number/number.info
@@ -5,5 +5,4 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = number.module
 required = TRUE
diff --git modules/field/modules/options/options.info modules/field/modules/options/options.info
index b2836fb..eeed406 100644
--- modules/field/modules/options/options.info
+++ modules/field/modules/options/options.info
@@ -5,6 +5,5 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = options.module
 files[] = options.test
 required = TRUE
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 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = text.module
 files[] = text.test
 required = 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 @@ package = Core
 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 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = file.module
-files[] = file.field.inc
-files[] = file.install
 files[] = tests/file.test
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 @@ description = Filters content in preparation for display.
 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 @@ dependencies[] = comment
 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 @@ description = Manages the display of online help.
 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 @@ package = Core
 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/locale/locale.info modules/locale/locale.info
index 461f207..79bd6c0 100644
--- modules/locale/locale.info
+++ modules/locale/locale.info
@@ -4,8 +4,5 @@ description = Adds language handling functionality and enables the translation o
 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/menu/menu.info modules/menu/menu.info
index 2854295..2d700e6 100644
--- modules/menu/menu.info
+++ modules/menu/menu.info
@@ -4,8 +4,5 @@ description = Allows administrators to customize the site navigation menu.
 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 @@ package = Core
 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/openid/openid.info modules/openid/openid.info
index e8ac98d..79a4f38 100644
--- modules/openid/openid.info
+++ modules/openid/openid.info
@@ -4,8 +4,4 @@ description = "Allows users to log into your site using OpenID."
 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/overlay/overlay.info modules/overlay/overlay.info
index 7afc059..3572fe4 100644
--- modules/overlay/overlay.info
+++ modules/overlay/overlay.info
@@ -4,5 +4,3 @@ description = Displays the Drupal administration interface in an overlay.
 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 @@ description = Allows users to rename URLs.
 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 @@ description = Allows embedded PHP code/snippets to be evaluated.
 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 @@ description = Allows your site to capture votes on different topics in the form
 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 cc27ac1..7eaa3b0 100644
--- modules/profile/profile.info
+++ modules/profile/profile.info
@@ -4,9 +4,5 @@ description = Supports configurable user profiles.
 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
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 @@ description = Enriches your content with metadata to let other applications (e.g
 package = Core
 version = VERSION
 core = 7.x
-files[] = rdf.install
-files[] = rdf.module
 files[] = rdf.test
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 @@ description = Enables site-wide keyword searching.
 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/shortcut/shortcut.info modules/shortcut/shortcut.info
index 4c3c9e1..bea9d5a 100644
--- modules/shortcut/shortcut.info
+++ modules/shortcut/shortcut.info
@@ -4,8 +4,5 @@ description = Allows users to manage customizable lists of shortcut links.
 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 139e49c..b3713c2 100644
--- modules/simpletest/simpletest.info
+++ modules/simpletest/simpletest.info
@@ -4,9 +4,6 @@ description = Provides a framework for unit and functional testing.
 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
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 @@ description = Logs access statistics for your site.
 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 @@ description = Logs and records system events to syslog.
 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..817873b 100644
--- modules/system/system.info
+++ modules/system/system.info
@@ -4,15 +4,10 @@ description = Handles general site configuration for administrators.
 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 de9288c..3702b26 100644
--- modules/taxonomy/taxonomy.info
+++ modules/taxonomy/taxonomy.info
@@ -5,9 +5,5 @@ package = Core
 version = VERSION
 core = 7.x
 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 @@ description = Provides a toolbar that shows the top-level administration menu it
 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 @@ dependencies[] = comment
 package = Core
 version = VERSION
 core = 7.x
-files[] = tracker.module
-files[] = tracker.pages.inc
 files[] = tracker.test
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 @@ dependencies[] = locale
 package = Core
 version = VERSION
 core = 7.x
-files[] = translation.module
-files[] = translation.pages.inc
 files[] = translation.test
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 @@ description = Enables actions to be fired on certain system events, such as when
 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/update.info modules/update/update.info
index 447d486..85944e5 100644
--- modules/update/update.info
+++ modules/update/update.info
@@ -4,13 +4,5 @@ description = Checks for available updates, and can securely install or update m
 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/user.info modules/user/user.info
index cfe9c15..f692ae2 100644
--- modules/user/user.info
+++ modules/user/user.info
@@ -5,11 +5,7 @@ package = Core
 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