--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef A11Y_LOG
   DEFINES += -DA11Y_LOG

--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -40,8 +40,10 @@ LOCAL_INCLUDES += [
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
 
+EXPORT_LIBRARY = True
+

--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -1,11 +1,10 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifneq ($(A11Y_LOG),0)
   DEFINES += -DA11Y_LOG
 endif

--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -54,8 +54,10 @@ LOCAL_INCLUDES += [
     '../../xul',
     '../ia2',
     '../sdn',
     '../uia',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
 
+EXPORT_LIBRARY = True
+

--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -1,12 +1,10 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
 include $(topsrcdir)/config/rules.mk
 

--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -20,8 +20,10 @@ LOCAL_INCLUDES += [
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
 
+EXPORT_LIBRARY = True
+

--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -3,13 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += \
   $(srcdir)/ipc \
   $(NULL)
 
-EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -47,8 +47,10 @@ IPDL_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkconwebspeechsynth_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -7,11 +7,10 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domaudiochannel_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY   = 1
-
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
 webidl_base = $(topsrcdir)/dom/webidl
 # Generated by moz.build
 include webidlsrcs.mk
 
 binding_include_path := mozilla/dom

--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -35,8 +35,10 @@ EXPORTS.mozilla.dom += [
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'dombindings_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../../content/base/src \
 	-I$(srcdir)/../../content/events/src \
 	-I$(srcdir)/../../docshell/base \
 	-I$(topsrcdir)/chrome/src \

--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -72,8 +72,10 @@ IPDL_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/media/bridge/Makefile.in
+++ b/dom/media/bridge/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/mtransport \
   -I$(topsrcdir)/media/webrtc/signaling/include \
   -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
   -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
   -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
   -I$(topsrcdir)/media/webrtc/signaling/src/media-conduit \
   -I$(topsrcdir)/media/webrtc/signaling/src/common/time_profiling \

--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -13,8 +13,10 @@ MODULE = 'peerconnection'
 CPP_SOURCES += [
     'MediaModule.cpp',
 ]
 
 LIBRARY_NAME = 'peerconnection'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 	LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 

--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
   -I$(topsrcdir)/widget/xpwidgets \
   -I$(topsrcdir)/dom/plugins/base \
   -I$(topsrcdir)/dom/plugins/base/android/include \
   -I$(topsrcdir)/gfx/gl \
   $(MOZ_CAIRO_CFLAGS) \
   $(MOZ_PIXMAN_CFLAGS) \

--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -26,8 +26,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkpluginandroid_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -96,8 +96,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'andr
     FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkplugin'
 
+EXPORT_LIBRARY = True
+

--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 ifeq (WINNT,$(OS_ARCH))
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
 endif
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \

--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -106,8 +106,10 @@ IPDL_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domplugins_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -7,12 +7,10 @@ DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/bindings \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -1,11 +1,10 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
                      $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemandroid_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -1,10 +1,9 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -9,8 +9,10 @@ MODULE = 'dom'
 CMMSRCS += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemmac_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -50,8 +50,10 @@ if CONFIG['OS_TARGET'] != 'Android' or C
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystem_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 ifdef MOZ_ENABLE_QTMOBILITY
 LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
                    -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -13,8 +13,10 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemunix_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -1,8 +1,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/.
 
-EXPORT_LIBRARY = 1
-
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src

--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domsystemwindows_s'
 
+EXPORT_LIBRARY = True
+

--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -1,7 +1,5 @@
 # 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/.
 
-EXPORT_LIBRARY   = 1
-
 include $(topsrcdir)/dom/dom-config.mk

--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -28,8 +28,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'WifiProxyService.cpp',
         'WifiUtils.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'domwifi_s'
 
+EXPORT_LIBRARY = True
+

--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
 	$(srcdir)/res/table-add-column-after-active.gif \
 	$(srcdir)/res/table-add-column-after-hover.gif \
 	$(srcdir)/res/table-add-column-after.gif \

--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'composer'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -1,6 +1,5 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1

--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'txmgr'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -1,14 +1,13 @@
 # 
 # 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/.
 
-EXPORT_LIBRARY	= 1
 SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)			\

--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'webbrwsr'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
 	../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
 	../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
 	../webbrowserpersist/src/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	../commandhandler/src/$(LIB_PREFIX)commandhandler_s.$(LIB_SUFFIX) \
 	$(NULL)
 

--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'embedcomponents'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -1,9 +1,8 @@
 # vim:set ts=8 sw=8 sts=8 noet:
 # 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/.
 
-EXPORT_LIBRARY	= 1
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
 endif

--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -21,8 +21,10 @@ else:
     CPP_SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
 LIBRARY_NAME = 'auth'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -1,8 +1,7 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
 ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'cookie'
 
+EXPORT_LIBRARY = True
+

--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -1,7 +1,6 @@
 # vim:set ts=8 sw=8 sts=8 noet:
 # 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/.
 
-EXPORT_LIBRARY	= 1
 LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)

--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'nkgio'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY	= 1

--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
 LIBRARY_NAME = 'permissions'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY   = 1
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), windows)

--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsJSConfigTriggers.cpp',
     'nsReadConfig.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'autoconfig'
 
+EXPORT_LIBRARY = True
+

--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../hunspell/src \
 	-I$(topsrcdir)/content/base/src \
 	-I$(topsrcdir)/editor/libeditor/base \

--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
 ]
 
 LIBRARY_NAME = 'spellchecker'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -1,11 +1,10 @@
 #
 # 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/.
 
-EXPORT_LIBRARY	= 1
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
 		../base/$(LIB_PREFIX)universalchardet_s.$(LIB_SUFFIX) \
 		$(NULL)

--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -1,17 +1,15 @@
 #
 # 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/.
 
 VPATH		=  $(srcdir) $(srcdir)/unittest
 
-EXPORT_LIBRARY	= 1
-
 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
 DEFINES += -DMOZ_ENABLE_FREETYPE
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0

--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -104,8 +104,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gfx2d'
 
+EXPORT_LIBRARY = True
+

--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY   = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_WEBGL
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 LOCAL_INCLUDES = -I$(topsrcdir)/widget/gonk

--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -112,8 +112,10 @@ CPP_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gl'
 
+EXPORT_LIBRARY = True
+

--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -1,11 +1,9 @@
 #
 # 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/.
 
-EXPORT_LIBRARY     = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)

--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -27,8 +27,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 CPP_SOURCES += [
     'SharedDIB.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gfxipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -1,15 +1,13 @@
 # 
 # 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/.
 
-EXPORT_LIBRARY  = 1
-
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/include/core \
 	-I$(srcdir)/include/config \
 	-I$(srcdir)/include/gpu \
 	-I$(srcdir)/include/pipe \
 	-I$(srcdir)/include/ports \

--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -548,8 +548,10 @@ if not CONFIG['INTEL_ARCHITECTURE'] and 
     ]
 
 LIBRARY_NAME = 'skia'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 

--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -62,8 +62,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'gkgfx'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -2,18 +2,16 @@
 # 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/.
 
 VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) 
 
 # Create a GTest library
-EXPORT_LIBRARY = 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/gfx/layers \
   -I$(topsrcdir)/gfx/2d \
   -I$(topsrcdir)/gfx/2d/unittest \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -31,8 +31,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'wind
         'TestMoz2D.cpp',
         'TestRect.cpp',
         'TestPoint.cpp',
         'TestScaling.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY	= 1
-
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/content/xml/document/src \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
 DEFINES += -DMOZ_ENABLE_FREETYPE
 endif
 

--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -273,8 +273,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'thebes'
 
+EXPORT_LIBRARY = True
+

--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -1,10 +1,8 @@
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 # These files use MMX and SSE2 intrinsics, so they need special compile flags
 # on some compilers.
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
 yuv_convert_mmx.$(OBJ_SUFFIX): CXXFLAGS += -mmmx
 yuv_convert_sse2.$(OBJ_SUFFIX): CXXFLAGS += -msse2

--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -68,8 +68,10 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI
     CPP_SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
 LIBRARY_NAME = 'ycbcr'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)
 
 ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
 

--- a/hal/moz.build
+++ b/hal/moz.build
@@ -151,8 +151,10 @@ IPDL_SOURCES = [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'hal_s'
 
+EXPORT_LIBRARY = True
+

--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../src \
 		-I$(srcdir)/../encoders/ico \
 		-I$(srcdir)/../encoders/png \
 		-I$(srcdir)/../encoders/jpeg \
 		-I$(srcdir)/../encoders/bmp \
 		$(NULL)

--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'imglib2'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 ifdef MOZ_WIDGET_GTK
 PLATFORM = gtk
 endif
 
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 PLATFORM = qt
 endif
 

--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'imgicon'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 # see also intl/locale/src/Makefile.in
 ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT)))
 LOCALE_DIR		= $(MOZ_WIDGET_TOOLKIT)
 else
 ifeq ($(OS_ARCH), Darwin)
 LOCALE_DIR		= mac
 else
 LOCALE_DIR		= unix

--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'i18n'
 CPP_SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 LIBRARY_NAME = 'i18n'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -1,6 +1,5 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1

--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
 LIBRARY_NAME = 'chardet'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 nsOS2Charset.$(OBJ_SUFFIX): os2charset.properties.h
 
 os2charset.properties.h: $(srcdir)/../props2arrays.py os2charset.properties
 	$(PYTHON) $^ $@

--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -1,14 +1,13 @@
 # vim:set noet ts=8:
 # 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/.
 
-EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
 		  -I$(srcdir)/../ucvibm \
 		  -I$(srcdir)/../ucvja \
 		  -I$(srcdir)/../ucvtw2 \
 		  -I$(srcdir)/../ucvtw \
 		  -I$(srcdir)/../ucvko \
 		  -I$(srcdir)/../ucvcn \

--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -30,8 +30,10 @@ if CONFIG['INTEL_ARCHITECTURE']:
     ]
 
 LIBRARY_NAME = 'uconv'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -1,6 +1,5 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1

--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@@ -20,8 +20,10 @@ LIBXUL_LIBRARY = True
 CSRCS += [
     'ugen.c',
     'umap.c',
     'uscan.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -3,17 +3,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This makefile builds the version of unicharutils_s static library which uses
 # internal linkage. Components that use frozen (external) linkage should use
 # unicharutil_external_s.
 
 DIST_INSTALL = 1
-EXPORT_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
 LOCAL_INCLUDES	+= -I$(srcdir)/.. \
   -I$(srcdir)/../../src
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'unicharutil'
 
 include('../objs.mozbuild')
 
 CPP_SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -1,16 +1,14 @@
 # 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/.
 
 OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
 
-EXPORT_LIBRARY = 1
-
 ACDEFINES =
 
 ifndef MOZ_NATIVE_LIBEVENT # {
 vpath %.c \
   $(srcdir)/src/third_party/libevent \
   $(NULL)
 else # } else {
 # message_pump_libevent.cc includes third_party/libevent/event.h,

--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -233,8 +233,10 @@ if ost.find('86') == -1 and ost.find('ar
     CPP_SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'chromium_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 ifdef MOZ_ENABLE_DBUS
 	LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef MOZ_ENABLE_DBUS

--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'DBusUtils.cpp',
     'RawDBusConnection.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozdbus_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -1,13 +1,11 @@
 # 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/.
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
 
-EXPORT_LIBRARY = 1
-
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
 DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -99,8 +99,10 @@ IPDL_SOURCES = [
     'ProtocolTypes.ipdlh',
     'URIParams.ipdlh',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -1,17 +1,15 @@
 # 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/.
 
 GARBAGE_DIRS += _ipdlheaders
 GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc)
 
-EXPORT_LIBRARY = 1
-
 # This file is generated by the moz.build backend.
 include ipdlsrcs.mk
 
 GARBAGE += $(CPPSRCS)
 
 LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
 
 

--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -8,8 +8,10 @@ if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
 MODULE = 'ipdlgen'
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozipdlgen_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 IPDLTESTS = \
   TestActorPunning \
   TestBridgeMain \
   TestCrashCleanup \
   TestDataStructures \
   TestDesc \
   TestFailedCtor \
   TestHangs \

--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -79,8 +79,10 @@ IPDL_SOURCES += [
     'PTestSyncHang.ipdl',
     'PTestSyncWakeup.ipdl',
     'PTestSysVShmem.ipdl',
     'PTestUrgency.ipdl',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -1,8 +1,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/.
 
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla.ipc += [
 CPP_SOURCES += [
     'Netd.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'moznetd_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -1,8 +1,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/.
 
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -11,8 +11,10 @@ if CONFIG['MOZ_B2G_NFC']:
     CPP_SOURCES += [
         'Nfc.cpp',
     ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'moznfc_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -1,8 +1,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/.
 
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla.ipc += [
 CPP_SOURCES += [
     'Ril.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozril_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/xpconnect/src \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -28,8 +28,10 @@ IPDL_SOURCES = [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'ipcshell_s'
 
+EXPORT_LIBRARY = True
+

--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -1,7 +1,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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mozipcunixsocket_s'
 
+EXPORT_LIBRARY = True
+

--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -1,10 +1,8 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)

--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'jsdebugger'
 
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/js/ipc \
   -I$(topsrcdir)/js/public \
   -I$(topsrcdir)/js/xpconnect/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -18,8 +18,10 @@ IPDL_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'jsipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -1,19 +1,15 @@
 #!gmake
 #
 # 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/.
 
 
 
-EXPORT_LIBRARY = 1
-
-# REQUIRES	= java js
-
 ifdef JS_THREADSAFE
 DEFINES         += -DJS_THREADSAFE
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DEXPORT_JSD_API

--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
     'jsdebug.cpp',
     'jshash.cpp',
 ]
 
 LIBRARY_NAME = 'jsd'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -3,17 +3,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Solaris sh blows
 ifeq ($(OS_ARCH),SunOS)
 SHELL := ksh
 endif
 
-EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 	../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
 	../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
 	../generic/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \
 	../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) \
 	../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
 	../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
 	../xul/base/src/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -21,8 +21,10 @@ CPP_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gklayout'
 
+EXPORT_LIBRARY = True
+

--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/layout/base \
 		-I$(topsrcdir)/layout/generic \
 		-I$(topsrcdir)/layout/xul/base/src \

--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -22,8 +22,10 @@ IPDL_SOURCES = [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'gkipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -1,12 +1,11 @@
 #
 # 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/.
 
-EXPORT_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
 libs::
 
 clobber::
 				rm -f $(DIST)\lib\library

--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'gkdebug'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@@ -1,12 +1,10 @@
 # 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/.
 
-EXPORT_LIBRARY  = 1
-
 ifdef MOZ_ANDROID_HISTORY
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/docshell/base \
 	-I$(topsrcdir)/content/base/src \
 	$(NULL)
 endif

--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -23,8 +23,10 @@ if CONFIG['MOZ_ANDROID_HISTORY']:
     CPP_SOURCES += [
         'nsAndroidHistory.cpp',
     ]
 
 LIBRARY_NAME = 'browsercomps'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -1,8 +1,7 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -36,8 +36,10 @@ CPP_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY        = 1

--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'zipwriter'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
            $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 GARBAGE		+= $(addprefix $(DIST)/bin/defaults/pref/, \

--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
 ]
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'pref'
 
+EXPORT_LIBRARY = True
+

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
   ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
   ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
   ../socket/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
   ../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
   ../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
   ../mime/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
   ../cache/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \

--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'necko'
 
+EXPORT_LIBRARY = True
+

--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES +=                  \
   -I$(srcdir)/../protocol/http \
   -I$(srcdir)/../base/src          \
   -I$(topsrcdir)/modules/libjar    \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -38,8 +38,10 @@ IPDL_SOURCES = [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'neckoipc_s'
 
+EXPORT_LIBRARY = True
+

--- a/other-licenses/skia-npapi/Makefile.in
+++ b/other-licenses/skia-npapi/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY   = 1
-
 DEFINES += \
   -DSK_BUILD_FOR_ANDROID_NDK \
   $(NULL)
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/plugins/base \
   -I$(topsrcdir)/dom/plugins/base/android \
   -I$(topsrcdir)/gfx/skia/include/core \

--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'ANPTypeface.cpp',
     'SkANP.cpp',
 ]
 
 LIBRARY_NAME = 'skia_npapi'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -2,9 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 VPATH = \
   @srcdir@ \
   $(topsrcdir)/other-licenses/snappy/src
   $(NULL)
 
-EXPORT_LIBRARY = 1

--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'src/snappy-stubs-internal.cc',
     'src/snappy.cc',
 ]
 
 LIBRARY_NAME = 'snappy_s'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -1,8 +1,7 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
 		$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
 		$(NULL)

--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -21,8 +21,10 @@ CPP_SOURCES += [
     'nsScanner.cpp',
     'nsScannerString.cpp',
 ]
 
 LIBRARY_NAME = 'htmlpars'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY  = 1
 SHARED_LIBRARY_LIBS = \
 		../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
 		../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \

--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsRDFModule.cpp',
 ]
 
 LIBRARY_NAME = 'rdf'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -1,12 +1,10 @@
 # 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/.
 
-EXPORT_LIBRARY	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
 

--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'pipboot'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+EXPORT_LIBRARY = True
+

--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -1,10 +1,9 @@
 #! gmake
 # 
 # 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/.
 
-EXPORT_LIBRARY	= 1
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)

--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'pippki'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -1,12 +1,11 @@
 #! gmake
 # 
 # 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/.
 
-EXPORT_LIBRARY	= 1
 DEFINES += \
   -DNSS_ENABLE_ECC \
   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
   $(NULL)

--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -86,8 +86,10 @@ if CONFIG['MOZ_XUL']:
 LIBRARY_NAME = 'pipnss'
 
 CSRCS += [
     'md4.c',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/security/sandbox/Makefile.in
+++ b/security/sandbox/Makefile.in
@@ -1,9 +1,8 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla += [
 CPP_SOURCES += [
     'Sandbox.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'sandbox_s'
 
+EXPORT_LIBRARY = True
+

--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -1,6 +1,5 @@
 # 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/.
 
-EXPORT_LIBRARY := 1
 MOZILLA_INTERNAL_API := 1

--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'services-crypto'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/startupcache/Makefile.in
+++ b/startupcache/Makefile.in
@@ -1,6 +1,5 @@
 # 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/.
 
 
-EXPORT_LIBRARY = 1

--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
     'StartupCacheModule.cpp',
     'StartupCacheUtils.cpp',
 ]
 
 LIBRARY_NAME = 'startupcache'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/storage/build/Makefile.in
+++ b/storage/build/Makefile.in
@@ -1,13 +1,12 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES = \
 	$(SQLITE_CFLAGS) \
 	-I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
 	../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
 	$(NULL)

--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'mozStorageModule.cpp',
 ]
 
 LIBRARY_NAME = 'storagecomps'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/testing/gtest/Makefile.in
+++ b/testing/gtest/Makefile.in
@@ -7,17 +7,16 @@
 
 VPATH = \
   $(srcdir) \
   $(srcdir)/gtest/src \
   $(srcdir)/mozilla \
   $(srcdir)/gmock/src \
   $(NULL)
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/gtest \
   -I$(srcdir)/gtest/include \
   -I$(srcdir)/gmock \
   -I$(srcdir)/gmock/include \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@@ -62,8 +62,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'gtest'
 
 GTEST_CPP_SOURCES += [
     'SanityTest.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY = 1

--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'tkautocomplete'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES = \
   -I$(srcdir)/../alerts \
   -I$(srcdir)/../downloads \
   -I$(srcdir)/../feeds \
   -I$(srcdir)/../find \
   -I$(srcdir)/../intl \
   -I$(srcdir)/../jsdownloads/src \
   -I$(srcdir)/../protobuf \

--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsToolkitCompsModule.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'toolkitcomps'
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY = 1

--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -20,8 +20,10 @@ MODULE = 'toolkitcomps'
 CPP_SOURCES += [
     'nsCommandLine.cpp',
 ]
 
 LIBRARY_NAME = 'commandlines'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/ctypes/Makefile.in
+++ b/toolkit/components/ctypes/Makefile.in
@@ -1,9 +1,7 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)

--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'jsctypes'
 
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/diskspacewatcher/Makefile.in
+++ b/toolkit/components/diskspacewatcher/Makefile.in
@@ -1,7 +1,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/.
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -18,8 +18,10 @@ MODULE = 'toolkitcomps'
 CPP_SOURCES = [
     'DiskSpaceWatcher.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'diskspacewatcher'
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY = 1

--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
 CSRCS += [
     'mp3sniff.c',
 ]
 
 LIBXUL_LIBRARY = True
 
 LIBRARY_NAME = 'mediasniffer'
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -1,13 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
 ifdef ENABLE_TESTS
 MOCHITEST_CHROME_FILES = \
     test_pm.xul \
     $(NULL)

--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -15,8 +15,10 @@ LIBRARY_NAME = 'jsperf'
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/reflect/Makefile.in
+++ b/toolkit/components/reflect/Makefile.in
@@ -1,10 +1,8 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)

--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'jsreflect'
 
 EXTRA_JS_MODULES += [
     'reflect.jsm',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/remote/Makefile.in
+++ b/toolkit/components/remote/Makefile.in
@@ -1,10 +1,8 @@
 # 
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)

--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@@ -24,8 +24,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
     CPP_SOURCES += [
         'nsQtRemoteService.cpp',
     ]
 
 LIBRARY_NAME = 'remoteservice'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -1,9 +1,7 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(NULL)

--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -37,8 +37,10 @@ EXTRA_JS_MODULES += [
 ]
 
 EXTRA_PP_JS_MODULES += [
     'FormHistory.jsm',
 ]
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -1,17 +1,16 @@
 #
 # 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/.
 
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
-EXPORT_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -39,8 +39,10 @@ EXTRA_JS_MODULES += [
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'telemetry'
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/devtools/server/Makefile.in
+++ b/toolkit/devtools/server/Makefile.in
@@ -1,14 +1,12 @@
 # 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/.
 
-EXPORT_LIBRARY = 1
-
 EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 libs::

--- a/toolkit/devtools/server/moz.build
+++ b/toolkit/devtools/server/moz.build
@@ -15,8 +15,10 @@ MODULE = 'jsinspector'
 CPP_SOURCES += [
     'nsJSInspector.cpp',
 ]
 
 LIBRARY_NAME = 'jsinspector'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY = 1

--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -31,8 +31,10 @@ EXTRA_JS_MODULES += [
     'Sandbox.jsm',
     'jwcrypto.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/system/androidproxy/Makefile.in
+++ b/toolkit/system/androidproxy/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY  = 1

--- a/toolkit/system/androidproxy/moz.build
+++ b/toolkit/system/androidproxy/moz.build
@@ -9,8 +9,10 @@ MODULE = 'androidproxy'
 CPP_SOURCES += [
     'nsAndroidSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'androidproxy'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY  = 1

--- a/toolkit/system/osxproxy/moz.build
+++ b/toolkit/system/osxproxy/moz.build
@@ -9,8 +9,10 @@ MODULE = 'osxproxy'
 CMMSRCS += [
     'nsOSXSystemProxySettings.mm',
 ]
 
 LIBRARY_NAME = 'osxproxy'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/system/unixproxy/Makefile.in
+++ b/toolkit/system/unixproxy/Makefile.in
@@ -1,8 +1,7 @@
 # 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/.
 
-EXPORT_LIBRARY  = 1
 ifdef MOZ_ENABLE_LIBPROXY
 CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS)
 endif # MOZ_ENABLE_LIBPROXY

--- a/toolkit/system/unixproxy/moz.build
+++ b/toolkit/system/unixproxy/moz.build
@@ -14,8 +14,10 @@ else:
     CPP_SOURCES += [
         'nsUnixSystemProxySettings.cpp',
     ]
 
 LIBRARY_NAME = 'unixproxy'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/toolkit/system/windowsproxy/Makefile.in
+++ b/toolkit/system/windowsproxy/Makefile.in
@@ -1,5 +1,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/.
 
-EXPORT_LIBRARY  = 1

--- a/toolkit/system/windowsproxy/moz.build
+++ b/toolkit/system/windowsproxy/moz.build
@@ -9,8 +9,10 @@ MODULE = 'windowsproxy'
 CPP_SOURCES += [
     'nsWindowsSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'windowsproxy'
 
 LIBXUL_LIBRARY = True
 
+EXPORT_LIBRARY = True
+

--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@@ -1,15 +1,14 @@
 #! gmake
 #
 # 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/.
 
-EXPORT_LIBRARY	= 1
 FORCE_SHARED_LIB = 1
 
 # override optimization
 MOZ_OPTIMIZE_FLAGS = -fno-omit-frame-pointer
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_JPROF_API

--- a/tools/jprof/stub/moz.build
+++ b/tools/jprof/stub/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'libmalloc.cpp',
 ]
 
 LIBRARY_NAME = 'jprof'
 
+EXPORT_LIBRARY = True
+