--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -38,20 +38,16 @@
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
-PACKAGE_VARS += \
-		MOZ_MOVEMAIL \
-		MOZ_STATIC_MAIL_BUILD \
-		$(NULL)
 
 DIRS		= base db/msgdb news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 DIRS		+= mapi
 endif
 endif

--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@@ -39,17 +39,15 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 
-PACKAGE_VARS += MOZ_STATIC_MAIL_BUILD
-
 DIRS		= public src resources
 
 ifndef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -39,18 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 
-PACKAGE_VARS = MOZ_STATIC_MAIL_BUILD
-
 DIRS		= src
 
 ifndef MOZ_STATIC_MAIL_BUILD
 DIRS += build
 endif
 
 include $(topsrcdir)/config/rules.mk