diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index ae67bbb83f5da3f9cb57a3f303daa9ab42f3dd99..d97d68bac43fc3b3fc90e4e580d931fb5bf36e81 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 1cc6ebfe8fb654aaf3003a5374cb452ee5ecbaf4..1a6651341ce0c1f6583fb57e7d8e3e7637db8a7c 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 c3716075ceecc191c88e34853aa0cf7072793898..194b6bf45ca4edf8484281aab1bffd263bf1c21a 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 3b9b80b2f110a1581e9e1a2ff3e3bcf3f387c338..e39474053035b20891b804b2507e03a7b7092702 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 938993c0e475abba5928e0ed5bba040c4de80947..a2a3bee96b7dc4d17bb2b0c8fb828917f1caf850 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 c9dd5b97e28ad7f7de8a677783eb6651ea205027..14b72d0416a53bcde106cbb4b5e396a7e3b53225 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 47a93ba7f396692a46586e8db8c1111ee11e3f52..0d6a42d1e7df30d4bc87bead237e387a7b8258b9 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 b4374c3c69e26fdc8072b6cfc24b08a97b19087c..d244ddf99bed9d31e306af14804aee28b207d576 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 a2f7f4c52320259a8d28ec263239b6be5ce8f3cd..adefb112ab22cbc76c059216370a45820600f0d8 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 0dcf67d86dc004bff199d97ac3e4ad3397b62450..d06b90d8bed99d5bc91b180eb18dce480a8eda53 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 71f465bc1a75814b093092f908f41ba81e1e1375..83839b4c39fc7d3a0f27e700b4378fc9736bd3e8 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 5ad675d12e63570c0c0665de97a7badabf735fca..6b0796575f091182a0424b6ff6ea756cd0cc2be5 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 6b9f82390c087641e32a09c64d37a54eeb95445c..35b01489a9614d193f10cae15cafda0ec99e4f06 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 06de4084fdb370d0b3102a368f5805fb359a526b..3a1b20d513e86d9251d86107eac70af3f8fb7e84 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 fe21172e3de5b452146768bc0ec4569713690903..4d7a2e8eb1bb8abeeaa7a2e3a606f9d4cb3467a8 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 3f64b0bac7fdfc5a00acfc4b0a6b7871413c9abc..250b1ba2829ca90571978f9cc8515bdaab90a5da 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 32fec873d1d68697b3cedfa4ac838b8c717c39f4..62cc3138eacfe91e0a5f0c4cedad4ee8be57e337 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 02997aebeeff5ca9e91ec1e521105e781bf82382..ea1c3651f5d6ba16afe2764a05d1aedbd505c9b5 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 0612afc1ed0f8e0ae664e3f2bc0060a7ec5776ab..f040ae93bdf2bad6cf043a3ef6022b450d98eb15 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 4e50e0ba9a6120f90680eb375c9bb293f58d5f4d..0117dc13cf0154b579bb2101241b047a1ffe4679 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 b875e59f52e0f6f9deda58cde43f16b7aadf0861..15fb06542c436d922c84a5459ad46e6f1f285a9d 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 46e3eb7a104b17355850009b1a9f5af5fcd8dc10..8524473654c796e084ccf28a4f43bb1856084315 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 5c36ac92db9c80ac36478600df337df5ec361acd..ac34022660735b429955bea8f7158573abad3445 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 1f154e06097d8b3c84de08a355c30bb885533c47..50e2bd4b28cd1a1ad02052319dc25ccb78cee90e 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 0135de71a1242a605aba4626dfcf1a095b05514e..b830bc625c8f3c03d71c1c2695e5b501603fc11b 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 d4998fc3853b507c81d71cd5edad6438d936fdda..3478e6637542db9b801b9e923079e14d35e32386 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 4c84b26219aedbd31c5611e267eb699d0d8d84c0..cdae549d73a39731af71012d6a5d594619d0beb1 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 137acc24873a5a857905fb432949c894cbf2a2a7..97b947ba4f17d83685706bc716b0ee668111acaa 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 461f207e91e23105217e155ebcf3a17bcff1a477..79bd6c00720da9bcc4a226b816e87ba07353bebd 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 3d8d2f195f5ab5088b47171f04b96bc066ad748c..f3eb2f1f457aca4dda8ed20feb4b3f38c837b1a0 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 2854295984d5b569635a6fdc592a8546d6c46143..2d700e663ba375ef920cc35c1dd14d185f3e4787 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 23cc230995e2850395c1b3c939b1ebe7ec9bff1f..9767f7ee398f627b3dca470dcfdfd2df9749d74a 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 e973c8fed82d1b9334a626462d69dbfb5e19c16e..e3f041d12f9c0e79b2e4af61a789b1e1078bcd7d 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 2624f30c46f96a01535fc695a4424b69722bd4ae..5c171233b05e78f3100fff2737a5f1e1ef51fa4c 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 afe5b37196537eaf83a69bd1c0cb6b2d758e1806..ba1b81706ddc97ab4e0317514c023f5c5e52a403 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 e8ac98de7f09f419748fc2f4644d58dccb4caac3..79a4f388944c6321cbf8ee403bdac574c922283f 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 7b8a0f698ccd0f9b9309f470eac9eab47a2766aa..121515f20605977df0a0789c039ebec799902ce3 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 7afc0597eed2f81d7acca4bab65fd041c6c4cadc..3572fe409219e3328971fff2c019f13f3c9d30c7 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 f49c87726da7b33e5cf36139ae7659818c89601c..df26d5487d38a71af689508a385e879a3a4e1868 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 2f1588340393513bb8789aac4652a997e220ed16..d87b7ea7c8afeb77ee613ec3ce4e80059c324805 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 a61b1ec66ce962215bd19a28cc4811bad2cb4fa0..29bed4ebb4c9c6ea59c5852f027106a20924812d 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 03745635cba565bff92709b542528247f337fe7a..c9711b2ca398ffc8189eb969f5c3e7d48b816ef4 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 a4abfdd57eae6cbad5babff4a8567943600ff9fd..6a1e3a3698d7557d0ae4c95a277d2042de5d7c5c 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 72f6518ec8918cb470838c8c31fc27852dcb8be5..e4418f486bc9d431af07f67dfcc9495d998fec50 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 1483074a25ee77046919ebb251ebd37b6103d65f..8cbd7a549345e4e642c09e9a23d9064db3c8b56c 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 54455134b7aaede7d2d8dd75f49799ceccf90689..f0752a241c7387d8290f7c73fd5f7d38e69291c0 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 3a9a1f3231878dfab94126b3682b5bdc79099bcd..e87a0650cba01132e3eef6994961edde15adaff3 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 4c3c9e1a748662d25bd9ddcaa3c1f1b4ef4d1593..bea9d5aa0ad182f64afa2d19580837983a2f87c2 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 69f9d6e3d109241d8cad61f84b5ec3963b386c11..732c707ccbf9091c04bfb136b0993d738a51ddf6 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 b842bbf6bfbdd4ec616c95f9f2effb57e17ed8e6..ca33145fdeab4a3334b1b914a303d37b3d117e6c 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 3b8f5f23edc01613a0221caccb3e120a4db7de66..d682bfac53e67a2f48ba80b27ae3fb24b68da9d2 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 0d9c32a465907c6aab4a1bbdabdd464fe70a6f3f..aeaadbbe599aca1f3b2b4d529e4f779fe5f8d54a 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 432c17ff71d3fd35c9e3de1808d69a964f6f4e54..301df517e92ed6b70f1bb0d9d0ecc9590105d9ce 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 7b27416aee41904e97a53002b502edb32d375975..cc16c2551446e0eb32282b77b2f0b06063d563c8 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 b8751d774e8947024f610c4d064a18fe4610868b..e357b30ed465794fb06091714b0b0f1ecd652496 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 155de2ed760946dba13dc04c8993c67c1a6ddc72..d367ad92f10dec19eab33f6dc28d8ead9cd393f6 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 491fbda2ffe9468d36f0163c34933b3d8a78ef1b..a86bbca4b72779c07083b36394076a8f017dd1bc 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 567bf74d2fd6906c5a549fd970e2eed728f0d23b..01c6d5d062d9af599e6234febe6819cd6c5b0011 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 dac380f5ee70bb4053e4c33494f56dd8efd7912a..7e9cdc704c0cb071a6ef6d9be7bb23a83820ddb9 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 41119ae6f9861c22c25c96999e4e7c7e5249722e..5cc2ad96d56d4e9601b08d763b67a389809414b9 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 1dac66247cdfeafacc993b9305b4f80b76968e2f..0486297cf4f561b5bae22c9ee4317224a40e9892 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 b379267495a9d95c68852c7a2d62ae42374297f9..db1ce6d4beefed0057890784d76066595a9bcf0c 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 b7030c3396b770f6e6f773beba1c99464533de60..16845f072f65344cdc61d8030dadaeb3b385f4ab 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 fb1545d5c9d8cce300ee716681bbbe98b34983d7..ded61571abab506cd448303c7cb89aa21e2328ed 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 e74dc38e4a2dc87f1c699cd633ed4ae5c46442a8..a9f519172894caca14abc63c9b8c879731732aea 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 45817934a72959953b65e770b782eb7c842b7542..8d0c4e85b4b2c6a45a44575f4bd0c91119b7eab0 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 6b075dfdff18d4b4d477aa5f99fe43de68eaaec6..0a1cf3a1f9d240c576de720e875999f87bd832a5 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 9f2ae0abfbf689075531300093b05a2497842bf3..bcf613c34aadb8fffb1f98dedbfc65b6c00e797f 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 08034ffdd70e9bc429e4c0902d0d358561f98a1d..2ae4b826b21638c0b79db60657e5d9dd1864f388 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 c5748cff2efcfa835efe4c00b6b1fa0f25ce4220..55d8971b3c207201a1e81b49fa4dc4983656f372 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 6c5cd2fad63b8dff8b72157fd18a894c9c582994..eaa9c04f575987a583680fddf1c16bf6ae8f342d 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 2a35cad7618fd2051bb913c7935acbb48b7cbf0f..d3b8a7edfb54771de585589501be5ac94c51c320 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 7f128129517c930f71c4efd8e2ec8c78bbdc798b..a55878edf35e3fea802719fb49c1ede4d552ebe5 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 00db1eb98c42fb6ba24408d665bdf5d07166df3a..a55878edf35e3fea802719fb49c1ede4d552ebe5 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 c193f42749fd8b2087174855d2bf89cd76443fba..a55878edf35e3fea802719fb49c1ede4d552ebe5 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 7e72b4f1b45aad345c8bd354d6dad187220dfc32..0d1deb2fb8ed53f2e9c51fef2de29986966ba6d6 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 3fdffc398d541dd71def84944324a6f23b75ce36..773015d3e4885eddb9e4590032ef2b10e77703e6 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 de07d15ae8abd82954a8e48f05d3d5dc8806d00d..4075e6ea2ca8cd905a270b71358a93aa4847e441 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 ff6246aee156718ab88558e801e5848ef7ceb0c8..01a5b881d392c11a4312570c20aa0f962db043a3 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 394eea9a8f5c48527e519c9245b7389b8f78edda..7ce48ed35f71873154f570708412501a5cd73863 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 3c8c62e2549765b7737883878677fc1dc9c9b81d..88e51e34bcf4f71aefaa1bcecda78e224600fae2 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 92fd7bb4599f454cccdd9d742e51e76605bc97a2..317827923e3e764f1731ee1bd61ce3fe53a7d359 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 253e83fcb839207bf6856dc20a0552929ce74dbd..095efcbf4022cb82ed086c4a2e09e851ec183931 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 c4c1a8e9454631bd5a438b382dc12df3c5627ea0..0b9856f926697e356efbc134a61bb442cf6110aa 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 3f6841c2a930ac46a14e44abaf6ea0a70568f5a8..de3a316387e49b6206753e3cc0383002a65f0d60 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 878f9f98b3b5fbdd46af022ba6ad80c20a02a8e2..39de97828bd209daf53d52f73b3678a1e12e09fe 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 df5354dd21e523b4d9f2c17db25e336efdd3b061..4361965eea533278fba36d0bd0f20cc4e13b12ea 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 634d9840d43456b77ade6f1b9663ccaf612fa8cb..23d7f71f1c8aee12630b2ff3361fe3fbbaa5ffee 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 d322dc3754f7e142f32b637ab61a4861b93b7e7b..0d77d1ee3d35ecfa762c6f8433319ec347f56134 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 a4eb3ea06dbb22adf0a683dd91fd78290283c19e..890f843b57fc46a24b6c2b17c55d5e0f2f53538b 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 10445c2978123fa810aefd427a2e40e669a7a798..cd02c4bb4c51ed122d8a081f44987ad9e6762dba 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 447d4864c2c0a877024cfd5c811df348bb74c603..85944e5278d82cf8dabefc72e2a4b928111328fd 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 cfe9c15a8cd8a57efb950c9caa0864a826a4437b..f692ae2f3154df248b05379c114f30bb7cdb8796 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