Bug 290526 Drop recursive private_exports r=rrelyea

Copying private headers is now simply included in the exports
target, as these headers use an extra directory anyway.

Differential Revision: https://phabricator.services.mozilla.com/D69021

67 files changed, 5 insertions, 165 deletions

diff --git a/cmd/bltest/manifest.mn b/cmd/bltest/manifest.mn
index 6e9946c34..8b05116e5 100644
--- a/cmd/bltest/manifest.mn
+++ b/cmd/bltest/manifest.mn
@@ -12,13 +12,7 @@ INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 PROGRAM = bltest
 
- USE_STATIC_LIBS = 1
-
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
+USE_STATIC_LIBS = 1
 
 CSRCS = \
 	blapitest.c \
diff --git a/cmd/chktest/manifest.mn b/cmd/chktest/manifest.mn
index 50b1ca1eb..e74e1d73d 100644
--- a/cmd/chktest/manifest.mn
+++ b/cmd/chktest/manifest.mn
@@ -13,13 +13,7 @@ REQUIRES = seccmd dbm
 
 PROGRAM = chktest
 
- USE_STATIC_LIBS = 1
-
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
+USE_STATIC_LIBS = 1
 
 CSRCS = \
 	chktest.c \
diff --git a/cmd/crmf-cgi/manifest.mn b/cmd/crmf-cgi/manifest.mn
index 1212424b6..04d2d8d35 100644
--- a/cmd/crmf-cgi/manifest.mn
+++ b/cmd/crmf-cgi/manifest.mn
@@ -6,14 +6,10 @@
 CORE_DEPTH = ../..
 MODULE	= sectools
 
-EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	crmfcgi.c \
 	$(NULL)
 
-
 REQUIRES = nss dbm seccmd
 
 ifdef ATTACH_CGI
diff --git a/cmd/crmftest/manifest.mn b/cmd/crmftest/manifest.mn
index 578729e62..4ac669a21 100644
--- a/cmd/crmftest/manifest.mn
+++ b/cmd/crmftest/manifest.mn
@@ -9,14 +9,10 @@ DEPTH      = .
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE	= nss
 
-EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	testcrmf.c \
 	$(NULL)
 
-
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 # REQUIRES = dbm
diff --git a/cmd/fipstest/manifest.mn b/cmd/fipstest/manifest.mn
index 1cebd7976..6e93f4ba4 100644
--- a/cmd/fipstest/manifest.mn
+++ b/cmd/fipstest/manifest.mn
@@ -11,12 +11,6 @@ PROGRAM = fipstest
 
 USE_STATIC_LIBS = 1
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	fipstest.c \
 	$(NULL)
diff --git a/cmd/lib/Makefile b/cmd/lib/Makefile
index 6b53451ef..94cfb1d7b 100644
--- a/cmd/lib/Makefile
+++ b/cmd/lib/Makefile
@@ -45,6 +45,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
diff --git a/cmd/libpkix/testutil/Makefile b/cmd/libpkix/testutil/Makefile
index 859aedd7d..cc9d23593 100755
--- a/cmd/libpkix/testutil/Makefile
+++ b/cmd/libpkix/testutil/Makefile
@@ -47,5 +47,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 include $(PLAT_DEPTH)/platrules.mk
 
-export:: private_export
 
diff --git a/cmd/lowhashtest/manifest.mn b/cmd/lowhashtest/manifest.mn
index db10daada..00659ee11 100644
--- a/cmd/lowhashtest/manifest.mn
+++ b/cmd/lowhashtest/manifest.mn
@@ -12,12 +12,6 @@ INCLUDES += -I$(CORE_DEPTH)/nss/lib/freebl
 
 PROGRAM = lowhashtest
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	lowhashtest.c \
 	$(NULL)
diff --git a/cmd/modutil/manifest.mn b/cmd/modutil/manifest.mn
index a92ca68c1..99b5f3f99 100644
--- a/cmd/modutil/manifest.mn
+++ b/cmd/modutil/manifest.mn
@@ -7,8 +7,6 @@ CORE_DEPTH = ../..
 
 MODULE = sectools
 
-EXPORTS = 
-
 CSRCS = modutil.c		\
 		pk11.c			\
 		instsec.c		\
diff --git a/cmd/pk11gcmtest/manifest.mn b/cmd/pk11gcmtest/manifest.mn
index f5bc0ece0..0f7354800 100644
--- a/cmd/pk11gcmtest/manifest.mn
+++ b/cmd/pk11gcmtest/manifest.mn
@@ -9,12 +9,6 @@ MODULE = nss
 
 PROGRAM = pk11gcmtest
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	pk11gcmtest.c \
 	$(NULL)
diff --git a/cmd/pk11mode/manifest.mn b/cmd/pk11mode/manifest.mn
index ed205cded..964fad305 100644
--- a/cmd/pk11mode/manifest.mn
+++ b/cmd/pk11mode/manifest.mn
@@ -7,8 +7,6 @@ CORE_DEPTH = ../..
 
 MODULE = nss
 
-EXPORTS =
-
 CSRCS = pk11mode.c
 
 PROGRAM = pk11mode
diff --git a/cmd/rsapoptst/manifest.mn b/cmd/rsapoptst/manifest.mn
index 18126cffc..ddf561e57 100644
--- a/cmd/rsapoptst/manifest.mn
+++ b/cmd/rsapoptst/manifest.mn
@@ -10,12 +10,6 @@ REQUIRES = seccmd dbm softoken
 
 PROGRAM = rsapoptst
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	rsapoptst.c \
 	$(NULL)
diff --git a/cmd/signtool/manifest.mn b/cmd/signtool/manifest.mn
index d1b9d48c0..c8d3fd39c 100644
--- a/cmd/signtool/manifest.mn
+++ b/cmd/signtool/manifest.mn
@@ -10,8 +10,6 @@ ifdef ZLIB_INCLUDE_DIR
 INCLUDES += -I$(ZLIB_INCLUDE_DIR)
 endif
 
-EXPORTS = 
-
 CSRCS = signtool.c		\
 		certgen.c	\
 		javascript.c	\
diff --git a/cmd/ssltap/manifest.mn b/cmd/ssltap/manifest.mn
index 0c09c17a3..92302a1b8 100644
--- a/cmd/ssltap/manifest.mn
+++ b/cmd/ssltap/manifest.mn
@@ -8,8 +8,6 @@ CORE_DEPTH = ../..
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
-EXPORTS = 
-
 CSRCS = ssltap.c	\
 	$(NULL)
 
diff --git a/coreconf/README b/coreconf/README
index 835c72805..d17e64b50 100644
--- a/coreconf/README
+++ b/coreconf/README
@@ -336,10 +336,6 @@ OVERVIEW of "rules.mk":
 
         clobber_all::           synonym for "realclean::" rule
 
-        private_export::        recursively copy specified
-                                cross-platform header files to the
-                                $(SOURCE_XPPRIVATE_DIR) directory
-
 
         IMPORT
         ------
diff --git a/coreconf/rules.mk b/coreconf/rules.mk
index bbe6a2331..14d951377 100644
--- a/coreconf/rules.mk
+++ b/coreconf/rules.mk
@@ -47,9 +47,9 @@ all::
 	$(MAKE) libs
 
 ifeq ($(AUTOCLEAN),1)
-autobuild:: clean export private_export libs program install
+autobuild:: clean export libs program install
 else
-autobuild:: export private_export libs program install
+autobuild:: export libs program install
 endif
 
 platform::
@@ -99,9 +99,7 @@ ifeq ($(OS_TARGET),Darwin)
 	find $(SOURCE_MD_DIR)/lib -name "*.a" -exec $(RANLIB) {} \;
 endif
 
-export:: $(DIRS)
-
-private_export:: $(DIRS)
+export:: $(DIRS) private_export
 
 release_export:: $(DIRS)
 
diff --git a/cpputil/manifest.mn b/cpputil/manifest.mn
index b3ccad8b5..caa859bf7 100644
--- a/cpputil/manifest.mn
+++ b/cpputil/manifest.mn
@@ -19,6 +19,3 @@ CPPSRCS = \
       tls_parser.cc \
       $(NULL)
 endif
-
-EXPORTS = \
-      $(NULL)
diff --git a/gtests/google_test/manifest.mn b/gtests/google_test/manifest.mn
index 70e33e6cf..565d79c09 100644
--- a/gtests/google_test/manifest.mn
+++ b/gtests/google_test/manifest.mn
@@ -14,10 +14,3 @@ INCLUDES += -Igtest/include/ -Igtest
 CPPSRCS = \
 	gtest/src/gtest-all.cc \
 	$(NULL)
-
-
-EXPORTS = \
-	$(NULL)
-
-
-
diff --git a/gtests/pkcs11testmodule/Makefile b/gtests/pkcs11testmodule/Makefile
index 6635aabc3..ca3ffb0af 100644
--- a/gtests/pkcs11testmodule/Makefile
+++ b/gtests/pkcs11testmodule/Makefile
@@ -42,4 +42,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
diff --git a/lib/base/Makefile b/lib/base/Makefile
index fc78ae92c..ca709f6c0 100644
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -8,4 +8,3 @@ include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-export:: private_export
diff --git a/lib/certdb/Makefile b/lib/certdb/Makefile
index 36524f56a..c3cb5ef8b 100644
--- a/lib/certdb/Makefile
+++ b/lib/certdb/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/certhigh/Makefile b/lib/certhigh/Makefile
index a2f0cf7d5..0f71b1a4b 100644
--- a/lib/certhigh/Makefile
+++ b/lib/certhigh/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/ckfw/Makefile b/lib/ckfw/Makefile
index 75c906a0a..82c9b8bd2 100644
--- a/lib/ckfw/Makefile
+++ b/lib/ckfw/Makefile
@@ -24,7 +24,6 @@ endif
 # nssck.api: ck.api ckapi.perl
 # 	$(PERL) ckapi.perl ck.api
 
-export:: private_export
 
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
diff --git a/lib/crmf/Makefile b/lib/crmf/Makefile
index a774a9566..142bacf82 100644
--- a/lib/crmf/Makefile
+++ b/lib/crmf/Makefile
@@ -46,4 +46,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-export:: private_export
diff --git a/lib/cryptohi/Makefile b/lib/cryptohi/Makefile
index 71ae761e4..c3bb95f00 100644
--- a/lib/cryptohi/Makefile
+++ b/lib/cryptohi/Makefile
@@ -45,5 +45,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-export:: private_export
 
diff --git a/lib/dbm/include/Makefile b/lib/dbm/include/Makefile
index 4c9e4e939..21bb3b39f 100644
--- a/lib/dbm/include/Makefile
+++ b/lib/dbm/include/Makefile
@@ -44,4 +44,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
diff --git a/lib/dev/Makefile b/lib/dev/Makefile
index d88eb2807..b5951dc1d 100644
--- a/lib/dev/Makefile
+++ b/lib/dev/Makefile
@@ -21,4 +21,3 @@ endif
 endif
 endif
 
-export:: private_export
diff --git a/lib/dev/manifest.mn b/lib/dev/manifest.mn
index 45c7509fc..4a5b812dc 100644
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -15,9 +15,6 @@ PRIVATE_EXPORTS = \
 	nssdev.h   \
 	$(NULL)
 
-EXPORTS =	   \
-	$(NULL)
-
 MODULE = nss
 
 CSRCS =		        \
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
index 7aba5a5e4..ebb1d398d 100644
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -586,7 +586,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 rijndael_tables:
 	$(CC) -o $(OBJDIR)/make_rijndael_tab rijndael_tables.c \
diff --git a/lib/libpkix/Makefile b/lib/libpkix/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/Makefile
+++ b/lib/libpkix/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/include/Makefile b/lib/libpkix/include/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/include/Makefile
+++ b/lib/libpkix/include/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/include/manifest.mn b/lib/libpkix/include/manifest.mn
index cc74890cf..3792dbb86 100755
--- a/lib/libpkix/include/manifest.mn
+++ b/lib/libpkix/include/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix.h \
 	pkix_crlsel.h \
diff --git a/lib/libpkix/pkix/Makefile b/lib/libpkix/pkix/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/Makefile
+++ b/lib/libpkix/pkix/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/certsel/Makefile b/lib/libpkix/pkix/certsel/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/certsel/Makefile
+++ b/lib/libpkix/pkix/certsel/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/certsel/manifest.mn b/lib/libpkix/pkix/certsel/manifest.mn
index 525ee09ca..8e28df585 100755
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_certselector.h \
 	pkix_comcertselparams.h \
diff --git a/lib/libpkix/pkix/checker/Makefile b/lib/libpkix/pkix/checker/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/checker/Makefile
+++ b/lib/libpkix/pkix/checker/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/checker/manifest.mn b/lib/libpkix/pkix/checker/manifest.mn
index eba69d0ce..da99416fa 100755
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_basicconstraintschecker.h \
 	pkix_certchainchecker.h \
diff --git a/lib/libpkix/pkix/crlsel/Makefile b/lib/libpkix/pkix/crlsel/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/crlsel/Makefile
+++ b/lib/libpkix/pkix/crlsel/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/crlsel/manifest.mn b/lib/libpkix/pkix/crlsel/manifest.mn
index 8ea0f59c6..0ad81055e 100755
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_comcrlselparams.h \
 	pkix_crlselector.h \
diff --git a/lib/libpkix/pkix/params/Makefile b/lib/libpkix/pkix/params/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/params/Makefile
+++ b/lib/libpkix/pkix/params/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/params/manifest.mn b/lib/libpkix/pkix/params/manifest.mn
index f26e588f5..604f21f54 100755
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_procparams.h \
 	pkix_trustanchor.h \
diff --git a/lib/libpkix/pkix/results/Makefile b/lib/libpkix/pkix/results/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/results/Makefile
+++ b/lib/libpkix/pkix/results/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/results/manifest.mn b/lib/libpkix/pkix/results/manifest.mn
index c082ada1f..07bb22e5d 100755
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_buildresult.h \
 	pkix_policynode.h \
diff --git a/lib/libpkix/pkix/store/Makefile b/lib/libpkix/pkix/store/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/store/Makefile
+++ b/lib/libpkix/pkix/store/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/store/manifest.mn b/lib/libpkix/pkix/store/manifest.mn
index 4df8eb64b..cb64455f8 100755
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_store.h \
 	$(NULL)
diff --git a/lib/libpkix/pkix/top/Makefile b/lib/libpkix/pkix/top/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix/top/Makefile
+++ b/lib/libpkix/pkix/top/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix/top/manifest.mn b/lib/libpkix/pkix/top/manifest.mn
index c49941034..8ba169d69 100755
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_build.h \
 	pkix_lifecycle.h \
diff --git a/lib/libpkix/pkix/util/Makefile b/lib/libpkix/pkix/util/Makefile
index 36524f56a..1b75ee75a 100755
--- a/lib/libpkix/pkix/util/Makefile
+++ b/lib/libpkix/pkix/util/Makefile
@@ -43,6 +43,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
-
diff --git a/lib/libpkix/pkix/util/manifest.mn b/lib/libpkix/pkix/util/manifest.mn
index 9c068ae73..f18d94bee 100755
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_tools.h \
 	pkix_error.h \
diff --git a/lib/libpkix/pkix_pl_nss/Makefile b/lib/libpkix/pkix_pl_nss/Makefile
index 36524f56a..1b75ee75a 100755
--- a/lib/libpkix/pkix_pl_nss/Makefile
+++ b/lib/libpkix/pkix_pl_nss/Makefile
@@ -43,6 +43,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
-
diff --git a/lib/libpkix/pkix_pl_nss/module/Makefile b/lib/libpkix/pkix_pl_nss/module/Makefile
index 36524f56a..c3cb5ef8b 100755
--- a/lib/libpkix/pkix_pl_nss/module/Makefile
+++ b/lib/libpkix/pkix_pl_nss/module/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
diff --git a/lib/libpkix/pkix_pl_nss/module/manifest.mn b/lib/libpkix/pkix_pl_nss/module/manifest.mn
index 63bfd707e..9ae4d915c 100755
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_aiamgr.h \
 	pkix_pl_colcertstore.h \
@@ -22,7 +19,6 @@ MODULE = nss
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
-
 CSRCS = \
 	pkix_pl_aiamgr.c \
 	pkix_pl_colcertstore.c \
diff --git a/lib/libpkix/pkix_pl_nss/pki/Makefile b/lib/libpkix/pkix_pl_nss/pki/Makefile
index 0fb6c9058..a9cebcfec 100755
--- a/lib/libpkix/pkix_pl_nss/pki/Makefile
+++ b/lib/libpkix/pkix_pl_nss/pki/Makefile
@@ -44,6 +44,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
diff --git a/lib/libpkix/pkix_pl_nss/pki/manifest.mn b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
index f8d4571e1..7e105e7b9 100755
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_basicconstraints.h \
 	pkix_pl_cert.h \
diff --git a/lib/libpkix/pkix_pl_nss/system/Makefile b/lib/libpkix/pkix_pl_nss/system/Makefile
index 0fb6c9058..a9cebcfec 100755
--- a/lib/libpkix/pkix_pl_nss/system/Makefile
+++ b/lib/libpkix/pkix_pl_nss/system/Makefile
@@ -44,6 +44,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
diff --git a/lib/libpkix/pkix_pl_nss/system/manifest.mn b/lib/libpkix/pkix_pl_nss/system/manifest.mn
index 82d297992..16cb6d0eb 100755
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_common.h \
 	pkix_pl_mem.h \
diff --git a/lib/nss/Makefile b/lib/nss/Makefile
index 3a8e22f0a..3c18bc1f5 100644
--- a/lib/nss/Makefile
+++ b/lib/nss/Makefile
@@ -43,4 +43,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
diff --git a/lib/pk11wrap/Makefile b/lib/pk11wrap/Makefile
index 86ab29653..4f0c5cde1 100644
--- a/lib/pk11wrap/Makefile
+++ b/lib/pk11wrap/Makefile
@@ -44,7 +44,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 $(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c
 
diff --git a/lib/pki/Makefile b/lib/pki/Makefile
index fc78ae92c..ca709f6c0 100644
--- a/lib/pki/Makefile
+++ b/lib/pki/Makefile
@@ -8,4 +8,3 @@ include $(CORE_DEPTH)/coreconf/config.mk
 include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-export:: private_export
diff --git a/lib/pki/manifest.mn b/lib/pki/manifest.mn
index a7efb8938..77226b179 100644
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -16,9 +16,6 @@ PRIVATE_EXPORTS = \
 	pkim.h     \
 	$(NULL)
 
-EXPORTS =	   \
-	$(NULL)
-
 MODULE = nss
 
 CSRCS =		        \
diff --git a/lib/softoken/Makefile b/lib/softoken/Makefile
index 90a9da263..e5fb2d449 100644
--- a/lib/softoken/Makefile
+++ b/lib/softoken/Makefile
@@ -56,7 +56,6 @@ endif
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 # indicates dependency on freebl static lib
 $(SHARED_LIBRARY): $(CRYPTOLIB)
diff --git a/lib/softoken/legacydb/Makefile b/lib/softoken/legacydb/Makefile
index b7e94cae3..1b860a335 100644
--- a/lib/softoken/legacydb/Makefile
+++ b/lib/softoken/legacydb/Makefile
@@ -56,7 +56,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
-
 # indicates dependency on freebl static lib
 $(SHARED_LIBRARY): $(CRYPTOLIB)
diff --git a/lib/sqlite/Makefile b/lib/sqlite/Makefile
index adae8e0ca..592adb648 100644
--- a/lib/sqlite/Makefile
+++ b/lib/sqlite/Makefile
@@ -47,8 +47,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 WARNING_CFLAGS = $(NULL)
 
-export:: private_export
-
 ifeq (WINNT,$(OS_ARCH))
 # sqlite calls the deprecated GetVersionExA method
 OS_CFLAGS += -w44996
diff --git a/lib/sqlite/manifest.mn b/lib/sqlite/manifest.mn
index 022749b6e..be411a6db 100644
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -11,20 +11,14 @@ LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
 DEFINES += -DSQLITE_THREADSAFE=1
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	sqlite3.h \
 	$(NULL)
 
-
 CSRCS = \
 	sqlite3.c \
 	$(NULL)
 
-
-
 # only add module debugging in opt builds if DEBUG_PKCS11 is set
 ifdef DEBUG_PKCS11
   DEFINES += -DDEBUG_MODULE
diff --git a/lib/ssl/Makefile b/lib/ssl/Makefile
index 24fccc590..8a8b06f4b 100644
--- a/lib/ssl/Makefile
+++ b/lib/ssl/Makefile
@@ -61,5 +61,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
diff --git a/lib/util/Makefile b/lib/util/Makefile
index 97ec9345e..9b51d18cd 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -47,4 +47,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-export:: private_export
diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile
index 183294f86..812c38fce 100644
--- a/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
@@ -43,7 +43,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 test: $(PROGRAMS)
 	@cd $(OBJDIR); \