diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 92908c4372d..6f7e41975b0 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -145,10 +145,6 @@ EXTRA_DSO_LDOPTS += \
 	$(NULL)
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORT_OBJS	= 1
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../base/src \
diff --git a/mozilla/modules/libjar/zipstub.h b/mozilla/modules/libjar/zipstub.h
index 73766d2f2a6..1a4df864ce8 100644
--- a/mozilla/modules/libjar/zipstub.h
+++ b/mozilla/modules/libjar/zipstub.h
@@ -60,7 +60,7 @@
 #if defined(XP_MAC)
 #define PR_EXTERN(__type)       extern __declspec(export) __type
 #define PR_PUBLIC_API(__type)   __declspec(export) __type
-#elif defined(XP_PC)
+#elif defined(XP_WIN) || defined(XP_OS2_VACPP)
 #define PR_EXTERN(__type)       extern _declspec(dllexport) __type
 #define PR_PUBLIC_API(__type)   _declspec(dllexport) __type
 #else /* XP_UNIX */