#915174 by sdboyer, sun: Remove pointless files[] declarations on files that are not declaring classes.

93 files changed, 4 insertions, 207 deletions

diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index ae67bbb83..d97d68bac 100644
--- a/modules/aggregator/aggregator.info
+++ b/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 a/modules/aggregator/tests/aggregator_test.info b/modules/aggregator/tests/aggregator_test.info
index 1cc6ebfe8..1a6651341 100644
--- a/modules/aggregator/tests/aggregator_test.info
+++ b/modules/aggregator/tests/aggregator_test.info
@@ -4,5 +4,4 @@ description = "Support module for aggregator related testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = aggregator_test.module
 hidden = TRUE
diff --git a/modules/block/block.info b/modules/block/block.info
index c3716075c..194b6bf45 100644
--- a/modules/block/block.info
+++ b/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 a/modules/block/tests/block_test.info b/modules/block/tests/block_test.info
index 3b9b80b2f..e39474053 100644
--- a/modules/block/tests/block_test.info
+++ b/modules/block/tests/block_test.info
@@ -4,5 +4,4 @@ description = Provides test blocks.
 package = Testing
 version = VERSION
 core = 7.x
-files[] = block_test.module
 hidden = TRUE
diff --git a/modules/blog/blog.info b/modules/blog/blog.info
index 938993c0e..a2a3bee96 100644
--- a/modules/blog/blog.info
+++ b/modules/blog/blog.info
@@ -1,10 +1,7 @@
 ; $Id$
-
 name = Blog
 description = Enables multi-user blogs.
 package = Core
 version = VERSION
 core = 7.x
-files[] = blog.module
-files[] = blog.pages.inc
 files[] = blog.test
diff --git a/modules/book/book.info b/modules/book/book.info
index c9dd5b97e..14b72d041 100644
--- a/modules/book/book.info
+++ b/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 a/modules/color/color.info b/modules/color/color.info
index 47a93ba7f..0d6a42d1e 100644
--- a/modules/color/color.info
+++ b/modules/color/color.info
@@ -1,10 +1,7 @@
 ; $Id$
-
 name = Color
 description = Allows administrators to change the color scheme of compatible themes.
 package = Core
 version = VERSION
 core = 7.x
-files[] = color.module
-files[] = color.install
 files[] = color.test
diff --git a/modules/comment/comment.info b/modules/comment/comment.info
index b4374c3c6..d244ddf99 100644
--- a/modules/comment/comment.info
+++ b/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 a/modules/contact/contact.info b/modules/contact/contact.info
index a2f7f4c52..adefb112a 100644
--- a/modules/contact/contact.info
+++ b/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 a/modules/contact/contact.module b/modules/contact/contact.module
index 0dcf67d86..d06b90d8b 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -116,7 +116,7 @@ function contact_menu() {
  *   TRUE if the current user has access to the requested user's contact form,
  *   or FALSE otherwise.
  */
-function _contact_personal_tab_access(stdClass $account) {
+function _contact_personal_tab_access($account) {
   global $user;
 
   // Anonymous users cannot have contact forms.
diff --git a/modules/contextual/contextual.info b/modules/contextual/contextual.info
index 71f465bc1..83839b4c3 100644
--- a/modules/contextual/contextual.info
+++ b/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 a/modules/dashboard/dashboard.info b/modules/dashboard/dashboard.info
index 5ad675d12..6b0796575 100644
--- a/modules/dashboard/dashboard.info
+++ b/modules/dashboard/dashboard.info
@@ -4,7 +4,6 @@ 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 a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 6b9f82390..35b01489a 100644
--- a/modules/dblog/dblog.info
+++ b/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 a/modules/field/field.info b/modules/field/field.info
index 06de4084f..3a1b20d51 100644
--- a/modules/field/field.info
+++ b/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 a/modules/field/modules/field_sql_storage/field_sql_storage.info b/modules/field/modules/field_sql_storage/field_sql_storage.info
index fe21172e3..4d7a2e8eb 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.info
+++ b/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 a/modules/field/modules/list/list.info b/modules/field/modules/list/list.info
index 3f64b0bac..250b1ba28 100644
--- a/modules/field/modules/list/list.info
+++ b/modules/field/modules/list/list.info
@@ -6,5 +6,4 @@ version = VERSION
 core = 7.x
 dependencies[] = field
 dependencies[] = options
-files[] = list.module
 files[] = tests/list.test
diff --git a/modules/field/modules/list/tests/list_test.info b/modules/field/modules/list/tests/list_test.info
index 32fec873d..62cc3138e 100644
--- a/modules/field/modules/list/tests/list_test.info
+++ b/modules/field/modules/list/tests/list_test.info
@@ -3,6 +3,5 @@ name = "List test"
 description = "Support module for the List module tests."
 core = 7.x
 package = Testing
-files[] = list_test.module
 version = VERSION
 hidden = TRUE
diff --git a/modules/field/modules/number/number.info b/modules/field/modules/number/number.info
index 02997aebe..ea1c3651f 100644
--- a/modules/field/modules/number/number.info
+++ b/modules/field/modules/number/number.info
@@ -5,5 +5,4 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = number.module
 files[] = number.test
diff --git a/modules/field/modules/options/options.info b/modules/field/modules/options/options.info
index 0612afc1e..f040ae93b 100644
--- a/modules/field/modules/options/options.info
+++ b/modules/field/modules/options/options.info
@@ -5,5 +5,4 @@ package = Core
 version = VERSION
 core = 7.x
 dependencies[] = field
-files[] = options.module
 files[] = options.test
diff --git a/modules/field/modules/text/text.info b/modules/field/modules/text/text.info
index 4e50e0ba9..0117dc13c 100644
--- a/modules/field/modules/text/text.info
+++ b/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 a/modules/field/tests/field_test.info b/modules/field/tests/field_test.info
index b875e59f5..15fb06542 100644
--- a/modules/field/tests/field_test.info
+++ b/modules/field/tests/field_test.info
@@ -3,10 +3,6 @@ name = "Field API Test"
 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 a/modules/field_ui/field_ui.info b/modules/field_ui/field_ui.info
index 46e3eb7a1..852447365 100644
--- a/modules/field_ui/field_ui.info
+++ b/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 a/modules/file/file.info b/modules/file/file.info
index 5c36ac92d..ac3402266 100644
--- a/modules/file/file.info
+++ b/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 a/modules/file/tests/file_module_test.info b/modules/file/tests/file_module_test.info
index 1f154e060..50e2bd4b2 100644
--- a/modules/file/tests/file_module_test.info
+++ b/modules/file/tests/file_module_test.info
@@ -4,5 +4,4 @@ description = Provides hooks for testing File module functionality.
 package = Core
 version = VERSION
 core = 7.x
-files[] = file_module_test.module
 hidden = TRUE
diff --git a/modules/filter/filter.info b/modules/filter/filter.info
index 0135de71a..b830bc625 100644
--- a/modules/filter/filter.info
+++ b/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 a/modules/forum/forum.info b/modules/forum/forum.info
index d4998fc38..3478e6637 100644
--- a/modules/forum/forum.info
+++ b/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 a/modules/help/help.info b/modules/help/help.info
index 4c84b2621..cdae549d7 100644
--- a/modules/help/help.info
+++ b/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 a/modules/image/image.info b/modules/image/image.info
index 137acc248..97b947ba4 100644
--- a/modules/image/image.info
+++ b/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 a/modules/locale/locale.info b/modules/locale/locale.info
index 461f207e9..79bd6c007 100644
--- a/modules/locale/locale.info
+++ b/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 a/modules/locale/tests/locale_test.info b/modules/locale/tests/locale_test.info
index 3d8d2f195..f3eb2f1f4 100644
--- a/modules/locale/tests/locale_test.info
+++ b/modules/locale/tests/locale_test.info
@@ -3,6 +3,5 @@ name = "Locale Test"
 description = "Support module for the locale layer tests."
 core = 7.x
 package = Testing
-files[] = locale_test.module
 version = VERSION
 hidden = TRUE
diff --git a/modules/menu/menu.info b/modules/menu/menu.info
index 285429598..2d700e663 100644
--- a/modules/menu/menu.info
+++ b/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 a/modules/node/node.info b/modules/node/node.info
index 23cc23099..9767f7ee3 100644
--- a/modules/node/node.info
+++ b/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 a/modules/node/tests/node_access_test.info b/modules/node/tests/node_access_test.info
index e973c8fed..e3f041d12 100644
--- a/modules/node/tests/node_access_test.info
+++ b/modules/node/tests/node_access_test.info
@@ -4,5 +4,4 @@ description = "Support module for node permission testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = node_access_test.module
 hidden = TRUE
diff --git a/modules/node/tests/node_test.info b/modules/node/tests/node_test.info
index 2624f30c4..5c171233b 100644
--- a/modules/node/tests/node_test.info
+++ b/modules/node/tests/node_test.info
@@ -4,5 +4,4 @@ description = "Support module for node related testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = node_test.module
 hidden = TRUE
diff --git a/modules/node/tests/node_test_exception.info b/modules/node/tests/node_test_exception.info
index afe5b3719..ba1b81706 100644
--- a/modules/node/tests/node_test_exception.info
+++ b/modules/node/tests/node_test_exception.info
@@ -4,5 +4,4 @@ description = "Support module for node related exception testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = node_test_exception.module
 hidden = TRUE
diff --git a/modules/openid/openid.info b/modules/openid/openid.info
index e8ac98de7..79a4f3889 100644
--- a/modules/openid/openid.info
+++ b/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 a/modules/openid/tests/openid_test.info b/modules/openid/tests/openid_test.info
index 7b8a0f698..121515f20 100644
--- a/modules/openid/tests/openid_test.info
+++ b/modules/openid/tests/openid_test.info
@@ -4,7 +4,5 @@ description = "OpenID provider used for testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = openid_test.install
-files[] = openid_test.module
 dependencies[] = openid
 hidden = TRUE
diff --git a/modules/overlay/overlay.info b/modules/overlay/overlay.info
index 7afc0597e..3572fe409 100644
--- a/modules/overlay/overlay.info
+++ b/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 a/modules/path/path.info b/modules/path/path.info
index f49c87726..df26d5487 100644
--- a/modules/path/path.info
+++ b/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 a/modules/php/php.info b/modules/php/php.info
index 2f1588340..d87b7ea7c 100644
--- a/modules/php/php.info
+++ b/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 a/modules/poll/poll.info b/modules/poll/poll.info
index a61b1ec66..29bed4ebb 100644
--- a/modules/poll/poll.info
+++ b/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 a/modules/profile/profile.info b/modules/profile/profile.info
index 03745635c..c9711b2ca 100644
--- a/modules/profile/profile.info
+++ b/modules/profile/profile.info
@@ -4,10 +4,6 @@ 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
 ; The Profile module is deprecated, and included in Drupal 7 for legacy
diff --git a/modules/rdf/rdf.info b/modules/rdf/rdf.info
index a4abfdd57..6a1e3a369 100644
--- a/modules/rdf/rdf.info
+++ b/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 a/modules/rdf/tests/rdf_test.info b/modules/rdf/tests/rdf_test.info
index 72f6518ec..e4418f486 100644
--- a/modules/rdf/tests/rdf_test.info
+++ b/modules/rdf/tests/rdf_test.info
@@ -4,6 +4,4 @@ description = "Support module for RDF module testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = rdf_test.install
-files[] = rdf_test.module
 hidden = TRUE
diff --git a/modules/search/search.info b/modules/search/search.info
index 1483074a2..8cbd7a549 100644
--- a/modules/search/search.info
+++ b/modules/search/search.info
@@ -4,11 +4,7 @@ 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
+files[] = search.test
 configure = admin/config/search/settings
 stylesheets[all][] = search.css
diff --git a/modules/search/tests/search_embedded_form.info b/modules/search/tests/search_embedded_form.info
index 54455134b..f0752a241 100644
--- a/modules/search/tests/search_embedded_form.info
+++ b/modules/search/tests/search_embedded_form.info
@@ -4,5 +4,4 @@ description = "Support module for search module testing of embedded forms."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = search_embedded_form.module
 hidden = TRUE
diff --git a/modules/search/tests/search_extra_type.info b/modules/search/tests/search_extra_type.info
index 3a9a1f323..e87a0650c 100644
--- a/modules/search/tests/search_extra_type.info
+++ b/modules/search/tests/search_extra_type.info
@@ -4,5 +4,4 @@ description = "Support module for search module testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = search_extra_type.module
 hidden = TRUE
diff --git a/modules/shortcut/shortcut.info b/modules/shortcut/shortcut.info
index 4c3c9e1a7..bea9d5aa0 100644
--- a/modules/shortcut/shortcut.info
+++ b/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 a/modules/simpletest/simpletest.info b/modules/simpletest/simpletest.info
index 69f9d6e3d..732c707cc 100644
--- a/modules/simpletest/simpletest.info
+++ b/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 a/modules/simpletest/tests/actions_loop_test.info b/modules/simpletest/tests/actions_loop_test.info
index b842bbf6b..ca33145fd 100644
--- a/modules/simpletest/tests/actions_loop_test.info
+++ b/modules/simpletest/tests/actions_loop_test.info
@@ -4,5 +4,4 @@ description = Support module for action loop testing.
 package = Testing
 version = VERSION
 core = 7.x
-files[] = actions_loop_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/ajax_forms_test.info b/modules/simpletest/tests/ajax_forms_test.info
index 3b8f5f23e..d682bfac5 100644
--- a/modules/simpletest/tests/ajax_forms_test.info
+++ b/modules/simpletest/tests/ajax_forms_test.info
@@ -3,6 +3,5 @@ name = "AJAX form test mock module"
 description = "Test for AJAX form calls."
 core = 7.x
 package = Testing
-files[] = ajax_forms_test.module
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/ajax_test.info b/modules/simpletest/tests/ajax_test.info
index 0d9c32a46..aeaadbbe5 100644
--- a/modules/simpletest/tests/ajax_test.info
+++ b/modules/simpletest/tests/ajax_test.info
@@ -4,5 +4,4 @@ description = Support module for AJAX framework tests.
 package = Testing
 version = VERSION
 core = 7.x
-files[] = ajax_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/batch_test.info b/modules/simpletest/tests/batch_test.info
index 432c17ff7..301df517e 100644
--- a/modules/simpletest/tests/batch_test.info
+++ b/modules/simpletest/tests/batch_test.info
@@ -4,6 +4,4 @@ description = "Support module for Batch API tests."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = batch_test.module
-files[] = batch_test.callbacks.inc
 hidden = TRUE
diff --git a/modules/simpletest/tests/common_test.info b/modules/simpletest/tests/common_test.info
index 7b27416ae..cc16c2551 100644
--- a/modules/simpletest/tests/common_test.info
+++ b/modules/simpletest/tests/common_test.info
@@ -4,7 +4,6 @@ description = "Support module for Common tests."
 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 a/modules/simpletest/tests/database_test.info b/modules/simpletest/tests/database_test.info
index b8751d774..e357b30ed 100644
--- a/modules/simpletest/tests/database_test.info
+++ b/modules/simpletest/tests/database_test.info
@@ -3,7 +3,5 @@ name = "Database Test"
 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 a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
index 155de2ed7..d367ad92f 100644
--- a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
@@ -4,5 +4,4 @@ description = "Support module for testing the drupal_system_listing function."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = drupal_system_listing_compatible_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
index 491fbda2f..a86bbca4b 100644
--- a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
+++ b/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
@@ -4,5 +4,4 @@ description = "Support module for testing the drupal_system_listing function."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = drupal_system_listing_incompatible_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_cache_test.info b/modules/simpletest/tests/entity_cache_test.info
index 567bf74d2..01c6d5d06 100644
--- a/modules/simpletest/tests/entity_cache_test.info
+++ b/modules/simpletest/tests/entity_cache_test.info
@@ -4,6 +4,5 @@ description = "Support module for testing entity cache."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = entity_cache_test.module
 dependencies[] = entity_cache_test_dependency
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/modules/simpletest/tests/entity_cache_test_dependency.info
index dac380f5e..7e9cdc704 100644
--- a/modules/simpletest/tests/entity_cache_test_dependency.info
+++ b/modules/simpletest/tests/entity_cache_test_dependency.info
@@ -4,5 +4,4 @@ description = "Support dependency module for testing entity cache."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = entity_cache_test_dependency.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/modules/simpletest/tests/entity_crud_hook_test.info
index 41119ae6f..5cc2ad96d 100644
--- a/modules/simpletest/tests/entity_crud_hook_test.info
+++ b/modules/simpletest/tests/entity_crud_hook_test.info
@@ -1,9 +1,7 @@
 ; $Id$
-
 name = "Entity CRUD Hooks Test"
 description = "Support module for CRUD hook tests."
 core = 7.x
 package = Testing
-files[] = entity_crud_hook_test.module
 version = VERSION
 hidden = TRUE
diff --git a/modules/simpletest/tests/error_test.info b/modules/simpletest/tests/error_test.info
index 1dac66247..0486297cf 100644
--- a/modules/simpletest/tests/error_test.info
+++ b/modules/simpletest/tests/error_test.info
@@ -4,5 +4,4 @@ description = "Support module for error and exception testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = error_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/filter_test.info b/modules/simpletest/tests/filter_test.info
index b37926749..db1ce6d4b 100644
--- a/modules/simpletest/tests/filter_test.info
+++ b/modules/simpletest/tests/filter_test.info
@@ -4,5 +4,4 @@ description = Tests filter hooks and functions.
 package = Testing
 version = VERSION
 core = 7.x
-files[] = filter_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/form_test.info b/modules/simpletest/tests/form_test.info
index b7030c339..16845f072 100644
--- a/modules/simpletest/tests/form_test.info
+++ b/modules/simpletest/tests/form_test.info
@@ -4,6 +4,4 @@ description = "Support module for Form API tests."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = form_test.module
-files[] = form_test.file.inc
 hidden = TRUE
diff --git a/modules/simpletest/tests/image_test.info b/modules/simpletest/tests/image_test.info
index fb1545d5c..ded61571a 100644
--- a/modules/simpletest/tests/image_test.info
+++ b/modules/simpletest/tests/image_test.info
@@ -4,5 +4,4 @@ description = "Support module for image toolkit tests."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = image_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/menu_test.info b/modules/simpletest/tests/menu_test.info
index e74dc38e4..a9f519172 100644
--- a/modules/simpletest/tests/menu_test.info
+++ b/modules/simpletest/tests/menu_test.info
@@ -4,5 +4,4 @@ description = "Support module for menu hook testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = menu_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/module_test.info b/modules/simpletest/tests/module_test.info
index 45817934a..8d0c4e85b 100644
--- a/modules/simpletest/tests/module_test.info
+++ b/modules/simpletest/tests/module_test.info
@@ -4,6 +4,4 @@ description = "Support module for module system testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = module_test.module
-files[] = module_test.file.inc
 hidden = TRUE
diff --git a/modules/simpletest/tests/requirements1_test.info b/modules/simpletest/tests/requirements1_test.info
index 6b075dfdf..0a1cf3a1f 100644
--- a/modules/simpletest/tests/requirements1_test.info
+++ b/modules/simpletest/tests/requirements1_test.info
@@ -4,6 +4,4 @@ description = "Tests that a module is not installed when it fails hook_requireme
 package = Core
 version = VERSION
 core = 7.x
-files[] = requirements1_test.install
-files[] = requirements1_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/requirements2_test.info b/modules/simpletest/tests/requirements2_test.info
index 9f2ae0abf..bcf613c34 100644
--- a/modules/simpletest/tests/requirements2_test.info
+++ b/modules/simpletest/tests/requirements2_test.info
@@ -6,5 +6,4 @@ dependencies[] = comment
 package = Core
 version = VERSION
 core = 7.x
-files[] = requirements2_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/session_test.info b/modules/simpletest/tests/session_test.info
index 08034ffdd..2ae4b826b 100644
--- a/modules/simpletest/tests/session_test.info
+++ b/modules/simpletest/tests/session_test.info
@@ -4,5 +4,4 @@ description = "Support module for session data testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = session_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/system_dependencies_test.info b/modules/simpletest/tests/system_dependencies_test.info
index c5748cff2..55d8971b3 100644
--- a/modules/simpletest/tests/system_dependencies_test.info
+++ b/modules/simpletest/tests/system_dependencies_test.info
@@ -4,6 +4,5 @@ description = "Support module for testing system dependencies."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = system_dependencies_test.module
 hidden = TRUE
 dependencies[] = _missing_dependency
diff --git a/modules/simpletest/tests/taxonomy_test.info b/modules/simpletest/tests/taxonomy_test.info
index 6c5cd2fad..eaa9c04f5 100644
--- a/modules/simpletest/tests/taxonomy_test.info
+++ b/modules/simpletest/tests/taxonomy_test.info
@@ -4,6 +4,5 @@ description = "Tests functions and hooks not used in core".
 package = Testing
 version = VERSION
 core = 7.x
-files[] = taxonomy_test.module
 hidden = TRUE
 dependencies[] = taxonomy
diff --git a/modules/simpletest/tests/theme_test.info b/modules/simpletest/tests/theme_test.info
index 2a35cad76..d3b8a7edf 100644
--- a/modules/simpletest/tests/theme_test.info
+++ b/modules/simpletest/tests/theme_test.info
@@ -4,5 +4,4 @@ description = "Support module for theme system testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = theme_test.module
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_1.info b/modules/simpletest/tests/update_test_1.info
index 7f1281295..a55878edf 100644
--- a/modules/simpletest/tests/update_test_1.info
+++ b/modules/simpletest/tests/update_test_1.info
@@ -4,6 +4,4 @@ description = "Support module for update testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_1.module
-files[] = update_test_1.install
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_2.info b/modules/simpletest/tests/update_test_2.info
index 00db1eb98..a55878edf 100644
--- a/modules/simpletest/tests/update_test_2.info
+++ b/modules/simpletest/tests/update_test_2.info
@@ -4,6 +4,4 @@ description = "Support module for update testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_2.module
-files[] = update_test_2.install
 hidden = TRUE
diff --git a/modules/simpletest/tests/update_test_3.info b/modules/simpletest/tests/update_test_3.info
index c193f4274..a55878edf 100644
--- a/modules/simpletest/tests/update_test_3.info
+++ b/modules/simpletest/tests/update_test_3.info
@@ -4,6 +4,4 @@ description = "Support module for update testing."
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test_3.module
-files[] = update_test_3.install
 hidden = TRUE
diff --git a/modules/simpletest/tests/url_alter_test.info b/modules/simpletest/tests/url_alter_test.info
index 7e72b4f1b..0d1deb2fb 100644
--- a/modules/simpletest/tests/url_alter_test.info
+++ b/modules/simpletest/tests/url_alter_test.info
@@ -4,6 +4,4 @@ description = A support modules for url_alter hook testing.
 core = 7.x
 package = Testing
 version = VERSION
-files[] = url_alter_test.module
-files[] = url_alter_test.install
 hidden = TRUE
diff --git a/modules/simpletest/tests/xmlrpc_test.info b/modules/simpletest/tests/xmlrpc_test.info
index 3fdffc398..773015d3e 100644
--- a/modules/simpletest/tests/xmlrpc_test.info
+++ b/modules/simpletest/tests/xmlrpc_test.info
@@ -4,5 +4,4 @@ description = "Support module for XML-RPC tests according to the validator1 spec
 package = Testing
 version = VERSION
 core = 7.x
-files[] = xmlrpc_test.module
 hidden = TRUE
diff --git a/modules/statistics/statistics.info b/modules/statistics/statistics.info
index de07d15ae..4075e6ea2 100644
--- a/modules/statistics/statistics.info
+++ b/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 a/modules/syslog/syslog.info b/modules/syslog/syslog.info
index ff6246aee..01a5b881d 100644
--- a/modules/syslog/syslog.info
+++ b/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 a/modules/system/system.info b/modules/system/system.info
index 394eea9a8..7ce48ed35 100644
--- a/modules/system/system.info
+++ b/modules/system/system.info
@@ -4,16 +4,11 @@ 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.mail.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
+files[] = system.test
 required = TRUE
 configure = admin/config/system
diff --git a/modules/taxonomy/taxonomy.info b/modules/taxonomy/taxonomy.info
index 3c8c62e25..88e51e34b 100644
--- a/modules/taxonomy/taxonomy.info
+++ b/modules/taxonomy/taxonomy.info
@@ -6,9 +6,5 @@ version = VERSION
 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 a/modules/toolbar/toolbar.info b/modules/toolbar/toolbar.info
index 92fd7bb45..317827923 100644
--- a/modules/toolbar/toolbar.info
+++ b/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 a/modules/tracker/tracker.info b/modules/tracker/tracker.info
index 253e83fcb..095efcbf4 100644
--- a/modules/tracker/tracker.info
+++ b/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 a/modules/translation/tests/translation_test.info b/modules/translation/tests/translation_test.info
index c4c1a8e94..0b9856f92 100644
--- a/modules/translation/tests/translation_test.info
+++ b/modules/translation/tests/translation_test.info
@@ -3,6 +3,5 @@ name = "Content Translation Test"
 description = "Support module for the content translation tests."
 core = 7.x
 package = Testing
-files[] = translation_test.module
 version = VERSION
 hidden = TRUE
diff --git a/modules/translation/translation.info b/modules/translation/translation.info
index 3f6841c2a..de3a31638 100644
--- a/modules/translation/translation.info
+++ b/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 a/modules/trigger/tests/trigger_test.info b/modules/trigger/tests/trigger_test.info
index 878f9f98b..39de97828 100644
--- a/modules/trigger/tests/trigger_test.info
+++ b/modules/trigger/tests/trigger_test.info
@@ -3,5 +3,4 @@ name = "Trigger Test"
 description = "Support module for Trigger tests."
 package = Testing
 core = 7.x
-files[] = trigger_test.module
 hidden = TRUE
diff --git a/modules/trigger/trigger.info b/modules/trigger/trigger.info
index df5354dd2..4361965ee 100644
--- a/modules/trigger/trigger.info
+++ b/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 a/modules/update/tests/aaa_update_test.info b/modules/update/tests/aaa_update_test.info
index 634d9840d..23d7f71f1 100644
--- a/modules/update/tests/aaa_update_test.info
+++ b/modules/update/tests/aaa_update_test.info
@@ -3,5 +3,4 @@ name = AAA Update test
 description = Support module for update module testing.
 package = Testing
 core = 7.x
-files[] = aaa_update_test.module
 hidden = TRUE
diff --git a/modules/update/tests/bbb_update_test.info b/modules/update/tests/bbb_update_test.info
index d322dc375..0d77d1ee3 100644
--- a/modules/update/tests/bbb_update_test.info
+++ b/modules/update/tests/bbb_update_test.info
@@ -3,5 +3,4 @@ name = BBB Update test
 description = Support module for update module testing.
 package = Testing
 core = 7.x
-files[] = bbb_update_test.module
 hidden = TRUE
diff --git a/modules/update/tests/ccc_update_test.info b/modules/update/tests/ccc_update_test.info
index a4eb3ea06..890f843b5 100644
--- a/modules/update/tests/ccc_update_test.info
+++ b/modules/update/tests/ccc_update_test.info
@@ -3,5 +3,4 @@ name = CCC Update test
 description = Support module for update module testing.
 package = Testing
 core = 7.x
-files[] = ccc_update_test.module
 hidden = TRUE
diff --git a/modules/update/tests/update_test.info b/modules/update/tests/update_test.info
index 10445c297..cd02c4bb4 100644
--- a/modules/update/tests/update_test.info
+++ b/modules/update/tests/update_test.info
@@ -4,5 +4,4 @@ description = Support module for update module testing.
 package = Testing
 version = VERSION
 core = 7.x
-files[] = update_test.module
 hidden = TRUE
diff --git a/modules/update/update.info b/modules/update/update.info
index 447d4864c..85944e527 100644
--- a/modules/update/update.info
+++ b/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 a/modules/user/user.info b/modules/user/user.info
index cfe9c15a8..f692ae2f3 100644
--- a/modules/user/user.info
+++ b/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