From e80e877ab75ae002bc22962ace1d58ecb72b9d46 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 19 Nov 2013 11:47:39 +0900
Subject: [PATCH] Bug 939044 - Remove most definitions of MODULE. r=mshal

---
 accessible/moz.build                                            | 2 --
 accessible/public/ia2/moz.build                                 | 1 -
 accessible/public/msaa/moz.build                                | 2 --
 accessible/src/atk/moz.build                                    | 2 --
 accessible/src/base/moz.build                                   | 2 --
 accessible/src/generic/moz.build                                | 2 --
 accessible/src/html/moz.build                                   | 2 --
 accessible/src/mac/moz.build                                    | 2 --
 accessible/src/other/moz.build                                  | 2 --
 accessible/src/windows/ia2/moz.build                            | 2 --
 accessible/src/windows/msaa/moz.build                           | 2 --
 accessible/src/windows/sdn/moz.build                            | 2 --
 accessible/src/windows/uia/moz.build                            | 2 --
 accessible/src/xpcom/moz.build                                  | 2 --
 accessible/src/xul/moz.build                                    | 2 --
 accessible/tests/moz.build                                      | 2 --
 b2g/components/moz.build                                        | 2 --
 b2g/components/test/moz.build                                   | 2 --
 browser/components/about/moz.build                              | 2 --
 browser/components/build/moz.build                              | 2 --
 browser/components/dirprovider/moz.build                        | 2 --
 browser/components/feeds/src/moz.build                          | 2 --
 browser/components/migration/src/moz.build                      | 2 --
 browser/components/moz.build                                    | 2 --
 browser/components/shell/src/moz.build                          | 2 --
 browser/fuel/src/moz.build                                      | 2 --
 browser/metro/shell/moz.build                                   | 2 --
 build/mobile/robocop/moz.build                                  | 2 --
 build/mobile/sutagent/android/fencp/moz.build                   | 2 --
 build/mobile/sutagent/android/ffxcp/moz.build                   | 2 --
 build/mobile/sutagent/android/moz.build                         | 2 --
 build/mobile/sutagent/android/watcher/moz.build                 | 2 --
 build/moz.build                                                 | 2 --
 build/unix/moz.build                                            | 2 --
 build/unix/stdc++compat/moz.build                               | 2 --
 caps/include/moz.build                                          | 2 --
 caps/moz.build                                                  | 2 --
 caps/src/moz.build                                              | 2 --
 chrome/src/moz.build                                            | 2 --
 chrome/test/moz.build                                           | 2 --
 content/base/public/moz.build                                   | 2 --
 content/base/src/moz.build                                      | 2 --
 content/base/test/moz.build                                     | 2 --
 content/canvas/public/moz.build                                 | 2 --
 content/canvas/src/moz.build                                    | 2 --
 content/events/public/moz.build                                 | 2 --
 content/events/src/moz.build                                    | 2 --
 content/html/content/public/moz.build                           | 2 --
 content/html/content/src/moz.build                              | 2 --
 content/html/document/public/moz.build                          | 2 --
 content/html/document/src/moz.build                             | 2 --
 content/mathml/content/src/moz.build                            | 2 --
 content/media/apple/moz.build                                   | 2 --
 content/media/directshow/moz.build                              | 2 --
 content/media/encoder/moz.build                                 | 2 --
 content/media/gstreamer/moz.build                               | 2 --
 content/media/mediasource/moz.build                             | 2 --
 content/media/moz.build                                         | 2 --
 content/media/ogg/moz.build                                     | 2 --
 content/media/omx/mediaresourcemanager/moz.build                | 2 --
 content/media/omx/moz.build                                     | 2 --
 content/media/plugins/moz.build                                 | 2 --
 content/media/raw/moz.build                                     | 2 --
 content/media/wave/moz.build                                    | 2 --
 content/media/webaudio/blink/moz.build                          | 2 --
 content/media/webaudio/moz.build                                | 2 --
 content/media/webm/moz.build                                    | 2 --
 content/media/webrtc/moz.build                                  | 2 --
 content/media/webspeech/recognition/moz.build                   | 2 --
 content/media/webspeech/synth/moz.build                         | 1 -
 content/media/webspeech/synth/pico/moz.build                    | 2 --
 content/media/webvtt/moz.build                                  | 2 --
 content/media/wmf/moz.build                                     | 2 --
 content/moz.build                                               | 2 --
 content/smil/moz.build                                          | 2 --
 content/svg/content/src/moz.build                               | 2 --
 content/svg/document/src/moz.build                              | 2 --
 content/test/moz.build                                          | 2 --
 content/xbl/src/moz.build                                       | 2 --
 content/xml/content/src/moz.build                               | 2 --
 content/xml/document/public/moz.build                           | 2 --
 content/xml/document/src/moz.build                              | 2 --
 content/xslt/public/moz.build                                   | 2 --
 content/xslt/src/base/moz.build                                 | 2 --
 content/xslt/src/xml/moz.build                                  | 2 --
 content/xslt/src/xpath/moz.build                                | 2 --
 content/xslt/src/xslt/moz.build                                 | 2 --
 content/xul/content/moz.build                                   | 2 --
 content/xul/content/src/moz.build                               | 2 --
 content/xul/document/moz.build                                  | 2 --
 content/xul/document/src/moz.build                              | 2 --
 content/xul/templates/moz.build                                 | 2 --
 content/xul/templates/src/moz.build                             | 2 --
 db/sqlite3/src/moz.build                                        | 2 --
 docshell/build/moz.build                                        | 2 --
 docshell/moz.build                                              | 2 --
 docshell/shistory/moz.build                                     | 2 --
 docshell/shistory/src/moz.build                                 | 2 --
 docshell/test/moz.build                                         | 2 --
 docshell/test/navigation/moz.build                              | 2 --
 dom/activities/src/moz.build                                    | 2 --
 dom/alarm/moz.build                                             | 2 --
 dom/audiochannel/moz.build                                      | 2 --
 dom/audiochannel/tests/moz.build                                | 2 --
 dom/bindings/moz.build                                          | 2 --
 dom/bindings/test/moz.build                                     | 2 --
 dom/bluetooth/moz.build                                         | 1 -
 dom/browser-element/moz.build                                   | 2 --
 dom/camera/moz.build                                            | 2 --
 dom/datastore/moz.build                                         | 2 --
 dom/devicestorage/moz.build                                     | 2 --
 dom/encoding/moz.build                                          | 2 --
 dom/file/moz.build                                              | 2 --
 dom/fmradio/moz.build                                           | 2 --
 dom/icc/tests/moz.build                                         | 2 --
 dom/indexedDB/ipc/moz.build                                     | 2 --
 dom/indexedDB/moz.build                                         | 2 --
 dom/inputmethod/moz.build                                       | 2 --
 dom/interfaces/apps/moz.build                                   | 2 --
 dom/interfaces/base/moz.build                                   | 2 --
 dom/interfaces/canvas/moz.build                                 | 2 --
 dom/interfaces/core/moz.build                                   | 2 --
 dom/interfaces/css/moz.build                                    | 2 --
 dom/interfaces/devicestorage/moz.build                          | 2 --
 dom/interfaces/events/moz.build                                 | 2 --
 dom/interfaces/geolocation/moz.build                            | 2 --
 dom/interfaces/html/moz.build                                   | 2 --
 dom/interfaces/json/moz.build                                   | 2 --
 dom/interfaces/notification/moz.build                           | 2 --
 dom/interfaces/offline/moz.build                                | 2 --
 dom/interfaces/permission/moz.build                             | 2 --
 dom/interfaces/range/moz.build                                  | 2 --
 dom/interfaces/settings/moz.build                               | 2 --
 dom/interfaces/sidebar/moz.build                                | 2 --
 dom/interfaces/smil/moz.build                                   | 2 --
 dom/interfaces/storage/moz.build                                | 2 --
 dom/interfaces/stylesheets/moz.build                            | 2 --
 dom/interfaces/svg/moz.build                                    | 2 --
 dom/interfaces/traversal/moz.build                              | 2 --
 dom/interfaces/xbl/moz.build                                    | 2 --
 dom/interfaces/xpath/moz.build                                  | 2 --
 dom/interfaces/xul/moz.build                                    | 2 --
 dom/ipc/moz.build                                               | 2 --
 dom/media/moz.build                                             | 2 --
 dom/moz.build                                                   | 2 --
 dom/network/tests/moz.build                                     | 2 --
 dom/nfc/moz.build                                               | 1 -
 dom/payment/tests/moz.build                                     | 2 --
 dom/permission/tests/moz.build                                  | 2 --
 dom/plugins/base/android/moz.build                              | 2 --
 dom/plugins/ipc/moz.build                                       | 2 --
 dom/plugins/test/moz.build                                      | 2 --
 dom/plugins/test/testplugin/moz.build                           | 2 --
 dom/plugins/test/testplugin/secondplugin/moz.build              | 2 --
 dom/promise/moz.build                                           | 2 --
 dom/quota/moz.build                                             | 2 --
 dom/src/events/moz.build                                        | 2 --
 dom/src/geolocation/moz.build                                   | 2 --
 dom/src/json/moz.build                                          | 2 --
 dom/src/json/test/moz.build                                     | 2 --
 dom/src/jsurl/moz.build                                         | 2 --
 dom/src/notification/moz.build                                  | 2 --
 dom/src/offline/moz.build                                       | 2 --
 dom/src/storage/moz.build                                       | 2 --
 dom/system/android/moz.build                                    | 2 --
 dom/system/gonk/moz.build                                       | 2 --
 dom/system/mac/moz.build                                        | 2 --
 dom/system/moz.build                                            | 2 --
 dom/system/tests/moz.build                                      | 2 --
 dom/system/unix/moz.build                                       | 2 --
 dom/system/windows/moz.build                                    | 2 --
 dom/telephony/moz.build                                         | 2 --
 dom/tests/moz.build                                             | 2 --
 dom/time/moz.build                                              | 2 --
 dom/voicemail/moz.build                                         | 2 --
 dom/webidl/moz.build                                            | 2 --
 dom/wifi/moz.build                                              | 2 --
 dom/workers/moz.build                                           | 2 --
 editor/composer/src/moz.build                                   | 2 --
 editor/libeditor/base/moz.build                                 | 2 --
 editor/libeditor/html/moz.build                                 | 2 --
 editor/libeditor/text/moz.build                                 | 2 --
 editor/moz.build                                                | 2 --
 editor/public/moz.build                                         | 2 --
 editor/txmgr/moz.build                                          | 2 --
 editor/txmgr/public/moz.build                                   | 2 --
 editor/txmgr/src/moz.build                                      | 2 --
 editor/txtsvc/moz.build                                         | 2 --
 editor/txtsvc/src/moz.build                                     | 2 --
 embedding/browser/build/moz.build                               | 2 --
 embedding/browser/webBrowser/moz.build                          | 2 --
 embedding/components/appstartup/src/moz.build                   | 2 --
 embedding/components/build/moz.build                            | 2 --
 embedding/components/commandhandler/moz.build                   | 2 --
 embedding/components/commandhandler/src/moz.build               | 2 --
 embedding/components/find/moz.build                             | 2 --
 embedding/components/find/src/moz.build                         | 2 --
 embedding/components/printingui/src/mac/moz.build               | 2 --
 embedding/components/printingui/src/os2/moz.build               | 2 --
 embedding/components/printingui/src/unixshared/moz.build        | 2 --
 embedding/components/printingui/src/win/moz.build               | 2 --
 embedding/components/webbrowserpersist/moz.build                | 2 --
 embedding/components/webbrowserpersist/src/moz.build            | 2 --
 embedding/components/windowwatcher/src/moz.build                | 2 --
 embedding/moz.build                                             | 2 --
 embedding/tests/winEmbed/moz.build                              | 2 --
 extensions/auth/moz.build                                       | 2 --
 extensions/cookie/test/moz.build                                | 2 --
 extensions/gio/moz.build                                        | 2 --
 extensions/gnomevfs/moz.build                                   | 2 --
 extensions/permissions/moz.build                                | 2 --
 extensions/pref/autoconfig/moz.build                            | 2 --
 extensions/pref/autoconfig/src/moz.build                        | 2 --
 extensions/spellcheck/hunspell/moz.build                        | 2 --
 extensions/spellcheck/hunspell/src/moz.build                    | 2 --
 extensions/spellcheck/moz.build                                 | 2 --
 extensions/spellcheck/src/moz.build                             | 2 --
 extensions/universalchardet/moz.build                           | 2 --
 extensions/universalchardet/src/base/moz.build                  | 2 --
 extensions/universalchardet/src/moz.build                       | 2 --
 extensions/universalchardet/src/xpcom/moz.build                 | 2 --
 extensions/widgetutils/moz.build                                | 2 --
 extensions/widgetutils/src/moz.build                            | 2 --
 gfx/2d/moz.build                                                | 2 --
 gfx/angle/moz.build                                             | 2 --
 gfx/angle/src/libEGL/moz.build                                  | 2 --
 gfx/angle/src/libGLESv2/moz.build                               | 2 --
 gfx/cairo/cairo/src/moz.build                                   | 2 --
 gfx/cairo/libpixman/src/moz.build                               | 2 --
 gfx/gl/moz.build                                                | 2 --
 gfx/graphite2/src/moz.build                                     | 2 --
 gfx/harfbuzz/src/moz.build                                      | 2 --
 gfx/ipc/moz.build                                               | 2 --
 gfx/layers/moz.build                                            | 2 --
 gfx/moz.build                                                   | 2 --
 gfx/ots/src/moz.build                                           | 2 --
 gfx/qcms/moz.build                                              | 2 --
 gfx/skia/moz.build                                              | 2 --
 gfx/tests/gtest/moz.build                                       | 2 --
 gfx/tests/moz.build                                             | 2 --
 gfx/thebes/moz.build                                            | 2 --
 gfx/ycbcr/moz.build                                             | 2 --
 image/build/moz.build                                           | 2 --
 image/decoders/icon/android/moz.build                           | 2 --
 image/decoders/icon/gtk/moz.build                               | 2 --
 image/decoders/icon/mac/moz.build                               | 2 --
 image/decoders/icon/os2/moz.build                               | 2 --
 image/decoders/icon/qt/moz.build                                | 2 --
 image/decoders/icon/win/moz.build                               | 2 --
 image/decoders/moz.build                                        | 2 --
 image/encoders/bmp/moz.build                                    | 2 --
 image/encoders/ico/moz.build                                    | 2 --
 image/encoders/jpeg/moz.build                                   | 2 --
 image/encoders/png/moz.build                                    | 2 --
 image/moz.build                                                 | 2 --
 image/src/moz.build                                             | 2 --
 image/test/moz.build                                            | 2 --
 intl/build/moz.build                                            | 2 --
 intl/chardet/public/moz.build                                   | 2 --
 intl/chardet/src/moz.build                                      | 2 --
 intl/hyphenation/moz.build                                      | 2 --
 intl/hyphenation/public/moz.build                               | 2 --
 intl/hyphenation/src/moz.build                                  | 2 --
 intl/locale/moz.build                                           | 2 --
 intl/locale/public/moz.build                                    | 2 --
 intl/locale/src/mac/moz.build                                   | 2 --
 intl/locale/src/moz.build                                       | 2 --
 intl/locale/src/os2/moz.build                                   | 2 --
 intl/locale/src/unix/moz.build                                  | 2 --
 intl/locale/src/windows/moz.build                               | 2 --
 intl/locale/tests/moz.build                                     | 2 --
 intl/lwbrk/moz.build                                            | 2 --
 intl/lwbrk/public/moz.build                                     | 2 --
 intl/lwbrk/src/moz.build                                        | 2 --
 intl/strres/moz.build                                           | 2 --
 intl/strres/src/moz.build                                       | 2 --
 intl/strres/tests/moz.build                                     | 2 --
 intl/uconv/moz.build                                            | 2 --
 intl/uconv/public/moz.build                                     | 2 --
 intl/uconv/src/moz.build                                        | 2 --
 intl/uconv/tests/moz.build                                      | 2 --
 intl/unicharutil/moz.build                                      | 2 --
 intl/unicharutil/public/moz.build                               | 2 --
 intl/unicharutil/src/moz.build                                  | 2 --
 intl/unicharutil/tests/moz.build                                | 2 --
 intl/unicharutil/tools/moz.build                                | 2 --
 intl/unicharutil/util/internal/moz.build                        | 2 --
 intl/unicharutil/util/moz.build                                 | 2 --
 ipc/app/moz.build                                               | 2 --
 ipc/dbus/moz.build                                              | 2 --
 ipc/glue/moz.build                                              | 2 --
 ipc/ipdl/moz.build                                              | 2 --
 ipc/ipdl/test/cxx/app/moz.build                                 | 2 --
 ipc/ipdl/test/cxx/moz.build                                     | 2 --
 ipc/keystore/moz.build                                          | 2 --
 ipc/netd/moz.build                                              | 2 --
 ipc/nfc/moz.build                                               | 1 -
 ipc/ril/moz.build                                               | 2 --
 ipc/testshell/moz.build                                         | 2 --
 ipc/unixsocket/moz.build                                        | 2 --
 js/ipc/moz.build                                                | 2 --
 js/jsd/idl/moz.build                                            | 2 --
 js/jsd/moz.build                                                | 2 --
 js/jsd/test/moz.build                                           | 2 --
 js/src/moz.build                                                | 2 --
 js/src/tests/moz.build                                          | 2 --
 js/xpconnect/loader/moz.build                                   | 2 --
 js/xpconnect/moz.build                                          | 2 --
 js/xpconnect/public/moz.build                                   | 2 --
 js/xpconnect/shell/moz.build                                    | 2 --
 js/xpconnect/src/moz.build                                      | 2 --
 js/xpconnect/tests/components/js/moz.build                      | 2 --
 js/xpconnect/tests/components/native/moz.build                  | 1 -
 js/xpconnect/wrappers/moz.build                                 | 2 --
 layout/base/moz.build                                           | 2 --
 layout/build/moz.build                                          | 2 --
 layout/forms/moz.build                                          | 2 --
 layout/generic/moz.build                                        | 2 --
 layout/inspector/src/moz.build                                  | 2 --
 layout/ipc/moz.build                                            | 2 --
 layout/mathml/moz.build                                         | 2 --
 layout/media/moz.build                                          | 2 --
 layout/moz.build                                                | 2 --
 layout/printing/moz.build                                       | 2 --
 layout/style/moz.build                                          | 2 --
 layout/style/test/moz.build                                     | 2 --
 layout/svg/moz.build                                            | 2 --
 layout/tables/moz.build                                         | 2 --
 layout/tools/layout-debug/moz.build                             | 2 --
 layout/tools/recording/moz.build                                | 2 --
 layout/tools/reftest/moz.build                                  | 2 --
 layout/xul/base/public/moz.build                                | 2 --
 layout/xul/base/src/moz.build                                   | 2 --
 layout/xul/grid/moz.build                                       | 2 --
 layout/xul/tree/moz.build                                       | 2 --
 media/kiss_fft/moz.build                                        | 2 --
 media/libcubeb/moz.build                                        | 2 --
 media/libcubeb/src/moz.build                                    | 2 --
 media/libjpeg/moz.build                                         | 2 --
 media/libnestegg/moz.build                                      | 2 --
 media/libnestegg/src/moz.build                                  | 2 --
 media/libogg/moz.build                                          | 2 --
 media/libogg/src/moz.build                                      | 2 --
 media/libopus/moz.build                                         | 2 --
 media/libpng/moz.build                                          | 2 --
 media/libsoundtouch/moz.build                                   | 2 --
 media/libsoundtouch/src/moz.build                               | 2 --
 media/libspeex_resampler/moz.build                              | 2 --
 media/libspeex_resampler/src/moz.build                          | 2 --
 media/libtheora/include/moz.build                               | 2 --
 media/libtheora/lib/moz.build                                   | 2 --
 media/libtheora/moz.build                                       | 2 --
 media/libtremor/lib/moz.build                                   | 2 --
 media/libtremor/moz.build                                       | 2 --
 media/libvorbis/moz.build                                       | 2 --
 media/libvpx/moz.build                                          | 2 --
 media/mtransport/build/moz.build                                | 2 --
 media/mtransport/standalone/moz.build                           | 2 --
 media/mtransport/test/moz.build                                 | 2 --
 media/omx-plugin/froyo/moz.build                                | 2 --
 media/omx-plugin/gb/moz.build                                   | 2 --
 media/omx-plugin/gb235/moz.build                                | 2 --
 media/omx-plugin/hc/moz.build                                   | 2 --
 media/omx-plugin/lib/froyo/libstagefright/moz.build             | 2 --
 media/omx-plugin/lib/gb/libstagefright/moz.build                | 2 --
 .../omx-plugin/lib/gb/libstagefright_color_conversion/moz.build | 2 --
 media/omx-plugin/lib/gb/libutils/moz.build                      | 2 --
 media/omx-plugin/lib/gb235/libstagefright/moz.build             | 2 --
 media/omx-plugin/lib/hc/libstagefright/moz.build                | 2 --
 media/omx-plugin/lib/ics/libstagefright/moz.build               | 2 --
 media/omx-plugin/lib/ics/libutils/moz.build                     | 2 --
 media/omx-plugin/moz.build                                      | 2 --
 media/webrtc/signaling/test/moz.build                           | 2 --
 memory/build/moz.build                                          | 2 --
 memory/jemalloc/moz.build                                       | 2 --
 memory/mozalloc/moz.build                                       | 2 --
 memory/mozjemalloc/moz.build                                    | 2 --
 memory/replace/dmd/moz.build                                    | 2 --
 memory/replace/dummy/moz.build                                  | 2 --
 memory/replace/jemalloc/moz.build                               | 2 --
 mfbt/moz.build                                                  | 2 --
 modules/libbz2/moz.build                                        | 2 --
 modules/libbz2/src/moz.build                                    | 2 --
 modules/libjar/test/moz.build                                   | 2 --
 modules/libjar/zipwriter/moz.build                              | 2 --
 modules/libjar/zipwriter/src/moz.build                          | 2 --
 modules/libjar/zipwriter/test/moz.build                         | 2 --
 modules/libmar/moz.build                                        | 2 --
 modules/libmar/sign/moz.build                                   | 2 --
 modules/libmar/src/moz.build                                    | 2 --
 modules/libmar/tool/moz.build                                   | 2 --
 modules/libmar/verify/moz.build                                 | 2 --
 modules/libpref/moz.build                                       | 2 --
 modules/libpref/src/moz.build                                   | 2 --
 modules/libpref/test/moz.build                                  | 2 --
 modules/zlib/moz.build                                          | 2 --
 modules/zlib/src/moz.build                                      | 2 --
 mozglue/android/moz.build                                       | 2 --
 mozglue/build/moz.build                                         | 2 --
 mozglue/linker/moz.build                                        | 2 --
 netwerk/base/src/moz.build                                      | 2 --
 netwerk/build/moz.build                                         | 2 --
 netwerk/cache/moz.build                                         | 2 --
 netwerk/cache2/moz.build                                        | 2 --
 netwerk/cookie/moz.build                                        | 2 --
 netwerk/dns/moz.build                                           | 2 --
 netwerk/ipc/moz.build                                           | 2 --
 netwerk/moz.build                                               | 2 --
 netwerk/protocol/about/moz.build                                | 2 --
 netwerk/protocol/app/moz.build                                  | 2 --
 netwerk/protocol/data/moz.build                                 | 2 --
 netwerk/protocol/device/moz.build                               | 2 --
 netwerk/protocol/file/moz.build                                 | 2 --
 netwerk/protocol/ftp/moz.build                                  | 2 --
 netwerk/protocol/http/moz.build                                 | 2 --
 netwerk/protocol/res/moz.build                                  | 2 --
 netwerk/protocol/rtsp/moz.build                                 | 2 --
 netwerk/protocol/viewsource/moz.build                           | 2 --
 netwerk/protocol/websocket/moz.build                            | 2 --
 netwerk/protocol/wyciwyg/moz.build                              | 2 --
 netwerk/sctp/datachannel/moz.build                              | 2 --
 netwerk/sctp/src/moz.build                                      | 2 --
 netwerk/socket/moz.build                                        | 2 --
 netwerk/srtp/src/moz.build                                      | 2 --
 netwerk/streamconv/converters/moz.build                         | 2 --
 netwerk/streamconv/public/moz.build                             | 2 --
 netwerk/streamconv/src/moz.build                                | 2 --
 netwerk/streamconv/test/moz.build                               | 2 --
 netwerk/system/android/moz.build                                | 2 --
 netwerk/system/mac/moz.build                                    | 2 --
 netwerk/system/moz.build                                        | 2 --
 netwerk/system/qt/moz.build                                     | 2 --
 netwerk/system/win32/moz.build                                  | 2 --
 netwerk/test/mochitests/moz.build                               | 2 --
 netwerk/test/moz.build                                          | 2 --
 netwerk/wifi/moz.build                                          | 2 --
 other-licenses/android/moz.build                                | 2 --
 other-licenses/skia-npapi/moz.build                             | 2 --
 parser/expat/lib/moz.build                                      | 2 --
 parser/expat/moz.build                                          | 2 --
 parser/htmlparser/moz.build                                     | 2 --
 parser/htmlparser/src/moz.build                                 | 2 --
 parser/moz.build                                                | 2 --
 parser/xml/public/moz.build                                     | 2 --
 parser/xml/src/moz.build                                        | 2 --
 parser/xml/test/moz.build                                       | 2 --
 profile/dirserviceprovider/moz.build                            | 2 --
 profile/dirserviceprovider/public/moz.build                     | 2 --
 profile/dirserviceprovider/src/moz.build                        | 2 --
 profile/dirserviceprovider/standalone/moz.build                 | 2 --
 profile/moz.build                                               | 2 --
 rdf/base/public/moz.build                                       | 2 --
 rdf/base/src/moz.build                                          | 2 --
 rdf/build/moz.build                                             | 2 --
 rdf/datasource/public/moz.build                                 | 2 --
 rdf/datasource/src/moz.build                                    | 2 --
 rdf/moz.build                                                   | 2 --
 rdf/tests/dsds/moz.build                                        | 2 --
 rdf/tests/moz.build                                             | 2 --
 rdf/util/moz.build                                              | 2 --
 rdf/util/public/moz.build                                       | 2 --
 rdf/util/src/internal/moz.build                                 | 2 --
 rdf/util/src/moz.build                                          | 2 --
 security/build/moz.build                                        | 2 --
 security/manager/boot/moz.build                                 | 2 --
 security/manager/boot/src/moz.build                             | 2 --
 security/manager/pki/moz.build                                  | 2 --
 security/manager/pki/src/moz.build                              | 2 --
 security/manager/ssl/moz.build                                  | 2 --
 security/manager/ssl/src/moz.build                              | 2 --
 security/manager/ssl/tests/gtest/moz.build                      | 2 --
 security/manager/ssl/tests/mochitest/moz.build                  | 2 --
 security/manager/ssl/tests/moz.build                            | 2 --
 security/manager/ssl/tests/unit/moz.build                       | 2 --
 security/manager/ssl/tests/unit/tlsserver/cmd/moz.build         | 2 --
 security/manager/ssl/tests/unit/tlsserver/lib/moz.build         | 2 --
 security/manager/ssl/tests/unit/tlsserver/moz.build             | 2 --
 security/sandbox/linux/moz.build                                | 2 --
 security/sandbox/moz.build                                      | 2 --
 security/sandbox/win/src/sandboxbroker/moz.build                | 1 -
 services/common/tests/moz.build                                 | 2 --
 services/crypto/component/moz.build                             | 2 --
 services/crypto/component/tests/moz.build                       | 2 --
 services/crypto/moz.build                                       | 2 --
 services/crypto/tests/moz.build                                 | 2 --
 services/sync/tests/moz.build                                   | 2 --
 startupcache/test/moz.build                                     | 2 --
 storage/build/moz.build                                         | 2 --
 storage/moz.build                                               | 2 --
 storage/src/moz.build                                           | 2 --
 storage/test/moz.build                                          | 2 --
 testing/gtest/moz.build                                         | 2 --
 testing/mozbase/moz.build                                       | 2 --
 testing/peptest/moz.build                                       | 2 --
 testing/xpcshell/example/moz.build                              | 2 --
 testing/xpcshell/moz.build                                      | 2 --
 toolkit/components/autocomplete/tests/moz.build                 | 2 --
 toolkit/components/build/moz.build                              | 2 --
 toolkit/components/captivedetect/test/moz.build                 | 2 --
 toolkit/components/commandlines/moz.build                       | 2 --
 toolkit/components/commandlines/test/moz.build                  | 2 --
 toolkit/components/contentprefs/moz.build                       | 2 --
 toolkit/components/contentprefs/tests/moz.build                 | 2 --
 toolkit/components/ctypes/moz.build                             | 2 --
 toolkit/components/ctypes/tests/moz.build                       | 2 --
 toolkit/components/downloads/test/moz.build                     | 2 --
 toolkit/components/filepicker/test/moz.build                    | 2 --
 toolkit/components/finalizationwitness/moz.build                | 2 --
 toolkit/components/intl/moz.build                               | 2 --
 toolkit/components/jsdownloads/src/moz.build                    | 2 --
 toolkit/components/mediasniffer/moz.build                       | 2 --
 toolkit/components/mediasniffer/test/moz.build                  | 2 --
 toolkit/components/microformats/moz.build                       | 2 --
 toolkit/components/osfile/moz.build                             | 2 --
 toolkit/components/osfile/tests/mochi/moz.build                 | 2 --
 toolkit/components/osfile/tests/moz.build                       | 2 --
 toolkit/components/passwordmgr/test/moz.build                   | 2 --
 toolkit/components/perf/moz.build                               | 2 --
 toolkit/components/places/tests/cpp/moz.build                   | 2 --
 toolkit/components/places/tests/moz.build                       | 2 --
 toolkit/components/prompts/src/moz.build                        | 2 --
 toolkit/components/prompts/test/moz.build                       | 2 --
 toolkit/components/protobuf/moz.build                           | 2 --
 toolkit/components/reflect/moz.build                            | 2 --
 toolkit/components/remote/moz.build                             | 2 --
 toolkit/components/satchel/test/moz.build                       | 2 --
 toolkit/components/search/tests/moz.build                       | 2 --
 toolkit/components/social/test/browser/moz.build                | 2 --
 toolkit/components/startup/moz.build                            | 2 --
 toolkit/components/startup/public/moz.build                     | 2 --
 toolkit/components/statusfilter/moz.build                       | 2 --
 toolkit/components/url-classifier/tests/mochitest/moz.build     | 2 --
 toolkit/components/url-classifier/tests/moz.build               | 2 --
 toolkit/components/urlformatter/tests/moz.build                 | 2 --
 toolkit/components/workerloader/moz.build                       | 2 --
 toolkit/components/workerloader/tests/moz.build                 | 2 --
 toolkit/content/tests/moz.build                                 | 2 --
 toolkit/crashreporter/client/moz.build                          | 2 --
 .../google-breakpad/src/client/linux/crash_generation/moz.build | 2 --
 .../google-breakpad/src/client/linux/handler/moz.build          | 2 --
 .../google-breakpad/src/client/linux/minidump_writer/moz.build  | 2 --
 .../google-breakpad/src/client/mac/crash_generation/moz.build   | 2 --
 .../google-breakpad/src/client/mac/handler/moz.build            | 2 --
 toolkit/crashreporter/google-breakpad/src/client/moz.build      | 2 --
 .../google-breakpad/src/client/solaris/handler/moz.build        | 2 --
 .../crashreporter/google-breakpad/src/common/dwarf/moz.build    | 2 --
 .../crashreporter/google-breakpad/src/common/linux/moz.build    | 2 --
 toolkit/crashreporter/google-breakpad/src/common/mac/moz.build  | 2 --
 toolkit/crashreporter/google-breakpad/src/common/moz.build      | 2 --
 .../crashreporter/google-breakpad/src/common/solaris/moz.build  | 2 --
 toolkit/crashreporter/google-breakpad/src/processor/moz.build   | 2 --
 toolkit/crashreporter/moz.build                                 | 2 --
 toolkit/crashreporter/test/moz.build                            | 2 --
 toolkit/devtools/apps/tests/moz.build                           | 2 --
 toolkit/devtools/server/tests/moz.build                         | 2 --
 toolkit/devtools/sourcemap/tests/moz.build                      | 2 --
 toolkit/devtools/tests/moz.build                                | 2 --
 toolkit/forgetaboutsite/moz.build                               | 2 --
 toolkit/forgetaboutsite/test/browser/moz.build                  | 2 --
 toolkit/forgetaboutsite/test/moz.build                          | 2 --
 toolkit/identity/tests/moz.build                                | 2 --
 toolkit/library/moz.build                                       | 2 --
 toolkit/library/winvccorlib/moz.build                           | 2 --
 toolkit/modules/tests/moz.build                                 | 2 --
 toolkit/mozapps/downloads/moz.build                             | 2 --
 toolkit/mozapps/downloads/tests/moz.build                       | 2 --
 toolkit/mozapps/extensions/test/moz.build                       | 2 --
 toolkit/mozapps/handling/moz.build                              | 2 --
 toolkit/mozapps/plugins/tests/moz.build                         | 2 --
 toolkit/mozapps/update/common/moz.build                         | 2 --
 toolkit/profile/moz.build                                       | 2 --
 toolkit/system/androidproxy/moz.build                           | 2 --
 toolkit/system/dbus/moz.build                                   | 2 --
 toolkit/system/gnome/moz.build                                  | 2 --
 toolkit/system/osxproxy/moz.build                               | 2 --
 toolkit/system/unixproxy/moz.build                              | 2 --
 toolkit/system/windowsproxy/moz.build                           | 2 --
 toolkit/xre/test/moz.build                                      | 2 --
 toolkit/xre/test/win/moz.build                                  | 2 --
 tools/jprof/stub/moz.build                                      | 2 --
 tools/trace-malloc/lib/moz.build                                | 2 --
 uriloader/exthandler/tests/moz.build                            | 2 --
 view/moz.build                                                  | 2 --
 view/public/moz.build                                           | 2 --
 view/src/moz.build                                              | 2 --
 widget/android/moz.build                                        | 2 --
 widget/cocoa/moz.build                                          | 2 --
 widget/gonk/libdisplay/moz.build                                | 2 --
 widget/gonk/moz.build                                           | 2 --
 widget/gonk/nativewindow/moz.build                              | 2 --
 widget/gtk/moz.build                                            | 2 --
 widget/gtkxtbin/moz.build                                       | 2 --
 widget/os2/moz.build                                            | 2 --
 widget/qt/faststartupqt/moz.build                               | 2 --
 widget/qt/moz.build                                             | 2 --
 widget/shared/moz.build                                         | 2 --
 widget/shared/x11/moz.build                                     | 2 --
 widget/tests/moz.build                                          | 2 --
 widget/windows/moz.build                                        | 2 --
 widget/windows/winrt/moz.build                                  | 2 --
 widget/xpwidgets/moz.build                                      | 2 --
 widget/xremoteclient/moz.build                                  | 2 --
 xpcom/base/moz.build                                            | 2 --
 xpcom/build/moz.build                                           | 2 --
 xpcom/components/moz.build                                      | 2 --
 xpcom/ds/moz.build                                              | 2 --
 xpcom/glue/moz.build                                            | 2 --
 xpcom/glue/nomozalloc/moz.build                                 | 2 --
 xpcom/glue/standalone/moz.build                                 | 2 --
 xpcom/glue/standalone/staticruntime/moz.build                   | 2 --
 xpcom/glue/staticruntime/moz.build                              | 2 --
 xpcom/glue/tests/gtest/moz.build                                | 2 --
 xpcom/io/moz.build                                              | 2 --
 xpcom/moz.build                                                 | 2 --
 xpcom/reflect/moz.build                                         | 2 --
 xpcom/reflect/xptcall/moz.build                                 | 2 --
 xpcom/reflect/xptcall/public/moz.build                          | 2 --
 xpcom/reflect/xptcall/src/md/os2/moz.build                      | 2 --
 xpcom/reflect/xptcall/src/md/test/moz.build                     | 2 --
 xpcom/reflect/xptcall/src/md/unix/moz.build                     | 2 --
 xpcom/reflect/xptcall/src/md/win32/moz.build                    | 2 --
 xpcom/reflect/xptcall/src/moz.build                             | 2 --
 xpcom/reflect/xptcall/tests/moz.build                           | 2 --
 xpcom/reflect/xptinfo/moz.build                                 | 2 --
 xpcom/reflect/xptinfo/public/moz.build                          | 2 --
 xpcom/reflect/xptinfo/src/moz.build                             | 2 --
 xpcom/reflect/xptinfo/tests/moz.build                           | 2 --
 xpcom/sample/program/moz.build                                  | 2 --
 xpcom/string/moz.build                                          | 2 --
 xpcom/string/public/moz.build                                   | 2 --
 xpcom/string/src/moz.build                                      | 2 --
 xpcom/system/moz.build                                          | 2 --
 xpcom/tests/external/moz.build                                  | 2 --
 xpcom/tests/moz.build                                           | 2 --
 xpcom/tests/windows/moz.build                                   | 2 --
 xpcom/threads/moz.build                                         | 2 --
 xpcom/typelib/moz.build                                         | 2 --
 xpcom/typelib/xpt/moz.build                                     | 2 --
 xpcom/typelib/xpt/public/moz.build                              | 2 --
 xpcom/typelib/xpt/src/moz.build                                 | 2 --
 xpcom/typelib/xpt/tests/moz.build                               | 2 --
 xpcom/typelib/xpt/tools/moz.build                               | 2 --
 xpfe/appshell/moz.build                                         | 2 --
 xpfe/appshell/src/moz.build                                     | 2 --
 xpfe/components/build/moz.build                                 | 2 --
 xpfe/components/directory/moz.build                             | 2 --
 xpfe/components/moz.build                                       | 2 --
 xpfe/components/windowds/moz.build                              | 2 --
 xulrunner/examples/simple/components/src/moz.build              | 2 --
 xulrunner/examples/simple/moz.build                             | 2 --
 xulrunner/setup/moz.build                                       | 2 --
 xulrunner/stub/moz.build                                        | 2 --
 xulrunner/tools/redit/moz.build                                 | 2 --
 653 files changed, 1299 deletions(-)

diff --git a/accessible/moz.build b/accessible/moz.build
index dbd2b9f8dd25..eadf65148c7d 100644
--- a/accessible/moz.build
+++ b/accessible/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'src']
 TEST_DIRS += ['tests']
 
-MODULE = 'accessibility'
-
diff --git a/accessible/public/ia2/moz.build b/accessible/public/ia2/moz.build
index ba9c2b6207fb..721c65945398 100644
--- a/accessible/public/ia2/moz.build
+++ b/accessible/public/ia2/moz.build
@@ -4,6 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
 LIBRARY_NAME = 'IA2Marshal'
 
diff --git a/accessible/public/msaa/moz.build b/accessible/public/msaa/moz.build
index c268719ddd16..e48698b3536a 100644
--- a/accessible/public/msaa/moz.build
+++ b/accessible/public/msaa/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 LIBRARY_NAME = 'AccessibleMarshal'
 
 GENERATED_SOURCES += [
diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build
index de850523ce46..440b50c57e46 100644
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build
index 8a4057becfb2..1bf3fef7a007 100644
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -6,8 +6,6 @@
 
 include('../shared.mozbuild')
 
-MODULE = 'accessibility'
-
 EXPORTS += [
     'AccEvent.h',
     'nsAccessibilityService.h'
diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build
index 60cacf8432db..bea3c65ea136 100644
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS.mozilla.a11y += [
     'Accessible.h',
     'DocAccessible.h',
diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build
index 74f9d73e5239..ca898c1ff43c 100644
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 UNIFIED_SOURCES += [
     'HTMLCanvasAccessible.cpp',
     'HTMLElementAccessibles.cpp',
diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build
index 214179b45dab..9b51f28124fc 100644
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS += [
     'mozAccessibleProtocol.h',
 ]
diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build
index b1fc971ee094..5e5668ff8e57 100644
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build
index 15c64b9fb9ea..78220523db99 100644
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS += [
     'ia2Accessible.h',
     'ia2AccessibleAction.h',
diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build
index b01389f38ebd..3fa9cdb96cb5 100644
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS += [
     'IUnknownImpl.h',
 ]
diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build
index 196f9b112912..e942e54710fa 100644
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 SOURCES += [
     'sdnAccessible.cpp',
     'sdnDocAccessible.cpp',
diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build
index d2ae55431fd0..4a4fe0f97d11 100644
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 SOURCES += [
     'uiaRawElmProvider.cpp',
 ]
diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build
index 75e2d600e973..9c73400b6bb5 100644
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 EXPORTS += [
     'xpcAccessibleHyperText.h',
     'xpcAccessibleSelectable.h',
diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build
index 34d734aa364b..7a65001f8ffb 100644
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'accessibility'
-
 UNIFIED_SOURCES += [
     'XULAlertAccessible.cpp',
     'XULColorPickerAccessible.cpp',
diff --git a/accessible/tests/moz.build b/accessible/tests/moz.build
index c86ff643d491..a6669fdeae50 100644
--- a/accessible/tests/moz.build
+++ b/accessible/tests/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['mochitest']
 
-MODULE = 'test_accessibility'
-
diff --git a/b2g/components/moz.build b/b2g/components/moz.build
index d4286f2a1ce8..a0ed6421f002 100644
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'B2GComponents'
-
 EXTRA_COMPONENTS += [
     'ActivitiesGlue.js',
     'AlertsService.js',
diff --git a/b2g/components/test/moz.build b/b2g/components/test/moz.build
index 556309ce4095..191c90f0b92d 100644
--- a/b2g/components/test/moz.build
+++ b/b2g/components/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'B2GComponents'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build
index 20215b3cdfba..56b816c220c6 100644
--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'browserabout'
-
 EXPORTS.mozilla.browser += [
     'AboutRedirector.h',
 ]
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 554fdb0f8101..6ab2e24b8ef8 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'browsercomps'
-
 EXPORTS += [
     'nsBrowserCompsCID.h',
 ]
diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build
index b321efdbc356..3d05b516f3ff 100644
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'browserdir'
-
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build
index ece3aa305603..a1216b2e1d6c 100644
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'browser_feeds'
-
 SOURCES += [
     'nsFeedSniffer.cpp',
 ]
diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build
index 7c8acc3255bd..e1f683b9a42d 100644
--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'migration'
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsIEHistoryEnumerator.cpp',
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 7284adb906f2..f9319973706e 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -31,8 +31,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'browsercompsbase'
 
-MODULE = 'browsercomps'
-
 EXTRA_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
index 6e8b843db987..a914bf23e54b 100644
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'shellservice'
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsWindowsShellService.cpp',
diff --git a/browser/fuel/src/moz.build b/browser/fuel/src/moz.build
index 1fc5a0135ddc..5edbd70ece41 100644
--- a/browser/fuel/src/moz.build
+++ b/browser/fuel/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'fuel'
-
 EXTRA_COMPONENTS += [
     'fuelApplication.manifest',
 ]
diff --git a/browser/metro/shell/moz.build b/browser/metro/shell/moz.build
index 374c2099c957..6f76790d995b 100644
--- a/browser/metro/shell/moz.build
+++ b/browser/metro/shell/moz.build
@@ -11,5 +11,3 @@ DIRS += [
 
 TEST_DIRS += ['testing']
 
-MODULE = 'metro'
-
diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index e3d5078e0521..c9ab6ecd17d5 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'robocop'
-
 ANDROID_RESFILES = [
     'res/values/strings.xml',
 ]
diff --git a/build/mobile/sutagent/android/fencp/moz.build b/build/mobile/sutagent/android/fencp/moz.build
index e87b69e5cd4c..835e25a84c14 100644
--- a/build/mobile/sutagent/android/fencp/moz.build
+++ b/build/mobile/sutagent/android/fencp/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'FenCP'
-
 ANDROID_RESFILES = [
     'res/drawable-hdpi/icon.png',
     'res/drawable-ldpi/icon.png',
diff --git a/build/mobile/sutagent/android/ffxcp/moz.build b/build/mobile/sutagent/android/ffxcp/moz.build
index b7774ea2a89e..835e25a84c14 100644
--- a/build/mobile/sutagent/android/ffxcp/moz.build
+++ b/build/mobile/sutagent/android/ffxcp/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'FfxCP'
-
 ANDROID_RESFILES = [
     'res/drawable-hdpi/icon.png',
     'res/drawable-ldpi/icon.png',
diff --git a/build/mobile/sutagent/android/moz.build b/build/mobile/sutagent/android/moz.build
index ff3709c3906d..27426490f46d 100644
--- a/build/mobile/sutagent/android/moz.build
+++ b/build/mobile/sutagent/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'sutAgentAndroid'
-
 ANDROID_RESFILES = [
     'res/drawable/ateamlogo.png',
     'res/drawable/ic_stat_first.png',
diff --git a/build/mobile/sutagent/android/watcher/moz.build b/build/mobile/sutagent/android/watcher/moz.build
index 4f704b34fa71..1794b48751c7 100644
--- a/build/mobile/sutagent/android/watcher/moz.build
+++ b/build/mobile/sutagent/android/watcher/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'Watcher'
-
 ANDROID_RESFILES = [
     'res/drawable-hdpi/ateamlogo.png',
     'res/drawable-hdpi/icon.png',
diff --git a/build/moz.build b/build/moz.build
index 2e44e98d4fae..6b9c35ad5ddf 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -22,5 +22,3 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
         'mobile/robocop',
     ]
 
-MODULE = 'build'
-
diff --git a/build/unix/moz.build b/build/unix/moz.build
index a56537bb5835..1da5d7ed66df 100644
--- a/build/unix/moz.build
+++ b/build/unix/moz.build
@@ -12,5 +12,3 @@ if CONFIG['USE_ELF_HACK']:
 
 TEST_DIRS += ['test']
 
-MODULE = 'build'
-
diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build
index 343349623961..2f0deb490e89 100644
--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'build'
-
 if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']:
     LIBRARY_NAME = 'stdc++compat'
     SOURCES += ['stdc++compat.cpp']
diff --git a/caps/include/moz.build b/caps/include/moz.build
index 92bd909638b7..4346183b265c 100644
--- a/caps/include/moz.build
+++ b/caps/include/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'caps'
-
 EXPORTS += [
     'nsJSPrincipals.h',
 ]
diff --git a/caps/moz.build b/caps/moz.build
index 636e47e99969..3d9f2b173779 100644
--- a/caps/moz.build
+++ b/caps/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['idl', 'include', 'src']
 TEST_DIRS += ['tests/mochitest']
 
-MODULE = 'caps'
-
diff --git a/caps/src/moz.build b/caps/src/moz.build
index 7824bd6d606c..18d4782a4616 100644
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'caps'
-
 SOURCES += [
     'DomainPolicy.cpp',
     'nsJSPrincipals.cpp',
diff --git a/chrome/src/moz.build b/chrome/src/moz.build
index 94d9e0373ef9..128d818797d9 100644
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'chrome'
-
 EXPORTS.mozilla.chrome += [
     'RegistryMessageUtils.h',
 ]
diff --git a/chrome/test/moz.build b/chrome/test/moz.build
index 275255174b47..ddbda2e5ae41 100644
--- a/chrome/test/moz.build
+++ b/chrome/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_chrome'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/content/base/public/moz.build b/content/base/public/moz.build
index ec2461585155..7a947e28453b 100644
--- a/content/base/public/moz.build
+++ b/content/base/public/moz.build
@@ -31,8 +31,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_base'
 
-MODULE = 'content'
-
 EXPORTS += [
     'HTMLSplitOnSpacesTokenizer.h',
     'mozFlushType.h',
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 140c9ca5f04b..0849c0844a4c 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'mozAutoDocUpdate.h',
     'nsAtomListUtils.h',
diff --git a/content/base/test/moz.build b/content/base/test/moz.build
index b8cb40e5dac5..75804bee6616 100644
--- a/content/base/test/moz.build
+++ b/content/base/test/moz.build
@@ -10,8 +10,6 @@ TEST_TOOL_DIRS += [
     'websocket_hybi',
 ]
 
-MODULE = 'content'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/content/canvas/public/moz.build b/content/canvas/public/moz.build
index e05025a6ec0f..87cb2f857dda 100644
--- a/content/canvas/public/moz.build
+++ b/content/canvas/public/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_canvas'
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsICanvasElementExternal.h',
     'nsICanvasRenderingContextInternal.h',
diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
index fde665d7f43b..e43fd79aed81 100644
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS.mozilla.dom += [
     'CanvasGradient.h',
     'CanvasPattern.h',
diff --git a/content/events/public/moz.build b/content/events/public/moz.build
index ef2cfd0c5ced..d17aa7044f16 100644
--- a/content/events/public/moz.build
+++ b/content/events/public/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_events'
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsAsyncDOMEvent.h',
     'nsDOMKeyNameList.h',
diff --git a/content/events/src/moz.build b/content/events/src/moz.build
index 08576ee5c57d..360e4fa535ce 100644
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsDOMEvent.h',
     'nsDOMEventTargetHelper.h',
diff --git a/content/html/content/public/moz.build b/content/html/content/public/moz.build
index 268e6fdf800f..27762a01850f 100644
--- a/content/html/content/public/moz.build
+++ b/content/html/content/public/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_html'
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsFormSubmission.h',
     'nsIConstraintValidation.h',
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index 5721cfd168d3..ffb5c2df8062 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'HTMLPropertiesCollection.h',
     'nsGenericHTMLElement.h',
diff --git a/content/html/document/public/moz.build b/content/html/document/public/moz.build
index c4f4454a4707..b2b0b968e57b 100644
--- a/content/html/document/public/moz.build
+++ b/content/html/document/public/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_htmldoc'
 
-MODULE = 'content'
-
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index fd70c53f74e2..8824c1cd856a 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsIHTMLDocument.h',
 ]
diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build
index f17213a5e814..671726069368 100644
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 SOURCES += [
     'nsMathMLElement.cpp',
     'nsMathMLElementFactory.cpp',
diff --git a/content/media/apple/moz.build b/content/media/apple/moz.build
index cdd85d5fc42d..7af146271b8f 100644
--- a/content/media/apple/moz.build
+++ b/content/media/apple/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'AppleDecoder.h',
     'AppleMP3Reader.h',
diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build
index b2b1aa15e817..6badb1001bef 100644
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'AudioSinkFilter.h',
     'AudioSinkInputPin.h',
diff --git a/content/media/encoder/moz.build b/content/media/encoder/moz.build
index 1167001acb7e..92cd783416ff 100644
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'ContainerWriter.h',
     'EncodedFrameContainer.h',
diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build
index 91382f6934e6..03a0a0f22378 100644
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'GStreamerDecoder.h',
     'GStreamerFormatHelper.h',
diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build
index 87d50dc3eebf..0e599416ed1f 100644
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -7,8 +7,6 @@ PARALLEL_DIRS += [
     'test'
 ]
 
-MODULE = 'content'
-
 EXPORTS += [
     'AsyncEventRunner.h',
     'MediaSourceDecoder.h',
diff --git a/content/media/moz.build b/content/media/moz.build
index dbd1c4a9ed96..445907236761 100644
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -48,8 +48,6 @@ PARALLEL_DIRS += ['webspeech']
 
 TEST_DIRS += ['test']
 
-MODULE = 'content'
-
 EXPORTS += [
     'AbstractMediaDecoder.h',
     'AudioAvailableEventManager.h',
diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build
index 14a5968974ab..60273677a1e8 100644
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'OggCodecState.h',
     'OggDecoder.h',
diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build
index e80c13bcbcfa..acd72736009e 100644
--- a/content/media/omx/mediaresourcemanager/moz.build
+++ b/content/media/omx/mediaresourcemanager/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 SOURCES += [
     'IMediaResourceManagerClient.cpp',
     'IMediaResourceManagerDeathNotifier.cpp',
diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build
index 7f4d5a3fee6b..a3f8173b1f5e 100644
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'MediaOmxDecoder.h',
     'MediaOmxReader.h',
diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build
index 68e8909f7a2c..c884b010b590 100644
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'MediaPluginDecoder.h',
     'MediaPluginHost.h',
diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build
index dce548024960..19e3eb382968 100644
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'RawDecoder.h',
     'RawReader.h',
diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build
index 0a9e0d57cf0e..972fcc2bc61b 100644
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'WaveDecoder.h',
     'WaveReader.h',
diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build
index c556c5c31795..6596dfaa5d96 100644
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 SOURCES += [
     'Biquad.cpp',
     'DirectConvolver.cpp',
diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build
index a41c49bd90fa..cc43ea80a4d9 100644
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -8,8 +8,6 @@ PARALLEL_DIRS += ['blink', 'test']
 
 TEST_TOOL_DIRS += ['compiledtest']
 
-MODULE = 'content'
-
 EXPORTS += [
     'AudioParamTimeline.h',
     'MediaBufferDecoder.h',
diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build
index f0ac8b2c04d2..3a52f254d3a1 100644
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'WebMDecoder.h',
     'WebMReader.h',
diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
index 82ac370c340e..380683a4a450 100644
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -6,8 +6,6 @@
 
 XPIDL_MODULE = 'content_webrtc'
 
-MODULE = 'content'
-
 EXPORTS += [
     'MediaEngine.h',
     'MediaEngineDefault.h',
diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build
index 3578aad7c895..4ab1e4e8910b 100644
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -3,8 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 XPIDL_MODULE = 'dom_webspeechrecognition'
 
 XPIDL_SOURCES = [
diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build
index 602bab65ffa2..3a423f512675 100644
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WEBSPEECH']:
-    MODULE = 'content'
 
     TEST_DIRS += ['test', 'ipc/test']
 
diff --git a/content/media/webspeech/synth/pico/moz.build b/content/media/webspeech/synth/pico/moz.build
index 865af3c717d7..1a5fc5a6da45 100644
--- a/content/media/webspeech/synth/pico/moz.build
+++ b/content/media/webspeech/synth/pico/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'synthpico'
-
 SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
diff --git a/content/media/webvtt/moz.build b/content/media/webvtt/moz.build
index 87af89fb4ef4..7eb4eef05b58 100644
--- a/content/media/webvtt/moz.build
+++ b/content/media/webvtt/moz.build
@@ -9,8 +9,6 @@ XPIDL_SOURCES += [
   'nsIWebVTTParserWrapper.idl',
 ]
 
-MODULE = 'webvtt'
-
 XPIDL_MODULE = 'webvtt'
 
 EXTRA_COMPONENTS += [
diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build
index d48cf156a96d..240e1d1e87d3 100644
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'WMF.h',
     'WMFDecoder.h',
diff --git a/content/moz.build b/content/moz.build
index a96e8000b2df..3d80a388e07d 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -21,5 +21,3 @@ PARALLEL_DIRS += [
 
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'content'
-
diff --git a/content/smil/moz.build b/content/smil/moz.build
index 3240e23c8663..d8cb7f84400b 100644
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -6,8 +6,6 @@
 
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsDOMTimeEvent.h',
     'nsISMILAttr.h',
diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
index afc6ea7c288b..4b21edd69945 100644
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsSVGClass.h',
     'nsSVGElement.h',
diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build
index 08af7baa3d4e..6c90888caf0d 100644
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS.mozilla.dom += [
     'SVGDocument.h',
 ]
diff --git a/content/test/moz.build b/content/test/moz.build
index 5f3fdbf0250f..191c90f0b92d 100644
--- a/content/test/moz.build
+++ b/content/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_content'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build
index 891a772d027a..72675439abef 100644
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsBindingManager.h',
     'nsXBLBinding.h',
diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build
index adf5fb09226e..ba4066021c8e 100644
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
     'nsXMLElement.h',
diff --git a/content/xml/document/public/moz.build b/content/xml/document/public/moz.build
index 1cb923cf858e..8d825d210cb1 100644
--- a/content/xml/document/public/moz.build
+++ b/content/xml/document/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsIXMLContentSink.h',
 ]
diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build
index 81e864ab69bf..0230ff8e9e19 100644
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
-
 EXPORTS.mozilla.dom += [
     'XMLDocument.h',
 ]
diff --git a/content/xslt/public/moz.build b/content/xslt/public/moz.build
index d64b93f8cebe..b8093c78ec1b 100644
--- a/content/xslt/public/moz.build
+++ b/content/xslt/public/moz.build
@@ -16,8 +16,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'content_xslt'
 
-MODULE = 'content'
-
 EXPORTS += [
     'nsIDocumentTransformer.h',
 ]
diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build
index 33885c949667..36b0355b5575 100644
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'transformiix'
-
 SOURCES += [
     'txDouble.cpp',
     'txExpandedNameMap.cpp',
diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build
index 26a33b36bda7..ed92c654a8a2 100644
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'transformiix'
-
 SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build
index 391fe788e699..8e17408f9677 100644
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'transformiix'
-
 EXPORTS.mozilla.dom += [
     'XPathEvaluator.h',
 ]
diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build
index fb7280ad1b6c..63f043d9fa00 100644
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'transformiix'
-
 SOURCES += [
     'txBufferingHandler.cpp',
     'txCurrentFunctionCall.cpp',
diff --git a/content/xul/content/moz.build b/content/xul/content/moz.build
index 0389e6e30902..c3ee957316e2 100644
--- a/content/xul/content/moz.build
+++ b/content/xul/content/moz.build
@@ -7,5 +7,3 @@
 PARALLEL_DIRS += ['public', 'src']
 TEST_DIRS += ['test']
 
-MODULE = 'xul'
-
diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build
index a4753051a894..487ca3ad0758 100644
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xul'
-
 if CONFIG['MOZ_XUL']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
diff --git a/content/xul/document/moz.build b/content/xul/document/moz.build
index 80b9179d8e38..ac02dca4166e 100644
--- a/content/xul/document/moz.build
+++ b/content/xul/document/moz.build
@@ -7,5 +7,3 @@
 PARALLEL_DIRS += ['public', 'src']
 DIRS += ['test']
 
-MODULE = 'xuldoc'
-
diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build
index ca1765db892a..cd4510fcbd9f 100644
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xuldoc'
-
 SOURCES += [
     'nsXULControllers.cpp',
 ]
diff --git a/content/xul/templates/moz.build b/content/xul/templates/moz.build
index 448cf5654797..b80ea7771ab6 100644
--- a/content/xul/templates/moz.build
+++ b/content/xul/templates/moz.build
@@ -7,5 +7,3 @@
 PARALLEL_DIRS += ['public', 'src']
 TEST_TOOL_DIRS += ['tests/chrome']
 
-MODULE = 'xultmpl'
-
diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build
index 315bdc5f3776..aaa1c12c48ca 100644
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xultmpl'
-
 SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build
index f6f4a5e7beeb..aa3bad43a1ab 100644
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'sqlite3'
 NO_VISIBILITY_FLAGS = True
 
 EXPORTS += [
diff --git a/docshell/build/moz.build b/docshell/build/moz.build
index bd8b89cf6781..e7f2ebe3c849 100644
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'docshell'
-
 EXPORTS += [
     'nsDocShellCID.h',
 ]
diff --git a/docshell/moz.build b/docshell/moz.build
index 11f967ae4b6c..4ef351161e63 100644
--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -13,5 +13,3 @@ DIRS += [
 
 TEST_DIRS += ['test']
 
-MODULE = 'docshell'
-
diff --git a/docshell/shistory/moz.build b/docshell/shistory/moz.build
index b3caabfcc245..76218104c014 100644
--- a/docshell/shistory/moz.build
+++ b/docshell/shistory/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'shistory'
-
diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build
index 34a3c6bea927..689f7670d727 100644
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'shistory'
-
 EXPORTS += [
     'nsSHEntryShared.h',
 ]
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
index 9abc6c9ccca8..db934aaefc62 100644
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['chrome', 'navigation', 'browser']
 
-MODULE = 'test_docshell'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/docshell/test/navigation/moz.build b/docshell/test/navigation/moz.build
index 93c543078292..363dfa971e6e 100644
--- a/docshell/test/navigation/moz.build
+++ b/docshell/test/navigation/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_docshell'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build
index 7e4b18b2e82b..df24bb12ccbd 100644
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'Activity.h',
 ]
diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
index 64b4625b31e4..32ce325f0225 100644
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_alarm'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom.alarm += [
     'AlarmHalService.h',
 ]
diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build
index b384e0ca111e..bb9369dd9b5d 100644
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -12,8 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_audiochannel'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'AudioChannelAgent.h',
     'AudioChannelCommon.h',
diff --git a/dom/audiochannel/tests/moz.build b/dom/audiochannel/tests/moz.build
index e1148d182ff1..9ab9fe0a3cfc 100644
--- a/dom/audiochannel/tests/moz.build
+++ b/dom/audiochannel/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 CPP_UNIT_TESTS += [
     'TestAudioChannelService.cpp',
 ]
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 0c4ca56df059..8323a70fa587 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS.mozilla += [
     'ErrorResult.h',
 ]
diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build
index 0dffba90fdc3..82db3c691cbc 100644
--- a/dom/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 LIBXUL_LIBRARY = True
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
index df5300b4d826..b94755f78dd9 100644
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -8,7 +8,6 @@ if CONFIG['MOZ_B2G_BT']:
     PARALLEL_DIRS += ['interfaces']
 
     LIBXUL_LIBRARY = True
-    MODULE = 'dom'
     LIBRARY_NAME = 'dombluetooth_s'
 
     SOURCES += [
diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build
index 5bed95a88dd1..01a5ca1ff830 100644
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -8,8 +8,6 @@ TEST_DIRS += ['mochitest']
 
 XPIDL_MODULE = 'dom_browserelement'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla += [
     'BrowserElementParent.h',
 ]
diff --git a/dom/camera/moz.build b/dom/camera/moz.build
index 88b5a25bacf7..4d186dcee491 100644
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -13,8 +13,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
 
 XPIDL_MODULE = 'dom_camera'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'CameraCommon.h',
     'CameraPreviewMediaStream.h',
diff --git a/dom/datastore/moz.build b/dom/datastore/moz.build
index f33b243fe0dd..e167b54ac16c 100644
--- a/dom/datastore/moz.build
+++ b/dom/datastore/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_datastore'
 
-MODULE = 'dom'
-
 EXTRA_COMPONENTS += [
     'DataStore.manifest',
     'DataStoreService.js',
diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build
index 08809a3807e7..219416f10322 100644
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -8,8 +8,6 @@ TEST_DIRS += ['test', 'ipc']
 
 XPIDL_MODULE = 'dom_devicestorage'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'DeviceStorage.h',
     'nsDeviceStorage.h',
diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build
index 7e71db2e5d83..09d8fbfc59a2 100644
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'EncodingUtils.h',
     'FallbackEncoding.h',
diff --git a/dom/file/moz.build b/dom/file/moz.build
index ce58c23cba7c..451643115820 100644
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_file'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsIFileStorage.h',
 ]
diff --git a/dom/fmradio/moz.build b/dom/fmradio/moz.build
index 3806d5414468..dc1265234991 100644
--- a/dom/fmradio/moz.build
+++ b/dom/fmradio/moz.build
@@ -9,8 +9,6 @@ if CONFIG['MOZ_B2G_FM']:
         'ipc',
     ]
 
-    MODULE = 'dom'
-
     EXPORTS.mozilla.dom += [
         'FMRadio.h',
         'FMRadioCommon.h',
diff --git a/dom/icc/tests/moz.build b/dom/icc/tests/moz.build
index 4aedcd7033c0..895d11993cfb 100644
--- a/dom/icc/tests/moz.build
+++ b/dom/icc/tests/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_dom_icc'
-
diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build
index 7e413ff0230f..bda58a8c22ae 100644
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom.indexedDB += [
     'SerializationHelpers.h',
 ]
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index bbaf3f33b135..6f263b961e9d 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_indexeddb'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom.indexedDB += [
     'Client.h',
     'DatabaseInfo.h',
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build
index c78e9e6d8c05..651aa00abeae 100644
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_inputmethod'
 
-MODULE = 'dom'
-
 EXTRA_COMPONENTS += [
     'InputMethod.manifest',
     'MozKeyboard.js',
diff --git a/dom/interfaces/apps/moz.build b/dom/interfaces/apps/moz.build
index e44db282129d..7967d4f13c6b 100644
--- a/dom/interfaces/apps/moz.build
+++ b/dom/interfaces/apps/moz.build
@@ -16,5 +16,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_apps'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/base/moz.build b/dom/interfaces/base/moz.build
index e207f266f096..f436e39bda41 100644
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -60,5 +60,3 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 XPIDL_MODULE = 'dom_base'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/canvas/moz.build b/dom/interfaces/canvas/moz.build
index 0a784c084657..294570d66db9 100644
--- a/dom/interfaces/canvas/moz.build
+++ b/dom/interfaces/canvas/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_canvas'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build
index 848b65f68b3b..fc286c08e4ec 100644
--- a/dom/interfaces/core/moz.build
+++ b/dom/interfaces/core/moz.build
@@ -29,5 +29,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_core'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/css/moz.build b/dom/interfaces/css/moz.build
index a046806095ed..f523d87ba684 100644
--- a/dom/interfaces/css/moz.build
+++ b/dom/interfaces/css/moz.build
@@ -33,5 +33,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_css'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build
index 69ec7473db3f..23c211b368c3 100644
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'dom_devicestorage'
-
-MODULE = 'dom'
diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build
index 81815a988ceb..ce5dc7f41585 100644
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -52,5 +52,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_events'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/geolocation/moz.build b/dom/interfaces/geolocation/moz.build
index bd5aef1f7021..c7247c12a9ec 100644
--- a/dom/interfaces/geolocation/moz.build
+++ b/dom/interfaces/geolocation/moz.build
@@ -15,5 +15,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_geolocation'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build
index 784332e07cd6..aa4e3d0a5c68 100644
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -68,5 +68,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_html'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/json/moz.build b/dom/interfaces/json/moz.build
index cbd82e5dbbdd..a212ca317330 100644
--- a/dom/interfaces/json/moz.build
+++ b/dom/interfaces/json/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_json'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/notification/moz.build b/dom/interfaces/notification/moz.build
index c87af1a9ec74..1c048ac7fc8b 100644
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_notification'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/offline/moz.build b/dom/interfaces/offline/moz.build
index 047461e04e27..da4184ab5423 100644
--- a/dom/interfaces/offline/moz.build
+++ b/dom/interfaces/offline/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_offline'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/permission/moz.build b/dom/interfaces/permission/moz.build
index 500cd8d66c43..8d328b8d413e 100644
--- a/dom/interfaces/permission/moz.build
+++ b/dom/interfaces/permission/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_permissionsettings'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/range/moz.build b/dom/interfaces/range/moz.build
index 067455ea8309..b5e72706c0e9 100644
--- a/dom/interfaces/range/moz.build
+++ b/dom/interfaces/range/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_range'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/settings/moz.build b/dom/interfaces/settings/moz.build
index e901974686a8..6f74a2153ae1 100644
--- a/dom/interfaces/settings/moz.build
+++ b/dom/interfaces/settings/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_settings'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/sidebar/moz.build b/dom/interfaces/sidebar/moz.build
index 774bf3b40b43..071c1e2c3983 100644
--- a/dom/interfaces/sidebar/moz.build
+++ b/dom/interfaces/sidebar/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_sidebar'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/smil/moz.build b/dom/interfaces/smil/moz.build
index ee14741da910..3d77223557de 100644
--- a/dom/interfaces/smil/moz.build
+++ b/dom/interfaces/smil/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_smil'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build
index cc7fffec7225..9dc8d1b381f5 100644
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_storage'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsPIDOMStorage.h',
 ]
diff --git a/dom/interfaces/stylesheets/moz.build b/dom/interfaces/stylesheets/moz.build
index 45a4aa3dd61f..d2dc8aed3a2d 100644
--- a/dom/interfaces/stylesheets/moz.build
+++ b/dom/interfaces/stylesheets/moz.build
@@ -12,5 +12,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_stylesheets'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/svg/moz.build b/dom/interfaces/svg/moz.build
index 529082121a26..4fb8111e4172 100644
--- a/dom/interfaces/svg/moz.build
+++ b/dom/interfaces/svg/moz.build
@@ -12,5 +12,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_svg'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/traversal/moz.build b/dom/interfaces/traversal/moz.build
index 3b19b9e3bbd0..3d55e4d33a52 100644
--- a/dom/interfaces/traversal/moz.build
+++ b/dom/interfaces/traversal/moz.build
@@ -12,5 +12,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_traversal'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/xbl/moz.build b/dom/interfaces/xbl/moz.build
index 6330f7f4bbfc..4e37769d644e 100644
--- a/dom/interfaces/xbl/moz.build
+++ b/dom/interfaces/xbl/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xbl'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/xpath/moz.build b/dom/interfaces/xpath/moz.build
index 358451336a1c..d31f0de9cd8c 100644
--- a/dom/interfaces/xpath/moz.build
+++ b/dom/interfaces/xpath/moz.build
@@ -15,5 +15,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xpath'
 
-MODULE = 'dom'
-
diff --git a/dom/interfaces/xul/moz.build b/dom/interfaces/xul/moz.build
index ec867aee6292..99e696648205 100644
--- a/dom/interfaces/xul/moz.build
+++ b/dom/interfaces/xul/moz.build
@@ -29,5 +29,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_xul'
 
-MODULE = 'dom'
-
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 2c592b1b1e76..b40a8afca90f 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     TEST_DIRS += ['tests']
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsICachedFileDescriptorListener.h',
     'PCOMContentPermissionRequestChild.h',
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 15f30a920a71..f3e44a84c12f 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -22,8 +22,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_media'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'GetUserMediaRequest.h',
 ]
diff --git a/dom/moz.build b/dom/moz.build
index 8012d2177c73..599efe947784 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -111,5 +111,3 @@ TEST_DIRS += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows', 'android', 'qt', 'os2'):
     TEST_DIRS += ['plugins/test']
 
-MODULE = 'dom'
-
diff --git a/dom/network/tests/moz.build b/dom/network/tests/moz.build
index 191a5d6babbe..1384a5138949 100644
--- a/dom/network/tests/moz.build
+++ b/dom/network/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_dom_socket'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
 
 if CONFIG['MOZ_B2G_RIL']:
diff --git a/dom/nfc/moz.build b/dom/nfc/moz.build
index cc3625398abf..50b8f7c106e6 100644
--- a/dom/nfc/moz.build
+++ b/dom/nfc/moz.build
@@ -6,7 +6,6 @@
 # Copyright © 2013 Deutsche Telekom, Inc.
 
 if CONFIG['MOZ_NFC']:
-    MODULE = 'dom'
     EXPORTS.mozilla.dom += [
         'MozNdefRecord.h',
     ]
diff --git a/dom/payment/tests/moz.build b/dom/payment/tests/moz.build
index c74b89b19ed6..191c90f0b92d 100644
--- a/dom/payment/tests/moz.build
+++ b/dom/payment/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_dom_payment'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/permission/tests/moz.build b/dom/permission/tests/moz.build
index 0a139eb34cf9..b4ecb536e868 100644
--- a/dom/permission/tests/moz.build
+++ b/dom/permission/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_permission'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build
index 4cf484fc1e21..4eb8b64d9296 100644
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'plugin'
-
 EXPORTS += [
     'android_npapi.h',
     'ANPKeyCodes.h',
diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build
index 8963e4334994..0503096f9e2a 100644
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['interpose']
 
-MODULE = 'dom'
-
 EXPORTS.mozilla += [
     'PluginLibrary.h',
 ]
diff --git a/dom/plugins/test/moz.build b/dom/plugins/test/moz.build
index f30e4ec9d2e6..6a17dfb5e690 100644
--- a/dom/plugins/test/moz.build
+++ b/dom/plugins/test/moz.build
@@ -9,6 +9,4 @@ DIRS += ['testplugin']
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows'):
     TEST_DIRS += ['mochitest']
 
-MODULE = 'test_plugin'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/plugins/test/testplugin/moz.build b/dom/plugins/test/testplugin/moz.build
index f451ccf51fdd..c54fa4675f1a 100644
--- a/dom/plugins/test/testplugin/moz.build
+++ b/dom/plugins/test/testplugin/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['secondplugin']
 
-MODULE = 'nptest'
-
 LIBRARY_NAME = 'nptest'
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
diff --git a/dom/plugins/test/testplugin/secondplugin/moz.build b/dom/plugins/test/testplugin/secondplugin/moz.build
index 1e06e7831213..a9e6cca1e709 100644
--- a/dom/plugins/test/testplugin/secondplugin/moz.build
+++ b/dom/plugins/test/testplugin/secondplugin/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'npsecondtest'
-
 LIBRARY_NAME = 'npsecondtest'
 
 relative_path = '..'
diff --git a/dom/promise/moz.build b/dom/promise/moz.build
index 366a3e394df2..a068a803d894 100644
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -8,8 +8,6 @@ TEST_DIRS += ['tests']
 
 XPIDL_MODULE = 'dom_promise'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'Promise.h',
 ]
diff --git a/dom/quota/moz.build b/dom/quota/moz.build
index 60e883ca1e70..bd247c96f363 100644
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -12,8 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_quota'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsIOfflineStorage.h',
 ]
diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build
index 559c2073ed0c..dcbd134ea3c0 100644
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 SOURCES += [
     'nsJSEventListener.cpp',
 ]
diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build
index 8c9b7e44b901..d6d788d71baf 100644
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsGeoPosition.h',
     'nsGeoPositionIPCSerialiser.h',
diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build
index 86e32f884868..c747f82708d6 100644
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsJSON.h',
 ]
diff --git a/dom/src/json/test/moz.build b/dom/src/json/test/moz.build
index c8fc2cee26d4..b4ecb536e868 100644
--- a/dom/src/json/test/moz.build
+++ b/dom/src/json/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'json_test'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build
index 0bb44c6da259..cfaa6fcf28c8 100644
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'jsurl'
-
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build
index 0dd7cf37c61f..acf15a6e3767 100644
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXTRA_COMPONENTS += [
     'NotificationStorage.js',
     'NotificationStorage.manifest',
diff --git a/dom/src/offline/moz.build b/dom/src/offline/moz.build
index fb0e91a77e52..8365f76bdaa3 100644
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build
index e29212ea1699..0ee47d98a105 100644
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'DOMStorageIPC.h',
 ]
diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build
index 95c9e071bb96..4078f862d437 100644
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index d4fc9d8d9341..13e0be9969ee 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -29,8 +29,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system_gonk'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'GonkGPSGeolocationProvider.h',
     'nsVolume.h',
diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build
index 45992bfe1128..92b86f0dc43b 100644
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 SOURCES += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
diff --git a/dom/system/moz.build b/dom/system/moz.build
index 67f0ea36ba02..c3a92afadf5f 100644
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -25,8 +25,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_system'
 
-MODULE = 'dom'
-
 EXPORTS += [
     'nsDeviceSensors.h',
 ]
diff --git a/dom/system/tests/moz.build b/dom/system/tests/moz.build
index bef0edd146e3..87c88dfddbc5 100644
--- a/dom/system/tests/moz.build
+++ b/dom/system/tests/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_domsystem'
-
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build
index f4d7752c4515..1a77b611018e 100644
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     GENERATED_SOURCES += [
         'moc_QTMLocationProvider.cpp',
diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build
index aa720c197fd7..9c0a5f1d27d4 100644
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 SOURCES += [
     'nsHapticFeedback.cpp',
 ]
diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build
index 7a3a7ccc033b..5e44914a36c0 100644
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_telephony'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'CallEvent.h',
     'CallsList.h',
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index a58aa49ee1d0..fcdc56bc5b36 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['mochitest', 'browser']
 
-MODULE = 'test_dom'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/time/moz.build b/dom/time/moz.build
index 6fd7e1b2f936..ff6e716605f5 100644
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_time'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom.time += [
     'DateCacheCleaner.h',
     'TimeChangeObserver.h',
diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build
index bb304241d1c4..da6f39e78bbb 100644
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -12,8 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_voicemail'
 
-MODULE = 'dom'
-
 EXPORTS.mozilla.dom += [
     'Voicemail.h',
 ]
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 35c2270aa018..e3db21266b89 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dom'
-
 GENERATED_WEBIDL_FILES = [
     'CSS2Properties.webidl',
 ]
diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build
index a2a701320953..39081144e002 100644
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -13,8 +13,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_wifi'
 
-MODULE = 'dom'
-
 EXTRA_COMPONENTS += [
     'DOMWifiManager.js',
     'DOMWifiManager.manifest',
diff --git a/dom/workers/moz.build b/dom/workers/moz.build
index 204e401e9221..4f70435dcfb8 100644
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'dom'
-
 # Public stuff.
 EXPORTS.mozilla.dom += [
     'WorkerPrivate.h',
diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build
index 0af1de6add72..8948b302c9bb 100644
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'editor'
-
 UNIFIED_SOURCES += [
     'nsComposerCommands.cpp',
     'nsComposerCommandsUpdater.cpp',
diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build
index b8682e5bca3d..bac029aa63bd 100644
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'editor'
-
 UNIFIED_SOURCES += [
     'ChangeAttributeTxn.cpp',
     'ChangeCSSInlineStyleTxn.cpp',
diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build
index a494d79ec204..721307eebe4a 100644
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'editor'
-
 UNIFIED_SOURCES += [
     'nsEditProperty.cpp',
     'nsHTMLAbsPosition.cpp',
diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build
index b244c51ed407..7df8238ea92e 100644
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'editor'
-
 UNIFIED_SOURCES += [
     'nsInternetCiter.cpp',
     'nsPlaintextDataTransfer.cpp',
diff --git a/editor/moz.build b/editor/moz.build
index 9aea7eb43b0e..cca3450f96c2 100644
--- a/editor/moz.build
+++ b/editor/moz.build
@@ -13,8 +13,6 @@ PARALLEL_DIRS += [
     'composer',
 ]
 
-MODULE = 'editor'
-
 EXTRA_JS_MODULES += [
     'AsyncSpellCheckTestHelper.jsm',
 ]
diff --git a/editor/public/moz.build b/editor/public/moz.build
index 51968bbb36ce..30eb73e25e2e 100644
--- a/editor/public/moz.build
+++ b/editor/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'editor'
-
 EXPORTS += [
     'nsEditorCID.h',
 ]
diff --git a/editor/txmgr/moz.build b/editor/txmgr/moz.build
index bea5960ff20c..c0a3f89138a1 100644
--- a/editor/txmgr/moz.build
+++ b/editor/txmgr/moz.build
@@ -7,5 +7,3 @@
 PARALLEL_DIRS += ['public', 'src', 'idl']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'txmgr'
-
diff --git a/editor/txmgr/public/moz.build b/editor/txmgr/public/moz.build
index 8ea255260213..d7d91220d889 100644
--- a/editor/txmgr/public/moz.build
+++ b/editor/txmgr/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'txmgr'
-
 EXPORTS += [
     'nsTransactionManagerCID.h',
 ]
diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build
index 73743873b08b..e05f70afce7f 100644
--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'txmgr'
-
 UNIFIED_SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
diff --git a/editor/txtsvc/moz.build b/editor/txtsvc/moz.build
index 9511239167e2..6e8d32f7d472 100644
--- a/editor/txtsvc/moz.build
+++ b/editor/txtsvc/moz.build
@@ -6,5 +6,3 @@
 
 PARALLEL_DIRS += ['public', 'src']
 
-MODULE = 'txtsvc'
-
diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build
index 30db33e7fc8e..b1ba7a361ebf 100644
--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'txtsvc'
-
 UNIFIED_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build
index 44d67d35306c..2043b74416b6 100644
--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'webbrwsr'
-
 SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build
index 67a0cbd19ff8..d6a68dc20e47 100644
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -31,8 +31,6 @@ if CONFIG['NS_PRINTING']:
 
 XPIDL_MODULE = 'webBrowser_core'
 
-MODULE = 'webbrwsr'
-
 EXPORTS += [
     'nsCTooltipTextProvider.h',
 ]
diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build
index 74d1dcac6bda..20b7aae58f53 100644
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 EXPORTS += [
     'nsIAppStartupNotifier.h',
 ]
diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build
index 7a8e1b4be3a4..5299e535b856 100644
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
diff --git a/embedding/components/commandhandler/moz.build b/embedding/components/commandhandler/moz.build
index 846faa22e26d..76218104c014 100644
--- a/embedding/components/commandhandler/moz.build
+++ b/embedding/components/commandhandler/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'commandhandler'
-
diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build
index 448157e5ef34..d3f90f2c4692 100644
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'commandhandler'
-
 SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
diff --git a/embedding/components/find/moz.build b/embedding/components/find/moz.build
index bbac774d1331..76218104c014 100644
--- a/embedding/components/find/moz.build
+++ b/embedding/components/find/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'find'
-
diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build
index 55b273f12413..b54c149d1d34 100644
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'find'
-
 SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build
index ceb0a5399688..6b17ebb3689b 100644
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
diff --git a/embedding/components/printingui/src/os2/moz.build b/embedding/components/printingui/src/os2/moz.build
index dd85287806d5..249cbf51c754 100644
--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build
index f5a20554f433..c41f726881d7 100644
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build
index 092e3fe3b277..65df62a4c960 100644
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintingPromptService.cpp',
diff --git a/embedding/components/webbrowserpersist/moz.build b/embedding/components/webbrowserpersist/moz.build
index 4382f2a62424..76218104c014 100644
--- a/embedding/components/webbrowserpersist/moz.build
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'webbrowserpersist'
-
diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build
index 3c346abe0b28..6283358cd999 100644
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'webbrowserpersist'
-
 SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build
index f683109c6b11..e74ca450ec9b 100644
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'embedcomponents'
-
 SOURCES += [
     'nsAutoWindowStateHelper.cpp',
     'nsWindowWatcher.cpp',
diff --git a/embedding/moz.build b/embedding/moz.build
index c18c33dcb9f2..6b326a85cf7d 100644
--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -7,7 +7,5 @@
 DIRS += ['base', 'components', 'browser']
 TEST_DIRS += ['test']
 
-MODULE = 'embed'
-
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build
index 5df6fbadeee0..25cc4ba25a5a 100644
--- a/embedding/tests/winEmbed/moz.build
+++ b/embedding/tests/winEmbed/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'winEmbed'
-
 PROGRAM = 'winEmbed'
 
 SOURCES += [
diff --git a/extensions/auth/moz.build b/extensions/auth/moz.build
index 7a8327a143bd..aa6df9c71c5e 100644
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'auth'
-
 SOURCES += [
     'nsAuthFactory.cpp',
     'nsAuthGSSAPI.cpp',
diff --git a/extensions/cookie/test/moz.build b/extensions/cookie/test/moz.build
index d1a891b30e62..ca3c62398d89 100644
--- a/extensions/cookie/test/moz.build
+++ b/extensions/cookie/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_cookies'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/extensions/gio/moz.build b/extensions/gio/moz.build
index 489dac5c0cad..5da5d9f1e364 100644
--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'nkgio'
-
 SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
diff --git a/extensions/gnomevfs/moz.build b/extensions/gnomevfs/moz.build
index 4ab584371ae6..940e66b8e6bc 100644
--- a/extensions/gnomevfs/moz.build
+++ b/extensions/gnomevfs/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'nkgnomevfs'
-
 SOURCES += [
     'nsGnomeVFSProtocolHandler.cpp',
 ]
diff --git a/extensions/permissions/moz.build b/extensions/permissions/moz.build
index 8889b616a755..2812f3dbf0c9 100644
--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'permissions'
-
 SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
diff --git a/extensions/pref/autoconfig/moz.build b/extensions/pref/autoconfig/moz.build
index 9e8c4c422558..76218104c014 100644
--- a/extensions/pref/autoconfig/moz.build
+++ b/extensions/pref/autoconfig/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'autoconfig'
-
diff --git a/extensions/pref/autoconfig/src/moz.build b/extensions/pref/autoconfig/src/moz.build
index 8f6389247c2a..3c568cfcf633 100644
--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'autoconfig'
-
 SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
diff --git a/extensions/spellcheck/hunspell/moz.build b/extensions/spellcheck/hunspell/moz.build
index 4e07949d242b..6127b028cfb9 100644
--- a/extensions/spellcheck/hunspell/moz.build
+++ b/extensions/spellcheck/hunspell/moz.build
@@ -6,7 +6,5 @@
 
 DIRS += ['src']
 
-MODULE = 'hunspell'
-
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build
index 3ee85279f377..f8b86b71efd7 100644
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'hunspell'
-
 SOURCES += [
     'mozHunspell.cpp',
     'mozHunspellDirProvider.cpp',
diff --git a/extensions/spellcheck/moz.build b/extensions/spellcheck/moz.build
index 2ec60cf282ca..a4c0e0a18213 100644
--- a/extensions/spellcheck/moz.build
+++ b/extensions/spellcheck/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['idl', 'locales', 'hunspell', 'src']
 TEST_DIRS += ['tests/chrome']
 
-MODULE = 'spellchecker'
-
diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
index 3b0dc38a0beb..02bb06c22d3f 100644
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'spellchecker'
-
 SOURCES += [
     'mozEnglishWordUtils.cpp',
     'mozGenericWordUtils.cpp',
diff --git a/extensions/universalchardet/moz.build b/extensions/universalchardet/moz.build
index 1076199bec66..3ff7a9666b72 100644
--- a/extensions/universalchardet/moz.build
+++ b/extensions/universalchardet/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['src']
 TEST_DIRS += ['tests']
 
-MODULE = 'universalchardet'
-
diff --git a/extensions/universalchardet/src/base/moz.build b/extensions/universalchardet/src/base/moz.build
index fbbf5df4305d..1ead3c755afc 100644
--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'universalchardet_s'
-
 SOURCES += [
     'CharDistribution.cpp',
     'JpCntx.cpp',
diff --git a/extensions/universalchardet/src/moz.build b/extensions/universalchardet/src/moz.build
index 1abe62945b24..8854db30a8b0 100644
--- a/extensions/universalchardet/src/moz.build
+++ b/extensions/universalchardet/src/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['base', 'xpcom']
 
-MODULE = 'universalchardet'
-
diff --git a/extensions/universalchardet/src/xpcom/moz.build b/extensions/universalchardet/src/xpcom/moz.build
index 5f855178bb03..d7d345d8cdd8 100644
--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'universalchardet'
-
 SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
diff --git a/extensions/widgetutils/moz.build b/extensions/widgetutils/moz.build
index 5a81c5cc0561..962510f78c0a 100644
--- a/extensions/widgetutils/moz.build
+++ b/extensions/widgetutils/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['src']
 
-MODULE = 'widgetutils'
-
 XPI_NAME = 'widgetutils'
diff --git a/extensions/widgetutils/src/moz.build b/extensions/widgetutils/src/moz.build
index 8551ded62b4f..5dac7428e064 100644
--- a/extensions/widgetutils/src/moz.build
+++ b/extensions/widgetutils/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widgetutils'
-
 SOURCES += [
     'nsWidgetUtils.cpp',
 ]
diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
index daa2441d52c0..6b1dd4c41949 100644
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gfx2d'
-
 EXPORTS.mozilla += [
     'GenericRefCounted.h',
 ]
diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
index ade1731d8c16..cd1af11c3f91 100644
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -8,8 +8,6 @@
 if CONFIG['MOZ_ANGLE_RENDERER']:
     DIRS += ['src/libGLESv2', 'src/libEGL']
 
-MODULE = 'angle'
-
 EXPORTS.angle += [
     'include/GLSLANG/ShaderLang.h',
     'include/KHR/khrplatform.h',
diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
index 0285665dd449..ba8a19a00f7b 100644
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libegl'
-
 # Target: 'libEGL'
 #   Requires: 'libGLESv2'
 # src/common:
diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
index 5d2390db6a4e..309f0b4d5c6d 100644
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libglesv2'
-
 # Target: 'preprocessor'
 # src/compiler/preprocessor:
 SOURCES += ['../compiler/preprocessor/' + src for src in [
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index 03c295fdd8a6..48b0a569b907 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -6,8 +6,6 @@
 
 CONFIGURE_SUBST_FILES += ['cairo-features.h']
 
-MODULE = 'cairo'
-
 EXPORTS.cairo += [
     'cairo-deprecated.h',
     'cairo-platform.h',
diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
index a69836c51529..2eef4a1f704f 100644
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libpixman'
-
 EXPORTS += [
     'pixman-version.h',
     'pixman.h',
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index c399cf7301c9..cf9456371c6b 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gl'
-
 gl_provider = 'Null'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index 9438475fc6a7..953f4b92c59d 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'graphite2'
-
 if CONFIG['OS_TARGET'] != 'WINNT':
     LIBXUL_LIBRARY = True
 
diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
index 99d898a89603..8aac15666efa 100644
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'harfbuzz'
-
 if CONFIG['OS_ARCH'] != 'WINNT':
     LIBXUL_LIBRARY = True
 
diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index 16429abd9984..12689525bb12 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gfxipc'
-
 EXPORTS.mozilla += [
     'GfxMessageUtils.h'
 ]
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index c4d6e6ada515..1882af0f898f 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'thebes'
-
 EXPORTS += [
     'basic/BasicCanvasLayer.h',
     'basic/BasicImplData.h',
diff --git a/gfx/moz.build b/gfx/moz.build
index 3e8016f7d4d0..519aa46b22b7 100644
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -30,5 +30,3 @@ if CONFIG['ENABLE_TESTS']:
 
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'gfx'
-
diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
index 63a0838411b5..ed750e94dd84 100644
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ots'
-
 if CONFIG['OS_TARGET'] != 'WINNT':
     LIBXUL_LIBRARY = True
 
diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build
index 254a5254fa47..2bde242cdf1e 100644
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'qcms'
-
 EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 1c55e714050d..af8582aee812 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'skia'
-
 EXPORTS.skia += [
     'include/config/SkUserConfig.h',
     'include/core/Sk64.h',
diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build
index 5bee9eff01f8..8cf67d579692 100644
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gfxtest'
-
 LIBRARY_NAME = 'gfxtest'
 
 GTEST_SOURCES += [
diff --git a/gfx/tests/moz.build b/gfx/tests/moz.build
index e1184f79082f..191c90f0b92d 100644
--- a/gfx/tests/moz.build
+++ b/gfx/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gfx'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 9a85c5cad4fe..9df5ff7a13b7 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'thebes'
-
 EXPORTS += [
     'DrawMode.h',
     'gfx2DGlue.h',
diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build
index 51e278a41117..4af5e6011828 100644
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ycbcr'
-
 EXPORTS += [
     'chromium_types.h',
     'ycbcr_to_rgb565.h',
diff --git a/image/build/moz.build b/image/build/moz.build
index 810ab6357907..ef498d555539 100644
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imglib2'
-
 SOURCES += [
     'nsImageModule.cpp',
 ]
diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build
index 89ad41e57aba..453a6b6fda18 100644
--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicon'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build
index 4b06669cdbcc..183316681d0d 100644
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicon'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
diff --git a/image/decoders/icon/mac/moz.build b/image/decoders/icon/mac/moz.build
index fffd52c40d75..738146af16dd 100644
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicon'
-
 LIBRARY_NAME = 'imgiconmac_s'
 
 SOURCES += [
diff --git a/image/decoders/icon/os2/moz.build b/image/decoders/icon/os2/moz.build
index 95b76dd29b9e..131ac93223d6 100644
--- a/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicon'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
diff --git a/image/decoders/icon/qt/moz.build b/image/decoders/icon/qt/moz.build
index 19ff354dcde6..78f1b43a6147 100644
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['public']
 
-MODULE = 'imgicon'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
diff --git a/image/decoders/icon/win/moz.build b/image/decoders/icon/win/moz.build
index 6f79b5e4ee1b..53eb0d1f03a6 100644
--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicon'
-
 SOURCES += [
     'nsIconChannel.cpp',
 ]
diff --git a/image/decoders/moz.build b/image/decoders/moz.build
index 444f5b8ee862..9cbf08898f90 100644
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -23,8 +23,6 @@ if toolkit == 'cocoa':
 elif toolkit == 'android':
     DIRS += ['icon/android', 'icon']
 
-MODULE = 'imgdecoders'
-
 SOURCES += [
     'EXIF.cpp',
     'nsBMPDecoder.cpp',
diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build
index 1dc665b44443..4a2d3447a46e 100644
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgbmpe'
-
 SOURCES += [
     'nsBMPEncoder.cpp',
 ]
diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build
index 91d8915ec17f..59a4cef7b32a 100644
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgicoe'
-
 SOURCES += [
     'nsICOEncoder.cpp',
 ]
diff --git a/image/encoders/jpeg/moz.build b/image/encoders/jpeg/moz.build
index 30c721cde12e..6115609290de 100644
--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgjpege'
-
 SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build
index 5ae52979ff3d..508a8e06f977 100644
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imgpnge'
-
 SOURCES += [
     'nsPNGEncoder.cpp',
 ]
diff --git a/image/moz.build b/image/moz.build
index 78d60b08dcd0..1fc9e22e090b 100644
--- a/image/moz.build
+++ b/image/moz.build
@@ -8,5 +8,3 @@ PARALLEL_DIRS += ['public', 'src', 'decoders', 'encoders']
 DIRS += ['build']
 TEST_DIRS += ['test']
 
-MODULE = 'imglib2'
-
diff --git a/image/src/moz.build b/image/src/moz.build
index b66ed2452439..d50932f39ac8 100644
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'imglib2'
-
 EXPORTS += [
     'ImageOps.h',
     'imgLoader.h',
diff --git a/image/test/moz.build b/image/test/moz.build
index ecc3c51376eb..d75a316773ec 100644
--- a/image/test/moz.build
+++ b/image/test/moz.build
@@ -6,6 +6,4 @@
 
 TEST_DIRS += ['mochitest', 'browser']
 
-MODULE = 'test_libpr0n'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/build/moz.build b/intl/build/moz.build
index 5b83003ec178..7c22bbf6ba3b 100644
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'i18n'
-
 SOURCES += [
     'nsI18nModule.cpp',
 ]
diff --git a/intl/chardet/public/moz.build b/intl/chardet/public/moz.build
index bea11ce78923..9a7b74e68c4a 100644
--- a/intl/chardet/public/moz.build
+++ b/intl/chardet/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'chardet'
-
 EXPORTS += [
     'nsDetectionConfident.h',
     'nsICharsetDetectionObserver.h',
diff --git a/intl/chardet/src/moz.build b/intl/chardet/src/moz.build
index d16d0e173048..56b9efb73bf6 100644
--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'chardet'
-
 SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
diff --git a/intl/hyphenation/moz.build b/intl/hyphenation/moz.build
index 5f5df982d0f6..76218104c014 100644
--- a/intl/hyphenation/moz.build
+++ b/intl/hyphenation/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'hyphenation'
-
diff --git a/intl/hyphenation/public/moz.build b/intl/hyphenation/public/moz.build
index 1f8ec023866f..94d26135658d 100644
--- a/intl/hyphenation/public/moz.build
+++ b/intl/hyphenation/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'hyphenation'
-
 EXPORTS += [
     'nsHyphenationManager.h',
     'nsHyphenator.h',
diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build
index 3a1ff249c422..1a031e6a0b90 100644
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'hyphenation'
-
 SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
diff --git a/intl/locale/moz.build b/intl/locale/moz.build
index 7294425ac204..771a5e4f7437 100644
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'idl', 'src']
 TEST_DIRS += ['tests']
 
-MODULE = 'locale'
-
diff --git a/intl/locale/public/moz.build b/intl/locale/public/moz.build
index 1285ec577e8f..37f1269eab7d 100644
--- a/intl/locale/public/moz.build
+++ b/intl/locale/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'locale'
-
 EXPORTS += [
     'nsCharsetAlias.h',
     'nsCollationCID.h',
diff --git a/intl/locale/src/mac/moz.build b/intl/locale/src/mac/moz.build
index 6aa525ad74d0..0a86344c1f63 100644
--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'locale'
-
 SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build
index 1d472ca5a274..d98c7996ce97 100644
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -13,8 +13,6 @@ elif toolkit == 'cocoa':
 else:
     DIRS += ['unix']
 
-MODULE = 'locale'
-
 EXPORTS += [
     'nsCollation.h',
 ]
diff --git a/intl/locale/src/os2/moz.build b/intl/locale/src/os2/moz.build
index e3b4ff9a6465..e63f30df8c8d 100644
--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'locale'
-
 SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
diff --git a/intl/locale/src/unix/moz.build b/intl/locale/src/unix/moz.build
index 7a7efbfe88e2..ec12a7968df9 100644
--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'locale'
-
 SOURCES += [
     'nsCollationUnix.cpp',
     'nsDateTimeFormatUnix.cpp',
diff --git a/intl/locale/src/windows/moz.build b/intl/locale/src/windows/moz.build
index 6e2b8340420a..61c42d34637d 100644
--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'locale'
-
 SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
diff --git a/intl/locale/tests/moz.build b/intl/locale/tests/moz.build
index c690a7fddb4e..191c90f0b92d 100644
--- a/intl/locale/tests/moz.build
+++ b/intl/locale/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_intl_locale'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/lwbrk/moz.build b/intl/lwbrk/moz.build
index 18eadcb5484b..912821b8c158 100644
--- a/intl/lwbrk/moz.build
+++ b/intl/lwbrk/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['idl', 'public', 'src']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'lwbrk'
-
diff --git a/intl/lwbrk/public/moz.build b/intl/lwbrk/public/moz.build
index 0ea47dcce74f..bea589bb11da 100644
--- a/intl/lwbrk/public/moz.build
+++ b/intl/lwbrk/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'lwbrk'
-
 EXPORTS += [
     'nsILineBreaker.h',
     'nsIWordBreaker.h',
diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build
index ecf934590c1f..ce31f706b571 100644
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'lwbrk'
-
 SOURCES += [
     'nsJISx4051LineBreaker.cpp',
     'nsSampleWordBreaker.cpp',
diff --git a/intl/strres/moz.build b/intl/strres/moz.build
index fcf10f9c9338..d279c77bde93 100644
--- a/intl/strres/moz.build
+++ b/intl/strres/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'src']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'intl'
-
diff --git a/intl/strres/src/moz.build b/intl/strres/src/moz.build
index 1690738b840f..07f70460b89e 100644
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'intl'
-
 SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
diff --git a/intl/strres/tests/moz.build b/intl/strres/tests/moz.build
index 89f90ec9d748..191c90f0b92d 100644
--- a/intl/strres/tests/moz.build
+++ b/intl/strres/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_intl_strres'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/uconv/moz.build b/intl/uconv/moz.build
index c14f218d81f9..ec787aef5ed2 100644
--- a/intl/uconv/moz.build
+++ b/intl/uconv/moz.build
@@ -19,5 +19,3 @@ DIRS += [
 
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'uconv'
-
diff --git a/intl/uconv/public/moz.build b/intl/uconv/public/moz.build
index 59968cf67496..2595c4e2c1b3 100644
--- a/intl/uconv/public/moz.build
+++ b/intl/uconv/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'uconv'
-
 EXPORTS += [
     'nsEncoderDecoderUtils.h',
     'nsIUnicodeDecoder.h',
diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build
index d9f6629b30cb..ba31a657f32b 100644
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'uconv'
-
 UNIFIED_SOURCES += [
     'nsCharsetConverterManager.cpp',
     'nsConverterInputStream.cpp',
diff --git a/intl/uconv/tests/moz.build b/intl/uconv/tests/moz.build
index 0d04b1ece7c2..4223d2e2ad32 100644
--- a/intl/uconv/tests/moz.build
+++ b/intl/uconv/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_intl_uconv'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # Tests disabled because they dont work in libxul builds.
diff --git a/intl/unicharutil/moz.build b/intl/unicharutil/moz.build
index 9154bc532182..1283729e52ed 100644
--- a/intl/unicharutil/moz.build
+++ b/intl/unicharutil/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['idl', 'public', 'util', 'src', 'tables']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'unicharutil'
-
diff --git a/intl/unicharutil/public/moz.build b/intl/unicharutil/public/moz.build
index 5892a753168d..82d590196a82 100644
--- a/intl/unicharutil/public/moz.build
+++ b/intl/unicharutil/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'unicharutil'
-
 EXPORTS += [
     'nsICaseConversion.h',
     'nsIUGenCategory.h',
diff --git a/intl/unicharutil/src/moz.build b/intl/unicharutil/src/moz.build
index 29773868d5a1..bf5bdb187534 100644
--- a/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'unicharutil'
-
 UNIFIED_SOURCES += [
     'nsCaseConversionImp2.cpp',
     'nsCategoryImp.cpp',
diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build
index d354b7120830..9d72cfd7822e 100644
--- a/intl/unicharutil/tests/moz.build
+++ b/intl/unicharutil/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_intl_unicharutil'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 SOURCES += [
diff --git a/intl/unicharutil/tools/moz.build b/intl/unicharutil/tools/moz.build
index c033d3df582b..cbd55a1f2307 100644
--- a/intl/unicharutil/tools/moz.build
+++ b/intl/unicharutil/tools/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ucgendat'
-
 PROGRAM = 'ucgendat'
 
 SOURCES += [
diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build
index a7970c0de00d..6f163bf86136 100644
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'unicharutil'
-
 include('../objs.mozbuild')
 
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
index d32104e138c6..9824ea1f4c94 100644
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['internal']
 
-MODULE = 'unicharutil'
-
 EXPORTS += [
     'nsBidiUtils.h',
     'nsSpecialCasingData.h',
diff --git a/ipc/app/moz.build b/ipc/app/moz.build
index 22c5812ebac7..c455f529f4df 100644
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build
index 4ca4fc3e75b9..9c8dd75e9ec6 100644
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
     'DBusThread.h',
     'DBusUtils.h',
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
index 13f21bc52307..679834f73ed0 100644
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS += [
     'nsIIPCSerializableInputStream.h',
     'nsIIPCSerializableURI.h',
diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build
index 187bb8c2a138..9ad3a1b15aa9 100644
--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
-MODULE = 'ipdlgen'
-
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build
index e1d532de0a25..3c16614a1693 100644
--- a/ipc/ipdl/test/cxx/app/moz.build
+++ b/ipc/ipdl/test/cxx/app/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipdlunittest'
-
 PROGRAM = 'ipdlunittest'
 
 SOURCES += [
diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build
index 58ff557c7dfa..ee881a20e8bf 100644
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -5,8 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TOOL_DIRS += ['app']
-
-MODULE = 'ipdlunittest'
 LIBRARY_NAME = 'ipdlunittest_s'
 
 EXPORTS.mozilla._ipdltest += [
diff --git a/ipc/keystore/moz.build b/ipc/keystore/moz.build
index 3381b853456e..a8760f93a052 100644
--- a/ipc/keystore/moz.build
+++ b/ipc/keystore/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
   'KeyStore.h'
 ]
diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build
index caf5093a98cc..c6303e518515 100644
--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
     'Netd.h',
 ]
diff --git a/ipc/nfc/moz.build b/ipc/nfc/moz.build
index c567085fd8fd..4e152d01dd47 100644
--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_NFC']:
-    MODULE = 'ipc'
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
     ]
diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build
index c23f43fc6486..13a165db6db8 100644
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build
index d8d716b1d1e6..06d1a42f9367 100644
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipcshell'
-
 EXPORTS.mozilla.ipc += [
     'TestShellChild.h',
     'TestShellParent.h',
diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build
index c4b581f6a694..0ad3d79bf0c2 100644
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
     'UnixSocket.h',
 ]
diff --git a/js/ipc/moz.build b/js/ipc/moz.build
index 741a828ed315..c366b926f5cb 100644
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'js'
-
 SOURCES += [
     'JavaScriptChild.cpp',
     'JavaScriptParent.cpp',
diff --git a/js/jsd/idl/moz.build b/js/jsd/idl/moz.build
index 4300fd342524..9127dba1bad7 100644
--- a/js/jsd/idl/moz.build
+++ b/js/jsd/idl/moz.build
@@ -10,5 +10,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'jsdservice'
 
-MODULE = 'jsdebug'
-
diff --git a/js/jsd/moz.build b/js/jsd/moz.build
index 6e2daba225ba..43143c7040e6 100644
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -7,8 +7,6 @@
 DIRS += ['idl']
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'jsdebug'
-
 EXPORTS += [
     'jsdebug.h',
 ]
diff --git a/js/jsd/test/moz.build b/js/jsd/test/moz.build
index af1310b9dcd7..3cf16eb0cfe8 100644
--- a/js/jsd/test/moz.build
+++ b/js/jsd/test/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsdebug'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
diff --git a/js/src/moz.build b/js/src/moz.build
index 554465d0e986..84325fcfda0b 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -18,8 +18,6 @@ if not CONFIG['JS_DISABLE_SHELL']:
 
 TEST_DIRS += ['jsapi-tests', 'tests', 'gdb']
 
-MODULE = 'js'
-
 mfbt_root = '../../mfbt'
 LOCAL_INCLUDES += ['%s/double-conversion' % mfbt_root]
 
diff --git a/js/src/tests/moz.build b/js/src/tests/moz.build
index bd099bccfb30..895d11993cfb 100644
--- a/js/src/tests/moz.build
+++ b/js/src/tests/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsreftest'
-
diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build
index da6f122464b0..4fce56f943b4 100644
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsloader'
-
 UNIFIED_SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',
diff --git a/js/xpconnect/moz.build b/js/xpconnect/moz.build
index 74d73869ffd0..cb375f58bddd 100644
--- a/js/xpconnect/moz.build
+++ b/js/xpconnect/moz.build
@@ -11,5 +11,3 @@ TEST_TOOL_DIRS += ['tests']
 if CONFIG['MOZ_XPCTOOLS']:
     TOOL_DIRS += ['tools']
 
-MODULE = 'xpconnect'
-
diff --git a/js/xpconnect/public/moz.build b/js/xpconnect/public/moz.build
index 2ba6143bc104..7188b5ac6e34 100644
--- a/js/xpconnect/public/moz.build
+++ b/js/xpconnect/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpconnect'
-
 EXPORTS += [
     'nsAutoJSValHolder.h',
     'nsAXPCNativeCallContext.h',
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index 8aaf611c83d3..dded5baca886 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -6,8 +6,6 @@
 
 FAIL_ON_WARNINGS = True
 
-MODULE = 'xpcshell'
-
 PROGRAM = 'xpcshell'
 
 SOURCES += [
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index 143d64f2b8b2..2eef4be56d7e 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpconnect'
-
 EXPORTS += [
     'BackstagePass.h',
     'nsCxPusher.h',
diff --git a/js/xpconnect/tests/components/js/moz.build b/js/xpconnect/tests/components/js/moz.build
index 10a504b25ed6..b79124b6db67 100644
--- a/js/xpconnect/tests/components/js/moz.build
+++ b/js/xpconnect/tests/components/js/moz.build
@@ -3,6 +3,4 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'xpctest'
 NO_DIST_INSTALL = True
diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build
index e565ffaf6b3e..0e677cb62db3 100644
--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@@ -4,7 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpctest'
 NO_DIST_INSTALL = True
 
 UNIFIED_SOURCES += [
diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build
index 70792f19d108..fd50d550c452 100644
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcwrappers'
-
 EXPORTS += [
     'WrapperFactory.h',
 ]
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 87409618ddd1..16d96d8c0f81 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -23,8 +23,6 @@ if CONFIG['MOZ_DEBUG']:
 
 XPIDL_MODULE = 'layout_base'
 
-MODULE = 'layout'
-
 EXPORTS += [
     'ActiveLayerTracker.h',
     'DisplayItemClip.h',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 20b136f6e527..6b28d1d62de8 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsContentDLF.h',
     'nsLayoutCID.h',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 50160837dab9..bbbc47e93336 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsIComboboxControlFrame.h',
     'nsIFormControlFrame.h',
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index e15b43156a94..d87b155f6946 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsCanvasFrame.h',
     'nsDirection.h',
diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build
index 8ed343c0d9a0..7fc205d4fec3 100644
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'inspector'
-
 EXPORTS += [
     'nsFontFace.h',
     'nsFontFaceList.h',
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index 750ca9921825..62517fa02031 100644
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 EXPORTS.mozilla.layout += [
     'RenderFrameChild.h',
     'RenderFrameParent.h',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index e3b95a92dcac..764dbb32167d 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 UNIFIED_SOURCES += [
     'nsMathMLChar.cpp',
     'nsMathMLContainerFrame.cpp',
diff --git a/layout/media/moz.build b/layout/media/moz.build
index 84a14f872a56..1e80859b2c10 100644
--- a/layout/media/moz.build
+++ b/layout/media/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 LIBRARY_NAME = 'gkmedias'
 
 if CONFIG['MOZ_WEBRTC']:
diff --git a/layout/moz.build b/layout/moz.build
index 8846317b5926..c399a6dddf10 100644
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -46,5 +46,3 @@ DIRS += ['build', 'media']
 if CONFIG['MOZ_DEBUG']:
     TEST_DIRS += ['tools/layout-debug']
 
-MODULE = 'layout'
-
diff --git a/layout/printing/moz.build b/layout/printing/moz.build
index 7441eafbcf31..a125620a0d34 100644
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -12,8 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'layout_printing'
 
-MODULE = 'layout'
-
 UNIFIED_SOURCES += [
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
diff --git a/layout/style/moz.build b/layout/style/moz.build
index a32ca1d8e31d..fad5e6c9a5c8 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -7,8 +7,6 @@
 DIRS += ['xbl-marquee']
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'layout'
-
 EXPORTS += [
     'AnimationCommon.h',
     'nsAnimationManager.h',
diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build
index 775a513902c9..ded35afe30cd 100644
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -6,8 +6,6 @@
 
 TEST_TOOL_DIRS += ['chrome']
 
-MODULE = 'layout'
-
 HOST_SOURCES += [
     'ListCSSProperties.cpp',
 ]
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 8e3b9651a699..bd0cf7a2803b 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsSVGEffects.h',
     'nsSVGFilterInstance.h',
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 178694666970..55d38e0f5c25 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsITableCellLayout.h',
 ]
diff --git a/layout/tools/layout-debug/moz.build b/layout/tools/layout-debug/moz.build
index 3bcc23e38ac2..fba4a2dcfa21 100644
--- a/layout/tools/layout-debug/moz.build
+++ b/layout/tools/layout-debug/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['src', 'ui']
 TEST_DIRS += ['tests']
 
-MODULE = 'layout_debug'
-
diff --git a/layout/tools/recording/moz.build b/layout/tools/recording/moz.build
index a999524cc7f0..5cd83c56eab5 100644
--- a/layout/tools/recording/moz.build
+++ b/layout/tools/recording/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'recording'
-
 EXTRA_COMPONENTS += [
     'recording-cmdline.js',
     'recording-cmdline.manifest',
diff --git a/layout/tools/reftest/moz.build b/layout/tools/reftest/moz.build
index ff8a79e7410f..58edd5f35c66 100644
--- a/layout/tools/reftest/moz.build
+++ b/layout/tools/reftest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'reftest'
-
 EXTRA_COMPONENTS += [
     'reftest-cmdline.js',
 ]
diff --git a/layout/xul/base/public/moz.build b/layout/xul/base/public/moz.build
index f4963b000517..e1a84a9039e8 100644
--- a/layout/xul/base/public/moz.build
+++ b/layout/xul/base/public/moz.build
@@ -19,8 +19,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'layout_xul'
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsIScrollbarMediator.h',
     'nsPIBoxObject.h',
diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build
index 6e03fcce0e58..5cd3a180b13e 100644
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 UNIFIED_SOURCES += [
     'nsBox.cpp',
     'nsBoxFrame.cpp',
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 8837dfcbde4f..959a8210dd9c 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsGrid.h',
     'nsGridCell.h',
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 1788f2117859..af7a3f12ceed 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -14,8 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'layout_xul_tree'
 
-MODULE = 'layout'
-
 EXPORTS += [
     'nsTreeColFrame.h',
     'nsTreeUtils.h',
diff --git a/media/kiss_fft/moz.build b/media/kiss_fft/moz.build
index 22c12d92e774..17833b71ed59 100644
--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'kiss_fft'
-
 EXPORTS.kiss_fft += [
     'kiss_fft.h',
     'kiss_fftr.h',
diff --git a/media/libcubeb/moz.build b/media/libcubeb/moz.build
index b2200eb79f1c..e9b8e10b8311 100644
--- a/media/libcubeb/moz.build
+++ b/media/libcubeb/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['include', 'src']
 
-MODULE = 'cubeb'
-
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
index 3d1ff0918f11..f9414fb01ab8 100644
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'cubeb'
-
 SOURCES += [
     'cubeb.c',
 ]
diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index eb05ef9229cd..0cacccd8c959 100644
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['simd']
 
-MODULE = 'jpeg'
-
 EXPORTS += [
     'jconfig.h',
     'jerror.h',
diff --git a/media/libnestegg/moz.build b/media/libnestegg/moz.build
index c90328f09d27..e9b8e10b8311 100644
--- a/media/libnestegg/moz.build
+++ b/media/libnestegg/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['include', 'src']
 
-MODULE = 'nestegg'
-
diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build
index fe5ea5132fda..2344ea3c5db4 100644
--- a/media/libnestegg/src/moz.build
+++ b/media/libnestegg/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'nestegg'
-
 UNIFIED_SOURCES += [
     'halloc.c',
     'nestegg.c',
diff --git a/media/libogg/moz.build b/media/libogg/moz.build
index 7ae6571f2f2a..6dd41e0f81eb 100644
--- a/media/libogg/moz.build
+++ b/media/libogg/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ogg'
-
 EXPORTS.ogg += [
     'include/ogg/config_types.h',
     'include/ogg/ogg.h',
diff --git a/media/libogg/src/moz.build b/media/libogg/src/moz.build
index beed18843f46..c75c2837c19e 100644
--- a/media/libogg/src/moz.build
+++ b/media/libogg/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ogg'
-
 UNIFIED_SOURCES += [
     'ogg_bitwise.c',
     'ogg_framing.c',
diff --git a/media/libopus/moz.build b/media/libopus/moz.build
index 82ed614df969..8210c36c7639 100644
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'opus'
-
 EXPORTS.opus += [
     'include/opus.h',
     'include/opus_defines.h',
diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index aaae56d33e49..b6da45cd25af 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'png'
-
 EXPORTS += [
     'mozpngconf.h',
     'png.h',
diff --git a/media/libsoundtouch/moz.build b/media/libsoundtouch/moz.build
index 4492bffde821..009942516d1e 100644
--- a/media/libsoundtouch/moz.build
+++ b/media/libsoundtouch/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['src']
 
-MODULE = 'soundtouch'
-
diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build
index 7dd4a86a016c..c0703be6a879 100644
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'soundtouch'
-
 EXPORTS.soundtouch += [
     'FIFOSamplePipe.h',
     'SoundTouch.h',
diff --git a/media/libspeex_resampler/moz.build b/media/libspeex_resampler/moz.build
index 4f46d936b76f..009942516d1e 100644
--- a/media/libspeex_resampler/moz.build
+++ b/media/libspeex_resampler/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['src']
 
-MODULE = 'speex_resampler'
-
diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build
index 0c761b53ca9a..f428a56b6adc 100644
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'speex_resampler'
-
 EXPORTS.speex += [
     'speex_config_types.h',
     'speex_resampler.h',
diff --git a/media/libtheora/include/moz.build b/media/libtheora/include/moz.build
index 3d3691bcef27..016c73bbf364 100644
--- a/media/libtheora/include/moz.build
+++ b/media/libtheora/include/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['theora']
 
-MODULE = 'theora'
-
diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build
index 1c4afc8abefd..20abbf0098a5 100644
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'theora'
-
 LIBRARY_NAME = 'theora'
 
 UNIFIED_SOURCES += [
diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build
index e3b93651d79d..14265b15e8d1 100644
--- a/media/libtheora/moz.build
+++ b/media/libtheora/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['include', 'lib']
 
-MODULE = 'theora'
-
diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build
index 01c933e7baff..b252d820fd96 100644
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'tremor'
-
 LIBRARY_NAME = 'tremor'
 
 SOURCES += [
diff --git a/media/libtremor/moz.build b/media/libtremor/moz.build
index f410fba8e39f..31831ba8f2c0 100644
--- a/media/libtremor/moz.build
+++ b/media/libtremor/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['include/tremor', 'lib']
 
-MODULE = 'tremor'
-
diff --git a/media/libvorbis/moz.build b/media/libvorbis/moz.build
index a9b60d95e1a1..cda588018395 100644
--- a/media/libvorbis/moz.build
+++ b/media/libvorbis/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'vorbis'
-
 EXPORTS.vorbis += [
     'include/vorbis/codec.h',
     'include/vorbis/vorbisenc.h',
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build
index 078565364957..63d7d227d9a0 100644
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'vpx'
-
 EXPORTS.vpx += [
     'vpx/vp8.h',
     'vpx/vp8cx.h',
diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build
index 12291f06414f..674899f88abc 100644
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mtransport'
-
 EXPORTS.mtransport += [
     '../dtlsidentity.h',
     '../m_cpp_utils.h',
diff --git a/media/mtransport/standalone/moz.build b/media/mtransport/standalone/moz.build
index 1542b9f0f396..8fc2545e6f20 100644
--- a/media/mtransport/standalone/moz.build
+++ b/media/mtransport/standalone/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mtransport_s'
-
 include('../objs.mozbuild')
 
 SOURCES += mtransport_cppsrcs
diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build
index 82ab1b4872c2..43945999f9eb 100644
--- a/media/mtransport/test/moz.build
+++ b/media/mtransport/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_mtransport'
-
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_UNIT_TESTS += [
         'ice_unittest.cpp',
diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build
index a9384ae4d26e..86204eaf915d 100644
--- a/media/omx-plugin/froyo/moz.build
+++ b/media/omx-plugin/froyo/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'omxpluginfroyo'
-
 SOURCES += [
     'OmxPluginFroyo.cpp',
 ]
diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build
index ad2ebd023b05..092797e44274 100644
--- a/media/omx-plugin/gb/moz.build
+++ b/media/omx-plugin/gb/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'omxplugingb'
-
 SOURCES += [
     'OmxPlugin236.cpp',
 ]
diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build
index e4ee3526d7e4..10973e3b4eea 100644
--- a/media/omx-plugin/gb235/moz.build
+++ b/media/omx-plugin/gb235/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'omxplugingb235'
-
 SOURCES += [
     'OmxPlugin235.cpp',
 ]
diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build
index 8cfda0d2bdba..4f43a8a51a54 100644
--- a/media/omx-plugin/hc/moz.build
+++ b/media/omx-plugin/hc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'omxpluginhc'
-
 SOURCES += [
     'OmxPluginHoneycomb.cpp',
 ]
diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build
index 10b71a882202..f62e30164401 100644
--- a/media/omx-plugin/lib/froyo/libstagefright/moz.build
+++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidstagefrightfroyo'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build
index 2b370acc434f..f62e30164401 100644
--- a/media/omx-plugin/lib/gb/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidstagefrightgb'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
index 77dbce10285b..25108df1f3d9 100644
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libstagefright_color_conversion'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/gb/libutils/moz.build b/media/omx-plugin/lib/gb/libutils/moz.build
index c2a7c4769743..7738bcee2494 100644
--- a/media/omx-plugin/lib/gb/libutils/moz.build
+++ b/media/omx-plugin/lib/gb/libutils/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidutilsgb'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build
index 95bccff92774..f62e30164401 100644
--- a/media/omx-plugin/lib/gb235/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidstagefrightgb234'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build
index 1887783404b9..f62e30164401 100644
--- a/media/omx-plugin/lib/hc/libstagefright/moz.build
+++ b/media/omx-plugin/lib/hc/libstagefright/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidstagefrighthc'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build
index c948de8da492..f62e30164401 100644
--- a/media/omx-plugin/lib/ics/libstagefright/moz.build
+++ b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidstagefright'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build
index c4dac9b9bdcd..7738bcee2494 100644
--- a/media/omx-plugin/lib/ics/libutils/moz.build
+++ b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'libandroidutils'
 NO_DIST_INSTALL = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build
index 94c13daf9c88..f9f883a7a9cb 100644
--- a/media/omx-plugin/moz.build
+++ b/media/omx-plugin/moz.build
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MODULE = 'omxplugin'
-
 SOURCES += [
     'OmxPlugin.cpp',
 ]
diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build
index 30d039f7e962..bba340f5b814 100644
--- a/media/webrtc/signaling/test/moz.build
+++ b/media/webrtc/signaling/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_signaling'
-
 if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_UNIT_TESTS += [
         'mediaconduit_unittests.cpp',
diff --git a/memory/build/moz.build b/memory/build/moz.build
index 11283efcc0a0..f933a886a9c4 100644
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'memory'
-
 EXPORTS += [
     'mozmemory.h',
     'mozmemory_wrap.h',
diff --git a/memory/jemalloc/moz.build b/memory/jemalloc/moz.build
index 585acb0ae393..b40f981b4506 100644
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jemalloc'
-
 SOURCES += [
     'src/src/arena.c',
     'src/src/atomic.c',
diff --git a/memory/mozalloc/moz.build b/memory/mozalloc/moz.build
index 850e39d9b1c8..9b1a04c4a7aa 100644
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'mozalloc'
 NO_VISIBILITY_FLAGS = True
 
 EXPORTS.mozilla += [
diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build
index 176cf287933d..32293b9ec431 100644
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jemalloc'
-
 EXPORTS += [
     'jemalloc_types.h',
 ]
diff --git a/memory/replace/dmd/moz.build b/memory/replace/dmd/moz.build
index 7f55de59aa8d..cf1cb78154b8 100644
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dmd'
-
 EXPORTS += [
     'DMD.h',
 ]
diff --git a/memory/replace/dummy/moz.build b/memory/replace/dummy/moz.build
index 84bbde908939..842acf8e007a 100644
--- a/memory/replace/dummy/moz.build
+++ b/memory/replace/dummy/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'memory'
 NO_DIST_INSTALL = True
 
 SOURCES += [
diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build
index 5ff246148516..6024646fd829 100644
--- a/memory/replace/jemalloc/moz.build
+++ b/memory/replace/jemalloc/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'memory'
 NO_DIST_INSTALL = True
 
 SOURCES += [
diff --git a/mfbt/moz.build b/mfbt/moz.build
index 89f370da2190..9849f416dac0 100644
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'mozglue'
-
 LIBRARY_NAME = 'mfbt'
 
 mfbt_root = '.'
diff --git a/modules/libbz2/moz.build b/modules/libbz2/moz.build
index 86064ad85887..009942516d1e 100644
--- a/modules/libbz2/moz.build
+++ b/modules/libbz2/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['src']
 
-MODULE = 'libbz2'
-
diff --git a/modules/libbz2/src/moz.build b/modules/libbz2/src/moz.build
index f9619524c2fb..396f6aa16e87 100644
--- a/modules/libbz2/src/moz.build
+++ b/modules/libbz2/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libbz2'
-
 EXPORTS += [
     'bzlib.h',
 ]
diff --git a/modules/libjar/test/moz.build b/modules/libjar/test/moz.build
index 7cbe206f58b2..e04825801828 100644
--- a/modules/libjar/test/moz.build
+++ b/modules/libjar/test/moz.build
@@ -6,6 +6,4 @@
 
 TEST_TOOL_DIRS += ['mochitest', 'chrome']
 
-MODULE = 'test_libjar'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libjar/zipwriter/moz.build b/modules/libjar/zipwriter/moz.build
index d692d89b08b0..47e64e623916 100644
--- a/modules/libjar/zipwriter/moz.build
+++ b/modules/libjar/zipwriter/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'src']
 TEST_DIRS += ['test']
 
-MODULE = 'zipwriter'
-
diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build
index 6b883beb6f88..05a38046d247 100644
--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'zipwriter'
-
 UNIFIED_SOURCES += [
     'nsDeflateConverter.cpp',
     'nsZipDataStream.cpp',
diff --git a/modules/libjar/zipwriter/test/moz.build b/modules/libjar/zipwriter/test/moz.build
index 07fb606730f8..191c90f0b92d 100644
--- a/modules/libjar/zipwriter/test/moz.build
+++ b/modules/libjar/zipwriter/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_zipwriter'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libmar/moz.build b/modules/libmar/moz.build
index f547a5656954..e2dd981f2f70 100644
--- a/modules/libmar/moz.build
+++ b/modules/libmar/moz.build
@@ -16,5 +16,3 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
 # If we are building ./sign and ./verify then ./tool must come after it
 DIRS += ['tool']
 
-MODULE = 'libmar_test'
-
diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build
index 1e71a0a56476..6cfbe7da40ba 100644
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'signmar'
-
 LIBRARY_NAME = 'signmar'
 
 SOURCES += [
diff --git a/modules/libmar/src/moz.build b/modules/libmar/src/moz.build
index 5f141f0e3f99..3c3f5be63bdb 100644
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libmar'
-
 EXPORTS += [
     'mar.h',
     'mar_cmdline.h',
diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build
index a19efe649e13..af2ad4da634f 100644
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/tool/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mar'
-
 if CONFIG['MOZ_ENABLE_SIGNMAR']:
     PROGRAM = 'signmar'
 
diff --git a/modules/libmar/verify/moz.build b/modules/libmar/verify/moz.build
index 1c9c491ecdab..0739e57feda6 100644
--- a/modules/libmar/verify/moz.build
+++ b/modules/libmar/verify/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'verifymar'
-
 LIBRARY_NAME = 'verifymar'
 
 SOURCES += [
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index ef0e73b56a4a..9f7e47e655d3 100644
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'src']
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'pref'
-
diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build
index 18fb66b0c5a6..287935f6225c 100644
--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'pref'
-
 SOURCES += [
     'nsPrefBranch.cpp',
     'nsPrefsFactory.cpp',
diff --git a/modules/libpref/test/moz.build b/modules/libpref/test/moz.build
index 26620ac56b6d..ddbda2e5ae41 100644
--- a/modules/libpref/test/moz.build
+++ b/modules/libpref/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_libpref'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/modules/zlib/moz.build b/modules/zlib/moz.build
index cd19bbda87d3..009942516d1e 100644
--- a/modules/zlib/moz.build
+++ b/modules/zlib/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['src']
 
-MODULE = 'zlib'
-
diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build
index 18647b70b2dc..997d66fcafd3 100644
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'zlib'
-
 EXPORTS += [
     'mozzconf.h',
     'zconf.h',
diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build
index f5fcd183b2a1..d9d6f0beb057 100644
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'android'
-
 EXPORTS += [
     'APKOpen.h',
 ]
diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
index 9e9ddbb61729..000ee6713949 100644
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mozglue'
-
 # Build mozglue as a shared lib on Windows, OSX and Android.
 # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
 if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
diff --git a/mozglue/linker/moz.build b/mozglue/linker/moz.build
index 5c2cd72dff82..ee9b40c76f17 100644
--- a/mozglue/linker/moz.build
+++ b/mozglue/linker/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mozglue'
-
 SOURCES += [
     'CustomElf.cpp',
     'ElfLoader.cpp',
diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build
index 7777b1723418..33fff4d55fd1 100644
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 EXPORTS += [
     'nsFileStreams.h',
     'nsMIMEInputStream.h',
diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build
index e7f1fd288f4e..1096197ffce5 100644
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 EXPORTS += [
     'nsNetCID.h',
 ]
diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build
index 500a336b7421..03c0b8e4d1d8 100644
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -15,8 +15,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_cache'
 
-MODULE = 'nkcache'
-
 EXPORTS += [
     'nsApplicationCacheService.h',
     'nsCacheService.h',
diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build
index cf569c191968..22cc3a70ec35 100644
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -15,8 +15,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_cache2'
 
-MODULE = 'nkcache2'
-
 EXPORTS += [
     'CacheObserver.h',
     'CacheStorageService.h',
diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
index 6c174eb36643..e60dde0a1aaa 100644
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -16,8 +16,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_cookie'
 
-MODULE = 'necko'
-
 if CONFIG['NECKO_COOKIES']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index f6fa496b2874..6b39e7dadbe8 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -15,8 +15,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_dns'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'DNS.h',
 ]
diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build
index 998a8de2b725..7725dddf5d8c 100644
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_ipc'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'ChannelEventQueue.h',
     'NeckoChild.h',
diff --git a/netwerk/moz.build b/netwerk/moz.build
index 2e48dd2ea9ba..0328c0a33505 100644
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -32,6 +32,4 @@ PARALLEL_DIRS += ['locales']
 DIRS += ['build']
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'necko'
-
 CONFIGURE_DEFINE_FILES += ['necko-config.h']
diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build
index 94f23517f240..6301b3f614c7 100644
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_about'
 
-MODULE = 'necko'
-
 EXPORTS += [
     'nsAboutProtocolUtils.h',
 ]
diff --git a/netwerk/protocol/app/moz.build b/netwerk/protocol/app/moz.build
index 7396beb273b6..7a5b1e8ecfc3 100644
--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 SOURCES += [
     'AppProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build
index b7b3597c3086..2ccfc636cd9e 100644
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build
index 32fbf186c398..3e8e2bed190f 100644
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'deviceprotocol'
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     EXPORTS.mozilla.net += [
         'CameraStreamImpl.h',
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 4bd2c3eef419..0816d3b4a7b0 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -11,8 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index 20c4cebbad7e..4d8b6e24628c 100644
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_ftp'
 
-MODULE = 'necko'
-
 EXPORTS += [
     'ftpCore.h',
 ]
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 6ee029c17e52..89844649c257 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -21,8 +21,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
-MODULE = 'necko'
-
 EXPORTS += [
     'nsHttp.h',
     'nsHttpAtomList.h',
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index 7bcf04ce2011..80b2b23e4786 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
-MODULE = 'necko'
-
 SOURCES += [
     'nsResProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/rtsp/moz.build b/netwerk/protocol/rtsp/moz.build
index b1d5718302b6..4b9992c13474 100644
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -5,8 +5,6 @@
 
 XPIDL_MODULE = 'necko_rtsp'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'controller/RtspController.h',
     'controller/RtspControllerChild.h',
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index baa60eeb4a5f..50b9b72ad6cf 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build
index f2732f3ce944..ede085494ea5 100644
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -11,8 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_websocket'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'BaseWebSocketChannel.h',
     'WebSocketChannel.h',
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index 932175b311e9..eacf02750dd6 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wyciwyg'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'WyciwygChannelChild.h',
     'WyciwygChannelParent.h',
diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build
index 5bbf1d6c0d60..686850ab3a5c 100644
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -6,8 +6,6 @@
 
 XPIDL_MODULE = 'necko_datachan'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'DataChannel.h',
     'DataChannelListener.h',
diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build
index 28c3b691a7ed..4881713c851a 100644
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -6,8 +6,6 @@
 
 XPIDL_MODULE = 'necko_sctp'
 
-MODULE = 'necko'
-
 EXPORTS.mozilla.net += [
     'usrsctp.h',
 ]
diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build
index e8d2749912de..3a3d6413c693 100644
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -14,8 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_socket'
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build
index e38340d55509..9735ceb5b0cf 100644
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -6,8 +6,6 @@
 
 XPIDL_MODULE = 'necko_srtp'
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'crypto/cipher/aes.c',
     'crypto/cipher/aes_cbc.c',
diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build
index 8074dac22102..648825fedabb 100644
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 SOURCES += [
     'mozTXTToHTMLConv.cpp',
     'nsDirIndex.cpp',
diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build
index a50aa3a87296..81a1846715f0 100644
--- a/netwerk/streamconv/public/moz.build
+++ b/netwerk/streamconv/public/moz.build
@@ -15,7 +15,5 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_strconv'
 
-MODULE = 'necko'
-
 FAIL_ON_WARNINGS = True
 
diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build
index c24238200f84..efe5f59f88f8 100644
--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 FAIL_ON_WARNINGS = True
 
 SOURCES += [
diff --git a/netwerk/streamconv/test/moz.build b/netwerk/streamconv/test/moz.build
index e47499c43c7d..4b783f89a344 100644
--- a/netwerk/streamconv/test/moz.build
+++ b/netwerk/streamconv/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'TestStreamConv'
-
 PROGRAM = 'TestStreamConv'
 
 SOURCES += [
diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build
index ac17d38c1e6b..aa0c0bab8c84 100644
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build
index 4a8b45fcf5f4..279651843932 100644
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 LIBRARY_NAME = 'neckosystem_s'
 
 SOURCES += [
diff --git a/netwerk/system/moz.build b/netwerk/system/moz.build
index 585899fcbde8..db9e7df7e4c7 100644
--- a/netwerk/system/moz.build
+++ b/netwerk/system/moz.build
@@ -16,5 +16,3 @@ if CONFIG['MOZ_ENABLE_QTNETWORK']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['android']
 
-MODULE = 'necko'
-
diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build
index 8d97a99141f9..03f62503e3ba 100644
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 SOURCES += [
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build
index 10f5233eab96..6e6e027030d3 100644
--- a/netwerk/system/win32/moz.build
+++ b/netwerk/system/win32/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'necko'
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsNotifyAddrListener.cpp',
diff --git a/netwerk/test/mochitests/moz.build b/netwerk/test/mochitests/moz.build
index fc90c300296a..3cf16eb0cfe8 100644
--- a/netwerk/test/mochitests/moz.build
+++ b/netwerk/test/mochitests/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_necko'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
index 165f9a50b9c6..1bbec75758c9 100644
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -8,8 +8,6 @@ TEST_TOOL_DIRS += ['httpserver', 'browser', 'mochitests']
 
 FAIL_ON_WARNINGS = True
 
-MODULE = 'test_necko'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index 6fc635e26847..ca88feada5a7 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -14,8 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wifi'
 
-MODULE = 'necko'
-
 UNIFIED_SOURCES += [
     'nsWifiAccessPoint.cpp',
 ]
diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build
index 4c13232fc1dc..9b5c08d4612f 100644
--- a/other-licenses/android/moz.build
+++ b/other-licenses/android/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'android'
-
 LIBRARY_NAME = 'android'
 
 SOURCES += [
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
index e09d863d3923..9d8e4b6080b4 100644
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'skia_npapi'
-
 EXPORTS += [
     'SkANP.h',
 ]
diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build
index 6d9d155cf818..af5945364765 100644
--- a/parser/expat/lib/moz.build
+++ b/parser/expat/lib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'expat'
-
 EXPORTS += [
     'expat.h',
     'expat_external.h',
diff --git a/parser/expat/moz.build b/parser/expat/moz.build
index 255a1db7743d..e4d77fdc147a 100644
--- a/parser/expat/moz.build
+++ b/parser/expat/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['lib']
 
-MODULE = 'expat'
-
 EXPORTS += [
     'expat_config.h',
 ]
diff --git a/parser/htmlparser/moz.build b/parser/htmlparser/moz.build
index 219db51c42fd..d279c77bde93 100644
--- a/parser/htmlparser/moz.build
+++ b/parser/htmlparser/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['public', 'src']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'htmlparser'
-
diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build
index e076c4c6a5c0..221c05d62b1c 100644
--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'htmlparser'
-
 UNIFIED_SOURCES += [
     'CNavDTD.cpp',
     'CParserContext.cpp',
diff --git a/parser/moz.build b/parser/moz.build
index c778ff456c1f..543bc3c7bbd7 100644
--- a/parser/moz.build
+++ b/parser/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['expat', 'xml', 'htmlparser', 'html']
 
-MODULE = 'parser'
-
 EXPORTS += [
     'nsCharsetSource.h',
 ]
diff --git a/parser/xml/public/moz.build b/parser/xml/public/moz.build
index 1cbd09e50478..bfcfee4da251 100644
--- a/parser/xml/public/moz.build
+++ b/parser/xml/public/moz.build
@@ -19,5 +19,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'saxparser'
 
-MODULE = 'xml'
-
diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build
index 70e75838996d..121e16bdd6d1 100644
--- a/parser/xml/src/moz.build
+++ b/parser/xml/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xml'
-
 EXPORTS += [
     'nsSAXAttributes.h',
     'nsSAXLocator.h',
diff --git a/parser/xml/test/moz.build b/parser/xml/test/moz.build
index eaf765998670..8ee1ecd586a4 100644
--- a/parser/xml/test/moz.build
+++ b/parser/xml/test/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_xmlreader'
-
 # Note: set the test module's name to test_<yourmodule>
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/profile/dirserviceprovider/moz.build b/profile/dirserviceprovider/moz.build
index 511bfcc2a1d7..460bff97a0cc 100644
--- a/profile/dirserviceprovider/moz.build
+++ b/profile/dirserviceprovider/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src', 'standalone']
 
-MODULE = 'profdirserviceprovider'
-
diff --git a/profile/dirserviceprovider/public/moz.build b/profile/dirserviceprovider/public/moz.build
index e5419a10b3dc..c2e5f85c22f5 100644
--- a/profile/dirserviceprovider/public/moz.build
+++ b/profile/dirserviceprovider/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'profdirserviceprovider'
-
 EXPORTS += [
     'nsProfileDirServiceProvider.h',
 ]
diff --git a/profile/dirserviceprovider/src/moz.build b/profile/dirserviceprovider/src/moz.build
index d481b64ddfee..fc1686866f4e 100644
--- a/profile/dirserviceprovider/src/moz.build
+++ b/profile/dirserviceprovider/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'profdirserviceprovider'
-
 include('objs.mozbuild')
 
 SOURCES += modules_profiledirservice_src_csrcs
diff --git a/profile/dirserviceprovider/standalone/moz.build b/profile/dirserviceprovider/standalone/moz.build
index 97e71e402639..98b6016c2450 100644
--- a/profile/dirserviceprovider/standalone/moz.build
+++ b/profile/dirserviceprovider/standalone/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'profdirserviceprovider'
-
 include('../src/objs.mozbuild')
 
 SOURCES += modules_profiledirservice_src_csrcs
diff --git a/profile/moz.build b/profile/moz.build
index 58fc8f96d373..e7d4b0fdefe6 100644
--- a/profile/moz.build
+++ b/profile/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'dirserviceprovider']
 
-MODULE = 'profile'
-
diff --git a/rdf/base/public/moz.build b/rdf/base/public/moz.build
index f7bc4129e2e7..56cdc593d7ed 100644
--- a/rdf/base/public/moz.build
+++ b/rdf/base/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 EXPORTS += [
     'nsIRDFContentSink.h',
     'rdf.h',
diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build
index 873861141c0e..20be5c9dea6a 100644
--- a/rdf/base/src/moz.build
+++ b/rdf/base/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 SOURCES += [
     'nsCompositeDataSource.cpp',
     'nsContainerEnumerator.cpp',
diff --git a/rdf/build/moz.build b/rdf/build/moz.build
index 4ffce459f898..0656573b5209 100644
--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 EXPORTS += [
     'nsRDFCID.h',
 ]
diff --git a/rdf/datasource/public/moz.build b/rdf/datasource/public/moz.build
index a9f8aeb403c0..8ec20014ca5b 100644
--- a/rdf/datasource/public/moz.build
+++ b/rdf/datasource/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 EXPORTS += [
     'nsILocalStore.h',
 ]
diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build
index 6a0ca5a3237b..349049e9713a 100644
--- a/rdf/datasource/src/moz.build
+++ b/rdf/datasource/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
diff --git a/rdf/moz.build b/rdf/moz.build
index d22ee02999ed..e336c50271b2 100644
--- a/rdf/moz.build
+++ b/rdf/moz.build
@@ -7,5 +7,3 @@
 DIRS += ['base', 'util', 'datasource', 'build']
 TEST_TOOL_DIRS += ['tests']
 
-MODULE = 'rdf'
-
diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build
index 98a0096bc3f3..777e97fe3902 100644
--- a/rdf/tests/dsds/moz.build
+++ b/rdf/tests/dsds/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdf'
-
 SOURCES += [
     'nsRDFDataSourceDS.cpp',
     'nsRDFDataSourceFactory.cpp',
diff --git a/rdf/tests/moz.build b/rdf/tests/moz.build
index 5c8a0e8269d6..5a87a7a9afb9 100644
--- a/rdf/tests/moz.build
+++ b/rdf/tests/moz.build
@@ -6,6 +6,4 @@
 
 TEST_TOOL_DIRS += ['rdfcat', 'rdfpoll', 'triplescat']
 
-MODULE = 'test_rdf'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/rdf/util/moz.build b/rdf/util/moz.build
index 934f58a956db..76218104c014 100644
--- a/rdf/util/moz.build
+++ b/rdf/util/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'rdfutil'
-
diff --git a/rdf/util/public/moz.build b/rdf/util/public/moz.build
index c5a23226ca8e..18024e2629d1 100644
--- a/rdf/util/public/moz.build
+++ b/rdf/util/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdfutil'
-
 EXPORTS += [
     'nsRDFResource.h',
 ]
diff --git a/rdf/util/src/internal/moz.build b/rdf/util/src/internal/moz.build
index eeef9561544a..375690db6e0b 100644
--- a/rdf/util/src/internal/moz.build
+++ b/rdf/util/src/internal/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'rdfutil'
-
 include('../objs.mozbuild')
 
 SOURCES += rdf_util_src_cppsrcs
diff --git a/rdf/util/src/moz.build b/rdf/util/src/moz.build
index eac1261cb696..f2f53ce74693 100644
--- a/rdf/util/src/moz.build
+++ b/rdf/util/src/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['internal']
 
-MODULE = 'rdfutil'
-
 include('objs.mozbuild')
 
 SOURCES += rdf_util_src_cppsrcs
diff --git a/security/build/moz.build b/security/build/moz.build
index 6ceef8d82ba9..376d0edec1e3 100644
--- a/security/build/moz.build
+++ b/security/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'nss'
-
 if CONFIG['MOZ_FOLD_LIBS']:
     # TODO: The library name can be changed when bug 845217 is fixed.
     LIBRARY_NAME = 'nss3'
diff --git a/security/manager/boot/moz.build b/security/manager/boot/moz.build
index bc9116755770..76218104c014 100644
--- a/security/manager/boot/moz.build
+++ b/security/manager/boot/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'pipboot'
-
diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build
index a824bc2cbdc1..a9c424db3084 100644
--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'pipboot'
-
 SOURCES += [
     'nsBOOTModule.cpp',
     'nsEntropyCollector.cpp',
diff --git a/security/manager/pki/moz.build b/security/manager/pki/moz.build
index 7d558d8b1a4f..31a3d7ba7cb5 100644
--- a/security/manager/pki/moz.build
+++ b/security/manager/pki/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'resources', 'src']
 
-MODULE = 'pippki'
-
diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build
index b683fa13674b..b56d678e90de 100644
--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'pippki'
-
 SOURCES += [
     'nsASN1Tree.cpp',
     'nsFormSigningDialog.cpp',
diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build
index 4e611bee18a6..12cc6ad6164f 100644
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['src', 'public', 'tests']
 
-MODULE = 'pipnss'
-
diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
index d2c282e052df..b8a6800d16b8 100644
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'pipnss'
-
 EXPORTS += [
     'CryptoTask.h',
     'nsNSSShutDown.h',
diff --git a/security/manager/ssl/tests/gtest/moz.build b/security/manager/ssl/tests/gtest/moz.build
index 33c53394f4e5..c9ea03a40374 100644
--- a/security/manager/ssl/tests/gtest/moz.build
+++ b/security/manager/ssl/tests/gtest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ssltest'
-
 LIBRARY_NAME = 'ssltest'
 
 LIBXUL_LIBRARY = True
diff --git a/security/manager/ssl/tests/mochitest/moz.build b/security/manager/ssl/tests/mochitest/moz.build
index b566cf6584b3..74dd0b5f37ac 100644
--- a/security/manager/ssl/tests/mochitest/moz.build
+++ b/security/manager/ssl/tests/mochitest/moz.build
@@ -11,5 +11,3 @@ TEST_DIRS += [
     'stricttransportsecurity',
 ]
 
-MODULE = 'pipnss'
-
diff --git a/security/manager/ssl/tests/moz.build b/security/manager/ssl/tests/moz.build
index 7c9ff93b55f5..bfaa969a232b 100644
--- a/security/manager/ssl/tests/moz.build
+++ b/security/manager/ssl/tests/moz.build
@@ -11,6 +11,4 @@ TEST_DIRS += [
 	'mochitest',
 ]
 
-MODULE = 'pipnss'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/security/manager/ssl/tests/unit/moz.build b/security/manager/ssl/tests/unit/moz.build
index e1a9e0265962..024746c33305 100644
--- a/security/manager/ssl/tests/unit/moz.build
+++ b/security/manager/ssl/tests/unit/moz.build
@@ -5,5 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['tlsserver']
-
-MODULE = 'pipnss'
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
index 0715567f75c9..e1f04b85c2a9 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
+++ b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'tlsserver'
-
 FAIL_ON_WARNINGS = True
 
 SIMPLE_PROGRAMS = [
diff --git a/security/manager/ssl/tests/unit/tlsserver/lib/moz.build b/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
index 620b009d9f61..14e84421bc64 100644
--- a/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
+++ b/security/manager/ssl/tests/unit/tlsserver/lib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'tlsserver'
-
 SOURCES += [
     'OCSPCommon.cpp',
     'TLSServer.cpp',
diff --git a/security/manager/ssl/tests/unit/tlsserver/moz.build b/security/manager/ssl/tests/unit/tlsserver/moz.build
index 0599f54baf76..c35eff505bc5 100644
--- a/security/manager/ssl/tests/unit/tlsserver/moz.build
+++ b/security/manager/ssl/tests/unit/tlsserver/moz.build
@@ -6,5 +6,3 @@
 
 # lib must be first, because cmd depends on its output
 DIRS += ['lib', 'cmd']
-
-MODULE = 'tlsserver'
diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
index b0df03246f8c..4802901a3a1a 100644
--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -6,8 +6,6 @@
 
 FAIL_ON_WARNINGS = True
 
-MODULE = 'sandbox'
-
 EXPORTS.mozilla += [
     'Sandbox.h',
 ]
diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build
index 28c144dda11e..291a368f8b2f 100644
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -9,8 +9,6 @@ if CONFIG['OS_ARCH'] == 'Linux':
     DIRS += ['linux']
 
 elif CONFIG['OS_ARCH'] == 'WINNT':
-
-    MODULE = 'sandbox'
     LIBRARY_NAME = 'sandbox_s'
     EXPORT_LIBRARY = True
     FORCE_STATIC_LIB = True
diff --git a/security/sandbox/win/src/sandboxbroker/moz.build b/security/sandbox/win/src/sandboxbroker/moz.build
index f2f0894bb750..f11e9fbf6988 100644
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@@ -4,7 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'sandboxbroker'
 LIBRARY_NAME = 'sandboxbroker'
 EXPORT_LIBRARY = True
 
diff --git a/services/common/tests/moz.build b/services/common/tests/moz.build
index 56a8d3004220..191c90f0b92d 100644
--- a/services/common/tests/moz.build
+++ b/services/common/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_services_common'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/crypto/component/moz.build b/services/crypto/component/moz.build
index faba2a208694..50c5142477cf 100644
--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -12,8 +12,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'services-crypto-component'
 
-MODULE = 'services-crypto'
-
 SOURCES += [
     'nsSyncJPAKE.cpp',
 ]
diff --git a/services/crypto/component/tests/moz.build b/services/crypto/component/tests/moz.build
index bbcde2097ddd..191c90f0b92d 100644
--- a/services/crypto/component/tests/moz.build
+++ b/services/crypto/component/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_services_crypto'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/crypto/moz.build b/services/crypto/moz.build
index 5cb2b1d1bd44..b8417ce8e671 100644
--- a/services/crypto/moz.build
+++ b/services/crypto/moz.build
@@ -7,8 +7,6 @@
 DIRS += ['component']
 TEST_DIRS += ['tests']
 
-MODULE = 'services-crypto'
-
 EXTRA_COMPONENTS += [
     'cryptoComponents.manifest',
 ]
diff --git a/services/crypto/tests/moz.build b/services/crypto/tests/moz.build
index bbcde2097ddd..191c90f0b92d 100644
--- a/services/crypto/tests/moz.build
+++ b/services/crypto/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_services_crypto'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/sync/tests/moz.build b/services/sync/tests/moz.build
index a1067b49f4cd..191c90f0b92d 100644
--- a/services/sync/tests/moz.build
+++ b/services/sync/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_services_sync'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/startupcache/test/moz.build b/startupcache/test/moz.build
index 5bbd30003f7c..391ee2de25bc 100644
--- a/startupcache/test/moz.build
+++ b/startupcache/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_startupcache'
-
 CPP_UNIT_TESTS += [
     'TestStartupCache.cpp',
 ]
diff --git a/storage/build/moz.build b/storage/build/moz.build
index efaf73ae7c38..6bc1e1d101a8 100644
--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'storage'
-
 EXPORTS += [
     'mozStorageCID.h',
 ]
diff --git a/storage/moz.build b/storage/moz.build
index 3b16225cb499..06df539239e2 100644
--- a/storage/moz.build
+++ b/storage/moz.build
@@ -8,5 +8,3 @@ DIRS += ['public', 'src', 'build']
 
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'storage'
-
diff --git a/storage/src/moz.build b/storage/src/moz.build
index efe10f60ad54..f4f3be996592 100644
--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'storage'
-
 EXPORTS.mozilla.storage += [
     'Variant.h',
     'Variant_inl.h',
diff --git a/storage/test/moz.build b/storage/test/moz.build
index f012ad41c9e0..bcef6e1a47c7 100644
--- a/storage/test/moz.build
+++ b/storage/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_storage'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build
index fd60fd282333..7d506efd9caf 100644
--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gtest'
-
 EXPORTS.gtest += [
     'gtest/include/gtest/gtest-death-test.h',
     'gtest/include/gtest/gtest-message.h',
diff --git a/testing/mozbase/moz.build b/testing/mozbase/moz.build
index 1971f461f9d7..895d11993cfb 100644
--- a/testing/mozbase/moz.build
+++ b/testing/mozbase/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'testing_mozbase'
-
diff --git a/testing/peptest/moz.build b/testing/peptest/moz.build
index 3f9708036b56..895d11993cfb 100644
--- a/testing/peptest/moz.build
+++ b/testing/peptest/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'testing_peptest'
-
diff --git a/testing/xpcshell/example/moz.build b/testing/xpcshell/example/moz.build
index 45827f5a1013..0c46d1c7a9a1 100644
--- a/testing/xpcshell/example/moz.build
+++ b/testing/xpcshell/example/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_testing_xpcshell_example'
-
 # This is a list of directories containing tests to run, separated by spaces.
 # Most likely, tho, you won't use more than one directory here.
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/testing/xpcshell/moz.build b/testing/xpcshell/moz.build
index 7e4b0fae8dc5..d63be6e8d971 100644
--- a/testing/xpcshell/moz.build
+++ b/testing/xpcshell/moz.build
@@ -6,5 +6,3 @@
 
 TEST_DIRS += ['example']
 
-MODULE = 'testing_xpcshell'
-
diff --git a/toolkit/components/autocomplete/tests/moz.build b/toolkit/components/autocomplete/tests/moz.build
index 42d6e82cd620..191c90f0b92d 100644
--- a/toolkit/components/autocomplete/tests/moz.build
+++ b/toolkit/components/autocomplete/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_autocomplete'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build
index 65bb998bc8b5..3d2e54b8a6aa 100644
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'toolkitcomps'
-
 EXPORTS += [
     'nsToolkitCompsCID.h',
 ]
diff --git a/toolkit/components/captivedetect/test/moz.build b/toolkit/components/captivedetect/test/moz.build
index b92becca19ee..191c90f0b92d 100644
--- a/toolkit/components/captivedetect/test/moz.build
+++ b/toolkit/components/captivedetect/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_captivedetect'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build
index b1cab58f4a73..791e47e4cc57 100644
--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -15,8 +15,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'commandlines'
 
-MODULE = 'toolkitcomps'
-
 SOURCES += [
     'nsCommandLine.cpp',
 ]
diff --git a/toolkit/components/commandlines/test/moz.build b/toolkit/components/commandlines/test/moz.build
index 76c137438cd0..5a4c231f044f 100644
--- a/toolkit/components/commandlines/test/moz.build
+++ b/toolkit/components/commandlines/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_harness_commandlines'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
diff --git a/toolkit/components/contentprefs/moz.build b/toolkit/components/contentprefs/moz.build
index 7e99edc96e0c..b283055d91a6 100644
--- a/toolkit/components/contentprefs/moz.build
+++ b/toolkit/components/contentprefs/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'contentprefs'
-
 EXTRA_COMPONENTS += [
     'nsContentPrefService.js',
     'nsContentPrefService.manifest',
diff --git a/toolkit/components/contentprefs/tests/moz.build b/toolkit/components/contentprefs/tests/moz.build
index 951ddb06d92b..1cc07b721db9 100644
--- a/toolkit/components/contentprefs/tests/moz.build
+++ b/toolkit/components/contentprefs/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_toolkit_contentprefs'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_cps2/xpcshell.ini']
diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build
index 3f6a33fe0dca..a0543401802c 100644
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'jsctypes'
-
 SOURCES += [
     'ctypes.cpp',
 ]
diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build
index 0b8e2afc6222..7ffbca07ac91 100644
--- a/toolkit/components/ctypes/tests/moz.build
+++ b/toolkit/components/ctypes/tests/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'jsctypes-test'
 NO_DIST_INSTALL = True
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/downloads/test/moz.build b/toolkit/components/downloads/test/moz.build
index 4ac07e348c8a..86e0552e87ed 100644
--- a/toolkit/components/downloads/test/moz.build
+++ b/toolkit/components/downloads/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_dm'
-
 if not CONFIG['MOZ_JSDOWNLOADS']:
     TEST_DIRS += ['browser']
     XPCSHELL_TESTS_MANIFESTS += ['schema_migration/xpcshell.ini']
diff --git a/toolkit/components/filepicker/test/moz.build b/toolkit/components/filepicker/test/moz.build
index e229f12b5e42..191c90f0b92d 100644
--- a/toolkit/components/filepicker/test/moz.build
+++ b/toolkit/components/filepicker/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_filepicker'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/finalizationwitness/moz.build b/toolkit/components/finalizationwitness/moz.build
index a14006b1bb25..a2b9dc412dcc 100644
--- a/toolkit/components/finalizationwitness/moz.build
+++ b/toolkit/components/finalizationwitness/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'finalizationwitness'
-
 SOURCES += [
   'FinalizationWitnessService.cpp',
 ]
diff --git a/toolkit/components/intl/moz.build b/toolkit/components/intl/moz.build
index c085c03beea7..263c2c54c248 100644
--- a/toolkit/components/intl/moz.build
+++ b/toolkit/components/intl/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'intl'
-
 SOURCES += [
     'nsCharsetMenu.cpp',
 ]
diff --git a/toolkit/components/jsdownloads/src/moz.build b/toolkit/components/jsdownloads/src/moz.build
index 9964b0bc9767..02ceee2d6ceb 100644
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsdownloads'
-
 SOURCES += [
     'DownloadPlatform.cpp',
 ]
diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build
index 13ee3ac18330..6a50e6598c40 100644
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'mediasniffer'
-
 EXPORTS += [
     'nsMediaSniffer.h',
 ]
diff --git a/toolkit/components/mediasniffer/test/moz.build b/toolkit/components/mediasniffer/test/moz.build
index 8bd52f48dc54..191c90f0b92d 100644
--- a/toolkit/components/mediasniffer/test/moz.build
+++ b/toolkit/components/mediasniffer/test/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_mediasniffer'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/microformats/moz.build b/toolkit/components/microformats/moz.build
index 50448bfb2961..bb0c1b0d59c7 100644
--- a/toolkit/components/microformats/moz.build
+++ b/toolkit/components/microformats/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'microformats'
-
 EXTRA_JS_MODULES += [
     'Microformats.js',
 ]
diff --git a/toolkit/components/osfile/moz.build b/toolkit/components/osfile/moz.build
index 677f87d0ac24..d679184c1247 100644
--- a/toolkit/components/osfile/moz.build
+++ b/toolkit/components/osfile/moz.build
@@ -10,8 +10,6 @@ DIRS += [
 
 TEST_DIRS += ['tests']
 
-MODULE = 'osfile'
-
 EXTRA_PP_JS_MODULES += [
     'osfile.jsm',
 ]
diff --git a/toolkit/components/osfile/tests/mochi/moz.build b/toolkit/components/osfile/tests/mochi/moz.build
index fdafa491d822..87c88dfddbc5 100644
--- a/toolkit/components/osfile/tests/mochi/moz.build
+++ b/toolkit/components/osfile/tests/mochi/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'osfile'
-
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
diff --git a/toolkit/components/osfile/tests/moz.build b/toolkit/components/osfile/tests/moz.build
index 7886b7c3b7e8..c88e87d38d7c 100644
--- a/toolkit/components/osfile/tests/moz.build
+++ b/toolkit/components/osfile/tests/moz.build
@@ -6,6 +6,4 @@
 
 TEST_DIRS += ['mochi']
 
-MODULE = 'test_osfile'
-
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/components/passwordmgr/test/moz.build b/toolkit/components/passwordmgr/test/moz.build
index 698fd456d080..8629ff6704c5 100644
--- a/toolkit/components/passwordmgr/test/moz.build
+++ b/toolkit/components/passwordmgr/test/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['browser', 'auth2']
 
-MODULE = 'test_passwordmgr'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build
index b836eac9cbd1..d99f331d43c0 100644
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsperf'
-
 SOURCES += [
     'PerfMeasurement.cpp',
 ]
diff --git a/toolkit/components/places/tests/cpp/moz.build b/toolkit/components/places/tests/cpp/moz.build
index 7b697409ecc0..58a3ff4e0d97 100644
--- a/toolkit/components/places/tests/cpp/moz.build
+++ b/toolkit/components/places/tests/cpp/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_places'
-
 CPP_UNIT_TESTS += [
     'test_IHistory.cpp',
 ]
diff --git a/toolkit/components/places/tests/moz.build b/toolkit/components/places/tests/moz.build
index 875141a61133..88f55cc6eece 100644
--- a/toolkit/components/places/tests/moz.build
+++ b/toolkit/components/places/tests/moz.build
@@ -13,8 +13,6 @@ TEST_DIRS += [
 
 TEST_TOOL_DIRS += ['cpp']
 
-MODULE = 'test_places'
-
 XPCSHELL_TESTS_MANIFESTS += [
     'autocomplete/xpcshell.ini',
     'bookmarks/xpcshell.ini',
diff --git a/toolkit/components/prompts/src/moz.build b/toolkit/components/prompts/src/moz.build
index 3dbce3ff45d7..3e9103909b32 100644
--- a/toolkit/components/prompts/src/moz.build
+++ b/toolkit/components/prompts/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'prompter'
-
 EXTRA_COMPONENTS += [
     'nsPrompter.js',
     'nsPrompter.manifest',
diff --git a/toolkit/components/prompts/test/moz.build b/toolkit/components/prompts/test/moz.build
index 2235a9debb9c..3cf16eb0cfe8 100644
--- a/toolkit/components/prompts/test/moz.build
+++ b/toolkit/components/prompts/test/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_prompter'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build
index c307fed89b35..48ff595bda8c 100644
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'protobuf'
-
 EXPORTS.protobuf.google.protobuf += [
     'google/protobuf/extension_set.h',
     'google/protobuf/generated_message_util.h',
diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build
index 8684f9580b6b..673e47b7dcd2 100644
--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jsreflect'
-
 SOURCES += [
     'reflect.cpp',
 ]
diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build
index 7cebfa9a0799..6155c008bef9 100644
--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'toolkitremote'
 
-MODULE = 'toolkitcomps'
-
 SOURCES += [
     'nsXRemoteService.cpp',
 ]
diff --git a/toolkit/components/satchel/test/moz.build b/toolkit/components/satchel/test/moz.build
index 816d27cb884d..5672ffb96810 100644
--- a/toolkit/components/satchel/test/moz.build
+++ b/toolkit/components/satchel/test/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['browser']
 
-MODULE = 'test_satchel'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
diff --git a/toolkit/components/search/tests/moz.build b/toolkit/components/search/tests/moz.build
index 0e6fb547782b..dcad37e80e1b 100644
--- a/toolkit/components/search/tests/moz.build
+++ b/toolkit/components/search/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_searchservice'
-
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/components/social/test/browser/moz.build b/toolkit/components/social/test/browser/moz.build
index 24f28896e62a..895d11993cfb 100644
--- a/toolkit/components/social/test/browser/moz.build
+++ b/toolkit/components/social/test/browser/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_socialapi'
-
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index ebc68fd79dc2..f61e8c05197b 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -8,8 +8,6 @@ DIRS += ['public']
 
 TEST_DIRS += ['tests/browser']
 
-MODULE = 'toolkitcomps'
-
 EXPORTS.mozilla += [
     'StartupTimeline.h',
 ]
diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build
index d57786c07f88..db0414e18a91 100644
--- a/toolkit/components/startup/public/moz.build
+++ b/toolkit/components/startup/public/moz.build
@@ -11,5 +11,3 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'appstartup'
 
-MODULE = 'appcomps'
-
diff --git a/toolkit/components/statusfilter/moz.build b/toolkit/components/statusfilter/moz.build
index 71b4ecc36253..aa7ddcb6fef6 100644
--- a/toolkit/components/statusfilter/moz.build
+++ b/toolkit/components/statusfilter/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'browser'
-
 SOURCES += [
     'nsBrowserStatusFilter.cpp',
 ]
diff --git a/toolkit/components/url-classifier/tests/mochitest/moz.build b/toolkit/components/url-classifier/tests/mochitest/moz.build
index 045eb41cfac2..99b068bc92a0 100644
--- a/toolkit/components/url-classifier/tests/mochitest/moz.build
+++ b/toolkit/components/url-classifier/tests/mochitest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_url-classifier'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build
index 49a97ec6ca77..58df6396b1ff 100644
--- a/toolkit/components/url-classifier/tests/moz.build
+++ b/toolkit/components/url-classifier/tests/moz.build
@@ -6,6 +6,4 @@
 
 TEST_TOOL_DIRS += ['mochitest']
 
-MODULE = 'test_url-classifier'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/urlformatter/tests/moz.build b/toolkit/components/urlformatter/tests/moz.build
index a1654c06ffb1..191c90f0b92d 100644
--- a/toolkit/components/urlformatter/tests/moz.build
+++ b/toolkit/components/urlformatter/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_urlformatter'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/workerloader/moz.build b/toolkit/components/workerloader/moz.build
index 6f5bd1627b1e..5ca34638cc7e 100644
--- a/toolkit/components/workerloader/moz.build
+++ b/toolkit/components/workerloader/moz.build
@@ -6,5 +6,3 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'workerloader'
-
diff --git a/toolkit/components/workerloader/tests/moz.build b/toolkit/components/workerloader/tests/moz.build
index 1b86cd12ef82..87c88dfddbc5 100644
--- a/toolkit/components/workerloader/tests/moz.build
+++ b/toolkit/components/workerloader/tests/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'workerloader'
-
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
diff --git a/toolkit/content/tests/moz.build b/toolkit/content/tests/moz.build
index 2d441176aee3..05cf8e41ff89 100644
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['chrome', 'widgets', 'browser']
 
-MODULE = 'test_toolkit_general'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build
index c75eaf5d2dcd..4ce1793d3e2c 100644
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'crashreporter'
-
 if CONFIG['OS_TARGET'] != 'Android':
     PROGRAM = 'crashreporter'
 # The xpcshell test case here verifies that the CA certificate list
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
index e391e09c26cf..1383ddf387e9 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'crash_generation'
-
 SOURCES += [
     'crash_generation_client.cc',
     'crash_generation_server.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
index 5a92f2b04968..101119249e0a 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'handler'
-
 SOURCES += [
     '../log/log.cc',
     'exception_handler.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
index 7a6cbc2f11f0..8ececbdcc9be 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'writer'
-
 SOURCES += [
     'linux_dumper.cc',
     'linux_ptrace_dumper.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
index 7a2f294ce0b3..99ce7f3b23e7 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'crash_generation'
-
 SOURCES += [
     'crash_generation_client.cc',
     'crash_generation_server.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
index 7db1f25c5202..fb366a86cfeb 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'handler'
-
 SOURCES += [
     'breakpad_nlist_64.cc',
     'dynamic_images.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/client/moz.build b/toolkit/crashreporter/google-breakpad/src/client/moz.build
index 7cb1d4047787..95781a5a53b7 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'minidump_file_writer'
-
 SOURCES += [
     'minidump_file_writer.cc',
 ]
diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
index 534583899334..0f68fc3713d8 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'handler'
-
 SOURCES += [
     'exception_handler.cc',
     'minidump_generator.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build b/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
index da8c6de1560e..938cb42216f0 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'breakpad_dwarf'
-
 if CONFIG['MOZ_CRASHREPORTER']:
     HOST_LIBRARY_NAME = 'host_breakpad_dwarf_s'
     HOST_SOURCES += [
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
index 88a070e1328d..bbe4ad0df5d2 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'breakpad_linux_common'
-
 SOURCES += [
     'elfutils.cc',
     'file_id.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
index e082e8d08bf3..86fb60c332ac 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'breakpad_mac_common'
-
 SOURCES += [
     'arch_utilities.cc',
     'bootstrap_compat.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build
index b74b6b808846..50c71e470f54 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['OS_ARCH'] in ('Darwin', 'Linux'):
     DIRS += ['dwarf']
 
-MODULE = 'breakpad_common'
-
 SOURCES += [
     'convert_UTF.c',
 ]
diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
index 3bf83ea6358c..c84c532f7ef0 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'breakpad_solaris_common'
-
 SOURCES += [
     'dump_symbols.cc',
     'file_id.cc',
diff --git a/toolkit/crashreporter/google-breakpad/src/processor/moz.build b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
index 01db37a116d4..e107916c64ba 100644
--- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'breakpad_sps_common'
-
 SOURCES += [
     'basic_code_modules.cc',
     'basic_source_line_resolver.cc',
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
index ba4734dd0cb5..154be464540e 100644
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -57,8 +57,6 @@ if CONFIG['MOZ_CRASHREPORTER_INJECTOR']:
 
 TEST_TOOL_DIRS += ['test']
 
-MODULE = 'crashreporter'
-
 EXPORTS += [
     'nsExceptionHandler.h',
 ]
diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build
index 335ee9f8f612..b91f497c3084 100644
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -3,8 +3,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MODULE = 'crashreporter_test'
 NO_DIST_INSTALL = True
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
diff --git a/toolkit/devtools/apps/tests/moz.build b/toolkit/devtools/apps/tests/moz.build
index 81f7a7cb5e07..191c90f0b92d 100644
--- a/toolkit/devtools/apps/tests/moz.build
+++ b/toolkit/devtools/apps/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_webapps_actor'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/devtools/server/tests/moz.build b/toolkit/devtools/server/tests/moz.build
index c963f6bdddc7..96f6a6d4f105 100644
--- a/toolkit/devtools/server/tests/moz.build
+++ b/toolkit/devtools/server/tests/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['mochitest']
 
-MODULE = 'test_debugger'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/devtools/sourcemap/tests/moz.build b/toolkit/devtools/sourcemap/tests/moz.build
index 0a99e4f9ac44..191c90f0b92d 100644
--- a/toolkit/devtools/sourcemap/tests/moz.build
+++ b/toolkit/devtools/sourcemap/tests/moz.build
@@ -4,6 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_sourcemap'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/devtools/tests/moz.build b/toolkit/devtools/tests/moz.build
index 55c895c73c59..c3db8bbefab7 100644
--- a/toolkit/devtools/tests/moz.build
+++ b/toolkit/devtools/tests/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_devtools'
-
 MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/forgetaboutsite/moz.build b/toolkit/forgetaboutsite/moz.build
index edd81d697854..8481e8c70acd 100644
--- a/toolkit/forgetaboutsite/moz.build
+++ b/toolkit/forgetaboutsite/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['test']
 
-MODULE = 'forgetaboutsite'
-
 EXTRA_JS_MODULES += [
     'ForgetAboutSite.jsm',
 ]
diff --git a/toolkit/forgetaboutsite/test/browser/moz.build b/toolkit/forgetaboutsite/test/browser/moz.build
index 7af1ecb7c5ff..33f04f853787 100644
--- a/toolkit/forgetaboutsite/test/browser/moz.build
+++ b/toolkit/forgetaboutsite/test/browser/moz.build
@@ -4,7 +4,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'forgetaboutsite'
-
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 
diff --git a/toolkit/forgetaboutsite/test/moz.build b/toolkit/forgetaboutsite/test/moz.build
index cefdd59ca1f6..30780a141d59 100644
--- a/toolkit/forgetaboutsite/test/moz.build
+++ b/toolkit/forgetaboutsite/test/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['browser']
 
-MODULE = 'forgetaboutsite'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/identity/tests/moz.build b/toolkit/identity/tests/moz.build
index 62c72b31a5da..836ae1fb2919 100644
--- a/toolkit/identity/tests/moz.build
+++ b/toolkit/identity/tests/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['chrome', 'mochitest']
 
-MODULE = 'test_identity'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 43b284d538af..db2862e1a19d 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['winvccorlib']
 
-MODULE = 'libxul'
-
 LIBRARY_NAME = 'xul'
 
 SOURCES += [
diff --git a/toolkit/library/winvccorlib/moz.build b/toolkit/library/winvccorlib/moz.build
index 0e4ce81a0cf0..518fdc602e8d 100644
--- a/toolkit/library/winvccorlib/moz.build
+++ b/toolkit/library/winvccorlib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dummyvccorlib'
-
 if not CONFIG['LINK_GTEST']:
     LIBRARY_NAME = 'dummyvccorlib'
 
diff --git a/toolkit/modules/tests/moz.build b/toolkit/modules/tests/moz.build
index f0262b20701f..8023f85cde64 100644
--- a/toolkit/modules/tests/moz.build
+++ b/toolkit/modules/tests/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['browser']
 
-MODULE = 'test_toolkit_general'
-
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
diff --git a/toolkit/mozapps/downloads/moz.build b/toolkit/mozapps/downloads/moz.build
index 3bebee8e96e4..a85ceb3970f3 100644
--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@@ -6,8 +6,6 @@
 
 TEST_DIRS += ['tests']
 
-MODULE = 'helperAppDlg'
-
 EXTRA_COMPONENTS += [
     'nsHelperAppDlg.manifest',
 ]
diff --git a/toolkit/mozapps/downloads/tests/moz.build b/toolkit/mozapps/downloads/tests/moz.build
index d7aa15f5f8d8..001e37431f1c 100644
--- a/toolkit/mozapps/downloads/tests/moz.build
+++ b/toolkit/mozapps/downloads/tests/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['chrome']
 
-MODULE = 'test_downloads'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/extensions/test/moz.build
index 930b8188d611..8b60a104bfc1 100644
--- a/toolkit/mozapps/extensions/test/moz.build
+++ b/toolkit/mozapps/extensions/test/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_BUILD_APP'] != 'mobile':
     DIRS += ['xpinstall', 'browser', 'mochitest']
 
-MODULE = 'test_extensionmanager'
-
 XPCSHELL_TESTS_MANIFESTS += [
     'xpcshell/xpcshell-unpack.ini',
     'xpcshell/xpcshell.ini',
diff --git a/toolkit/mozapps/handling/moz.build b/toolkit/mozapps/handling/moz.build
index 7aaf9a26d12f..37abb9b8de2c 100644
--- a/toolkit/mozapps/handling/moz.build
+++ b/toolkit/mozapps/handling/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'contentDispatchChooser'
-
 EXTRA_COMPONENTS += [
     'nsContentDispatchChooser.js',
     'nsContentDispatchChooser.manifest',
diff --git a/toolkit/mozapps/plugins/tests/moz.build b/toolkit/mozapps/plugins/tests/moz.build
index ffe1084011d4..bcb6fab47aa3 100644
--- a/toolkit/mozapps/plugins/tests/moz.build
+++ b/toolkit/mozapps/plugins/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_plugins'
-
 SIMPLE_PROGRAMS = [
     'BadPlugin',
     'GoodPlugin',
diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build
index ddbc250cff85..78e557ce904d 100644
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'libupdatecommon'
-
 EXPORTS += [
     'readstrings.h',
     'updatedefines.h',
diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build
index 464cda74ff62..308fd0fbbf40 100644
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -14,8 +14,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'toolkitprofile'
 
-MODULE = 'xulapp'
-
 SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp' ]
 
 SOURCES += [
diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build
index 55f93d70ca7a..957b62817f96 100644
--- a/toolkit/system/androidproxy/moz.build
+++ b/toolkit/system/androidproxy/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'androidproxy'
-
 SOURCES += [
     'nsAndroidSystemProxySettings.cpp',
 ]
diff --git a/toolkit/system/dbus/moz.build b/toolkit/system/dbus/moz.build
index 95624752dd6d..63b3689147f0 100644
--- a/toolkit/system/dbus/moz.build
+++ b/toolkit/system/dbus/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'dbus'
-
 SOURCES += [
     'nsDBusModule.cpp',
     'nsDBusService.cpp',
diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build
index f5d1d738cb34..94344bbfe01e 100644
--- a/toolkit/system/gnome/moz.build
+++ b/toolkit/system/gnome/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'mozgnome'
-
 SOURCES += [
     'nsGnomeModule.cpp',
 ]
diff --git a/toolkit/system/osxproxy/moz.build b/toolkit/system/osxproxy/moz.build
index 2c169c777f0c..58fa26a443b4 100644
--- a/toolkit/system/osxproxy/moz.build
+++ b/toolkit/system/osxproxy/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'osxproxy'
-
 SOURCES += [
     'nsOSXSystemProxySettings.mm',
 ]
diff --git a/toolkit/system/unixproxy/moz.build b/toolkit/system/unixproxy/moz.build
index 47206e80ee25..b51d5caa00a0 100644
--- a/toolkit/system/unixproxy/moz.build
+++ b/toolkit/system/unixproxy/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'unixproxy'
-
 if CONFIG['MOZ_ENABLE_LIBPROXY']:
     SOURCES += [
         'nsLibProxySettings.cpp',
diff --git a/toolkit/system/windowsproxy/moz.build b/toolkit/system/windowsproxy/moz.build
index 95d623b6fc69..7c3508e1da72 100644
--- a/toolkit/system/windowsproxy/moz.build
+++ b/toolkit/system/windowsproxy/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'windowsproxy'
-
 SOURCES += [
     'nsWindowsSystemProxySettings.cpp',
 ]
diff --git a/toolkit/xre/test/moz.build b/toolkit/xre/test/moz.build
index b9478ae0d42c..6537eede68da 100644
--- a/toolkit/xre/test/moz.build
+++ b/toolkit/xre/test/moz.build
@@ -7,7 +7,5 @@
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win']
 
-MODULE = 'test_xulapp'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
diff --git a/toolkit/xre/test/win/moz.build b/toolkit/xre/test/win/moz.build
index 0288807343df..cc3d2ee08613 100644
--- a/toolkit/xre/test/win/moz.build
+++ b/toolkit/xre/test/win/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_xulapp'
-
 SIMPLE_PROGRAMS = [
     'TestDllInterceptor',
     'TestXREMakeCommandLineWin',
diff --git a/tools/jprof/stub/moz.build b/tools/jprof/stub/moz.build
index 5f2007e1d30d..2997fb8f6c77 100644
--- a/tools/jprof/stub/moz.build
+++ b/tools/jprof/stub/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'jprof'
-
 EXPORTS += [
     'jprof.h',
 ]
diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build
index 9c36b2daaf35..1cb829acc580 100644
--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'tracemalloc'
-
 EXPORTS += [
     'nsTraceMalloc.h',
 ]
diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build
index 7d965268cb3b..c0f51c73f145 100644
--- a/uriloader/exthandler/tests/moz.build
+++ b/uriloader/exthandler/tests/moz.build
@@ -8,8 +8,6 @@ DIRS += ['mochitest']
 
 FAIL_ON_WARNINGS = True
 
-MODULE = 'test_uriloader_exthandler'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 #FIXME/bug 575918: out-of-process xpcshell is broken on OS X
diff --git a/view/moz.build b/view/moz.build
index 92474a215fce..76218104c014 100644
--- a/view/moz.build
+++ b/view/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'view'
-
diff --git a/view/public/moz.build b/view/public/moz.build
index 2a8128caf8b5..3882a5d2b376 100644
--- a/view/public/moz.build
+++ b/view/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'view'
-
 EXPORTS += [
     'nsView.h',
     'nsViewManager.h',
diff --git a/view/src/moz.build b/view/src/moz.build
index 6a08f6c78473..5459823c66b6 100644
--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'view'
-
 SOURCES += [
     'nsView.cpp',
     'nsViewManager.cpp',
diff --git a/widget/android/moz.build b/widget/android/moz.build
index b526fcaec836..043a56cb633e 100644
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'widget_android'
 
-MODULE = 'widget'
-
 EXPORTS += [
     'AndroidBridge.h',
     'AndroidJavaWrappers.h',
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index 70bd5f2a1b7a..02adad671bfe 100644
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'widget_cocoa'
 
-MODULE = 'widget'
-
 EXPORTS += [
     'mozView.h',
     'nsChangeObserver.h',
diff --git a/widget/gonk/libdisplay/moz.build b/widget/gonk/libdisplay/moz.build
index 7ce9e95c4ff0..f33aae067e7c 100644
--- a/widget/gonk/libdisplay/moz.build
+++ b/widget/gonk/libdisplay/moz.build
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MODULE = 'display'
-
 SOURCES += [
     'BootAnimation.cpp',
 ]
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index ff937630be19..954da8ab5a25 100644
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MODULE = 'widget'
-
 EXPORTS += [
     'OrientationObserver.h',
 ]
diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build
index c6d154a7c718..a49d538259a1 100644
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MODULE = 'nativewindow'
-
 EXPORTS += [
     'GonkNativeWindow.h',
     'GonkNativeWindowClient.h',
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index ecbe718dec6a..82f353900651 100644
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widget'
-
 if CONFIG['MOZ_ENABLE_GTK2']:
     LIBRARY_NAME = 'widget_gtk2'
 else:
diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build
index 81d163269c17..c3ce4a26863b 100644
--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'gtkxtbin'
-
 EXPORTS += [
     'gtk2xtbin.h',
 ]
diff --git a/widget/os2/moz.build b/widget/os2/moz.build
index c81173b7001d..6adba05aaa1c 100644
--- a/widget/os2/moz.build
+++ b/widget/os2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widget'
-
 SOURCES += [
     'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
diff --git a/widget/qt/faststartupqt/moz.build b/widget/qt/faststartupqt/moz.build
index 32ed9d932922..83da4f5ebc01 100644
--- a/widget/qt/faststartupqt/moz.build
+++ b/widget/qt/faststartupqt/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'faststartupqt'
-
 GENERATED_SOURCES += [
     'moc_moziqwidget.cpp',
     'moc_nsFastStartupQt.cpp',
diff --git a/widget/qt/moz.build b/widget/qt/moz.build
index 97e41369ae3c..e64ae0517740 100644
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['faststartupqt']
 
-MODULE = 'widget'
-
 EXPORTS += [
     'nsQtKeyUtils.h',
 ]
diff --git a/widget/shared/moz.build b/widget/shared/moz.build
index 6bad8e0adca6..799d4d028036 100644
--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -7,8 +7,6 @@
 if CONFIG['MOZ_X11']:
     PARALLEL_DIRS += ['x11']
 
-MODULE = 'widget'
-
 UNIFIED_SOURCES += [
     'nsShmImage.cpp',
     'SharedWidgetUtils.cpp',
diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build
index 15d11850d016..ba45196abae5 100644
--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widget'
-
 SOURCES += [
     'keysym2ucs.c',
 ]
diff --git a/widget/tests/moz.build b/widget/tests/moz.build
index 42fcf4e45323..173948a0a475 100644
--- a/widget/tests/moz.build
+++ b/widget/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'test_widget'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
diff --git a/widget/windows/moz.build b/widget/windows/moz.build
index 1b7fc8b12ced..30eb2db9920b 100644
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -9,8 +9,6 @@ if CONFIG['MOZ_METRO']:
 
 TEST_DIRS += ['tests']
 
-MODULE = 'widget'
-
 EXPORTS += [
     'nsdefs.h',
     'WindowHook.h',
diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build
index 26877e83ee22..d4059d0e5a9b 100644
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widget'
-
 SOURCES += [
     'APZController.cpp',
     'FrameworkView.cpp',
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
index 3ddcaeb60f6d..d2663aa6c5bf 100644
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'widget'
-
 EXPORTS += [
     'APZCCallbackHelper.h',
     'GfxDriverInfo.h',
diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build
index 36db96142126..3994e95b6951 100644
--- a/widget/xremoteclient/moz.build
+++ b/widget/xremoteclient/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xremoteclient'
-
 PROGRAM = 'mozilla-xremote-client'
 
 LIBRARY_NAME = 'xremote_client_s'
diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build
index e2407985882a..569fc15f8c27 100644
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -38,8 +38,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 
 XPIDL_MODULE = 'xpcom_base'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'ErrorList.h',
     'nsAgg.h',
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index 783e10bf9e93..2489fedf5739 100644
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'nsXPCOM.h',
     'nsXPCOMCID.h',
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
index 69d9f42be5fb..000b66918e55 100644
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -16,8 +16,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xpcom_components'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'nsCategoryManagerUtils.h',
 ]
diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build
index 4dbf2f1dcd88..a8e95023c140 100644
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -43,8 +43,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 XPIDL_MODULE = 'xpcom_ds'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'nsArray.h',
     'nsAtomService.h',
diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
index e6bc091539b8..2bb3c1d1a925 100644
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -11,8 +11,6 @@ DIRS += ['standalone', 'nomozalloc']
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['staticruntime']
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'MainThreadUtils.h',
     'nsArrayEnumerator.h',
diff --git a/xpcom/glue/nomozalloc/moz.build b/xpcom/glue/nomozalloc/moz.build
index 16fca3b832b5..0cc570a66232 100644
--- a/xpcom/glue/nomozalloc/moz.build
+++ b/xpcom/glue/nomozalloc/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 include('../objs.mozbuild')
 
 SOURCES += xpcom_gluens_src_cppsrcs
diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build
index 7a7d861a2bb2..f336f6a2ff7e 100644
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -9,8 +9,6 @@
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['staticruntime']
 
-MODULE = 'xpcom'
-
 include('../objs.mozbuild')
 
 SOURCES += xpcom_glue_src_cppsrcs
diff --git a/xpcom/glue/standalone/staticruntime/moz.build b/xpcom/glue/standalone/staticruntime/moz.build
index 1cfbdf642e74..d717d44e481c 100644
--- a/xpcom/glue/standalone/staticruntime/moz.build
+++ b/xpcom/glue/standalone/staticruntime/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 include('../../objs.mozbuild')
 
 SOURCES += xpcom_glue_src_cppsrcs
diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build
index 04871b7411f5..bf93358e19aa 100644
--- a/xpcom/glue/staticruntime/moz.build
+++ b/xpcom/glue/staticruntime/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 include('../objs.mozbuild')
 
 SOURCES += xpcom_gluens_src_cppsrcs
diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build
index 506f0bb80aab..c8f1dbbe3d8c 100644
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom_glue_gtest'
-
 SOURCES += [
     'TestFileUtils.cpp',
 ]
diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build
index 2bc0e447fce6..8ca27c90442c 100644
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -65,8 +65,6 @@ else:
 
 XPIDL_MODULE = 'xpcom_io'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'nsAnonymousTemporaryFile.h',
     'nsAppDirectoryServiceDefs.h',
diff --git a/xpcom/moz.build b/xpcom/moz.build
index 414f467fbf12..96a9bd86276e 100644
--- a/xpcom/moz.build
+++ b/xpcom/moz.build
@@ -41,8 +41,6 @@ TEST_TOOL_DIRS += [
 if CONFIG['DEHYDRA_PATH']:
     DIRS += ['analysis']
 
-MODULE = 'xpcom'
-
 CONFIGURE_DEFINE_FILES += [
     'xpcom-config.h',
     'xpcom-private.h',
diff --git a/xpcom/reflect/moz.build b/xpcom/reflect/moz.build
index b9db7b69541d..23c0a07d1ab7 100644
--- a/xpcom/reflect/moz.build
+++ b/xpcom/reflect/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['xptinfo', 'xptcall']
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/reflect/xptcall/moz.build b/xpcom/reflect/xptcall/moz.build
index af97c6aac266..76218104c014 100644
--- a/xpcom/reflect/xptcall/moz.build
+++ b/xpcom/reflect/xptcall/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/reflect/xptcall/public/moz.build b/xpcom/reflect/xptcall/public/moz.build
index 49da5831e93d..e991c5189184 100644
--- a/xpcom/reflect/xptcall/public/moz.build
+++ b/xpcom/reflect/xptcall/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'xptcall.h',
     'xptcstubsdecl.inc',
diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build
index b4f8bc6b73b7..ea70a8646934 100644
--- a/xpcom/reflect/xptcall/src/md/os2/moz.build
+++ b/xpcom/reflect/xptcall/src/md/os2/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SOURCES += [
     '../unix/xptcinvoke_gcc_x86_unix.cpp',
     'xptcstubs_gcc_x86_os2.cpp',
diff --git a/xpcom/reflect/xptcall/src/md/test/moz.build b/xpcom/reflect/xptcall/src/md/test/moz.build
index f821ae53232d..363100af8476 100644
--- a/xpcom/reflect/xptcall/src/md/test/moz.build
+++ b/xpcom/reflect/xptcall/src/md/test/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SOURCES += [
     'stub_test.cpp',
 ]
diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
index a222eb4138c4..a5493918f759 100644
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 if CONFIG['OS_ARCH'] == 'Darwin':
     SOURCES += [
         'xptcinvoke_darwin.cpp',
diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build
index 02158a1b8d6d..795f970cbe33 100644
--- a/xpcom/reflect/xptcall/src/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/src/md/win32/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 if CONFIG['TARGET_CPU'] == 'x86_64':
     if CONFIG['GNU_CXX']:
         SOURCES += [
diff --git a/xpcom/reflect/xptcall/src/moz.build b/xpcom/reflect/xptcall/src/moz.build
index 0faf91bb44c9..acb419452552 100644
--- a/xpcom/reflect/xptcall/src/moz.build
+++ b/xpcom/reflect/xptcall/src/moz.build
@@ -6,8 +6,6 @@
 
 DIRS += ['md']
 
-MODULE = 'xpcom'
-
 SOURCES += [
     'xptcall.cpp',
 ]
diff --git a/xpcom/reflect/xptcall/tests/moz.build b/xpcom/reflect/xptcall/tests/moz.build
index 84dc5db8c083..1dcd31fd0d52 100644
--- a/xpcom/reflect/xptcall/tests/moz.build
+++ b/xpcom/reflect/xptcall/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'TestXPTC'
-
 SIMPLE_PROGRAMS = [
     'TestXPTCInvoke',
 ]
diff --git a/xpcom/reflect/xptinfo/moz.build b/xpcom/reflect/xptinfo/moz.build
index af97c6aac266..76218104c014 100644
--- a/xpcom/reflect/xptinfo/moz.build
+++ b/xpcom/reflect/xptinfo/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/reflect/xptinfo/public/moz.build b/xpcom/reflect/xptinfo/public/moz.build
index 0d4c710f4175..f4b1d1d831bf 100644
--- a/xpcom/reflect/xptinfo/public/moz.build
+++ b/xpcom/reflect/xptinfo/public/moz.build
@@ -11,8 +11,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xpcom_xpti'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'xptinfo.h',
 ]
diff --git a/xpcom/reflect/xptinfo/src/moz.build b/xpcom/reflect/xptinfo/src/moz.build
index 90232552d15b..aca2dced3716 100644
--- a/xpcom/reflect/xptinfo/src/moz.build
+++ b/xpcom/reflect/xptinfo/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SOURCES += [
     'xptiInterfaceInfo.cpp',
     'xptiInterfaceInfoManager.cpp',
diff --git a/xpcom/reflect/xptinfo/tests/moz.build b/xpcom/reflect/xptinfo/tests/moz.build
index af5fb7972201..71dfdb1ca855 100644
--- a/xpcom/reflect/xptinfo/tests/moz.build
+++ b/xpcom/reflect/xptinfo/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SOURCES += [
     'TestInterfaceInfo.cpp',
 ]
diff --git a/xpcom/sample/program/moz.build b/xpcom/sample/program/moz.build
index 98de26cf74d8..05081e6626f6 100644
--- a/xpcom/sample/program/moz.build
+++ b/xpcom/sample/program/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcomsample'
-
 # We must specify CPP_SOURCES in order to link using the proper c++ linker
 # on certain platforms.
 SOURCES += [
diff --git a/xpcom/string/moz.build b/xpcom/string/moz.build
index 3d03ceb0fd46..76218104c014 100644
--- a/xpcom/string/moz.build
+++ b/xpcom/string/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'string'
-
diff --git a/xpcom/string/public/moz.build b/xpcom/string/public/moz.build
index fead460d88e5..d998d9b63f95 100644
--- a/xpcom/string/public/moz.build
+++ b/xpcom/string/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'string'
-
 EXPORTS += [
     'nsAlgorithm.h',
     'nsAString.h',
diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build
index 5f05efd7a799..2192f21bc1b3 100644
--- a/xpcom/string/src/moz.build
+++ b/xpcom/string/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'string'
-
 SOURCES += [
     'nsDependentString.cpp',
     'nsDependentSubstring.cpp',
diff --git a/xpcom/system/moz.build b/xpcom/system/moz.build
index db99c872fdf8..c41f2c180450 100644
--- a/xpcom/system/moz.build
+++ b/xpcom/system/moz.build
@@ -24,5 +24,3 @@ if CONFIG['MOZ_CRASHREPORTER']:
 
 XPIDL_MODULE = 'xpcom_system'
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/tests/external/moz.build b/xpcom/tests/external/moz.build
index 1a71ae5b1159..75fc790f83fe 100644
--- a/xpcom/tests/external/moz.build
+++ b/xpcom/tests/external/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SIMPLE_PROGRAMS = [
     'TestMinStringAPI',
 ]
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index 20a89929d606..5b872d4505b5 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -52,8 +52,6 @@ SOURCES += [
     '%s.cpp' % s for s in sorted(SIMPLE_PROGRAMS)
 ]
 
-MODULE = 'xpcom'
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
diff --git a/xpcom/tests/windows/moz.build b/xpcom/tests/windows/moz.build
index 87d42ffaab2c..745d1173a965 100644
--- a/xpcom/tests/windows/moz.build
+++ b/xpcom/tests/windows/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 CPP_UNIT_TESTS += [
     'TestCOM.cpp',
 ]
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index 1aef99e1df99..09fcb9b81225 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -20,8 +20,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xpcom_threads'
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'nsEventQueue.h',
     'nsMemoryPressure.h',
diff --git a/xpcom/typelib/moz.build b/xpcom/typelib/moz.build
index d4e3b9323f43..91524c15864b 100644
--- a/xpcom/typelib/moz.build
+++ b/xpcom/typelib/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['xpt']
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/typelib/xpt/moz.build b/xpcom/typelib/xpt/moz.build
index bee9664cc529..840f042ae737 100644
--- a/xpcom/typelib/xpt/moz.build
+++ b/xpcom/typelib/xpt/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src', 'tools']
 
-MODULE = 'xpcom'
-
diff --git a/xpcom/typelib/xpt/public/moz.build b/xpcom/typelib/xpt/public/moz.build
index ccc0fa74296f..9be41c5a0873 100644
--- a/xpcom/typelib/xpt/public/moz.build
+++ b/xpcom/typelib/xpt/public/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 EXPORTS += [
     'xpt_arena.h',
     'xpt_struct.h',
diff --git a/xpcom/typelib/xpt/src/moz.build b/xpcom/typelib/xpt/src/moz.build
index 76b047fed318..a4f0ae0fbc8b 100644
--- a/xpcom/typelib/xpt/src/moz.build
+++ b/xpcom/typelib/xpt/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 LIBRARY_NAME = 'xpt'
 
 SOURCES += [
diff --git a/xpcom/typelib/xpt/tests/moz.build b/xpcom/typelib/xpt/tests/moz.build
index e9aabf7c33a5..3c51947ce24a 100644
--- a/xpcom/typelib/xpt/tests/moz.build
+++ b/xpcom/typelib/xpt/tests/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
 SIMPLE_PROGRAMS = [
     'PrimitiveTest',
     'SimpleTypeLib',
diff --git a/xpcom/typelib/xpt/tools/moz.build b/xpcom/typelib/xpt/tools/moz.build
index 6834f25b09ea..895d11993cfb 100644
--- a/xpcom/typelib/xpt/tools/moz.build
+++ b/xpcom/typelib/xpt/tools/moz.build
@@ -4,5 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xpcom'
-
diff --git a/xpfe/appshell/moz.build b/xpfe/appshell/moz.build
index c790725f44b0..76218104c014 100644
--- a/xpfe/appshell/moz.build
+++ b/xpfe/appshell/moz.build
@@ -6,5 +6,3 @@
 
 DIRS += ['public', 'src']
 
-MODULE = 'appshell'
-
diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build
index ea8459abda4d..aa97d79f8fa1 100644
--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@@ -6,8 +6,6 @@
 
 PARALLEL_DIRS += ['test']
 
-MODULE = 'appshell'
-
 SOURCES += [
     'nsAppShellFactory.cpp',
     'nsAppShellService.cpp',
diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build
index 4caf0255a9c6..1f0b46c45709 100644
--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'appcomps'
-
 SOURCES += [
     'nsModule.cpp',
 ]
diff --git a/xpfe/components/directory/moz.build b/xpfe/components/directory/moz.build
index b1c02f405964..7e7e4c072132 100644
--- a/xpfe/components/directory/moz.build
+++ b/xpfe/components/directory/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'directory'
 
-MODULE = 'appcomps'
-
 SOURCES += [
     'nsDirectoryViewer.cpp',
 ]
diff --git a/xpfe/components/moz.build b/xpfe/components/moz.build
index 3f089dcfd783..5af1ec80a632 100644
--- a/xpfe/components/moz.build
+++ b/xpfe/components/moz.build
@@ -10,5 +10,3 @@ DIRS += [
     'build',
 ]
 
-MODULE = 'appcomps'
-
diff --git a/xpfe/components/windowds/moz.build b/xpfe/components/windowds/moz.build
index fea18376a701..24d1f5a8772c 100644
--- a/xpfe/components/windowds/moz.build
+++ b/xpfe/components/windowds/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'windowds'
 
-MODULE = 'appcomps'
-
 SOURCES += [
     'nsWindowDataSource.cpp',
 ]
diff --git a/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build
index 92bd42893425..0957823ce0fb 100644
--- a/xulrunner/examples/simple/components/src/moz.build
+++ b/xulrunner/examples/simple/components/src/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'simple'
-
 SOURCES += [
     'SimpleTest.cpp',
 ]
diff --git a/xulrunner/examples/simple/moz.build b/xulrunner/examples/simple/moz.build
index c4f670dac4c8..e169edea07ae 100644
--- a/xulrunner/examples/simple/moz.build
+++ b/xulrunner/examples/simple/moz.build
@@ -6,6 +6,4 @@
 
 DIRS += ['components']
 
-MODULE = 'simple'
-
 XPI_NAME = 'simple'
diff --git a/xulrunner/setup/moz.build b/xulrunner/setup/moz.build
index 1d373ff9da77..6ff4682e8b04 100644
--- a/xulrunner/setup/moz.build
+++ b/xulrunner/setup/moz.build
@@ -10,8 +10,6 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'xulapp_setup'
 
-MODULE = 'xulrunner'
-
 EXTRA_COMPONENTS += [
     'nsXULAppInstall.manifest',
 ]
diff --git a/xulrunner/stub/moz.build b/xulrunner/stub/moz.build
index 9e28f7978c3e..c1f98b8e04f0 100644
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'xulrunner'
-
 # The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
 # apps to override it using the --with-xulrunner-stub-name=<appname> argument.
 # If this configure argument is not present then the default name is
diff --git a/xulrunner/tools/redit/moz.build b/xulrunner/tools/redit/moz.build
index db4c8760f2e2..00d5f4a9dcbb 100644
--- a/xulrunner/tools/redit/moz.build
+++ b/xulrunner/tools/redit/moz.build
@@ -4,8 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'redit'
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     PROGRAM  = 'redit'
     SOURCES += [