diff --git a/mail/components/build/Makefile.in b/mail/components/build/Makefile.in
index 9cb5e91a26..c1aca9313a 100644
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -62,10 +62,6 @@ endif
 endif
 endif
 
-ifdef MOZ_ENABLE_LIBXUL
-EXPORTS = nsMailComponents.h
-endif
-
 CPPSRCS = nsMailComps.cpp \
           $(NULL)
 
diff --git a/mail/components/build/nsMailComponents.h b/mail/components/build/nsMailComponents.h
deleted file mode 100644
index 31f70d4202..0000000000
--- a/mail/components/build/nsMailComponents.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mail Components.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Mark Banner <bugzilla@standard8.plus.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// When updating this file, please consider if
-// suite/components/nsSuiteComponents.h
-// needs updating to.
-
-#define APP_COMPONENT_MODULES MODULE(xpAutoComplete) MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule) MODULE(nsMailCompsModule) MODULE(nsLDAPProtocolModule)
-
diff --git a/mail/confvars.sh b/mail/confvars.sh
index efec3c8b6c..eb1a9fde95 100755
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -51,9 +51,9 @@ MOZ_COMPOSER=1
 MOZ_SAFE_BROWSING=1
 MOZ_MORK=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
-MOZ_APP_COMPONENT_LIBS="mail msgsmime import xpautocomplete mailcomps $LDAP_COMPONENT"
+MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT"
+MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE"
 MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
-MOZ_APP_COMPONENT_INCLUDE=nsMailComponents.h
 
 # Needed for the mozilla-central build side of the system.
 # Can be dropped/altered when we sort out our equivalent of