diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile --- ./nss/cmd/bltest/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/cmd/bltest/Makefile 2014-01-18 11:31:32.277404478 -0800 @@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### diff -up ./nss/cmd/certutil/Makefile.iquote ./nss/cmd/certutil/Makefile --- ./nss/cmd/certutil/Makefile.iquote 2015-03-25 15:52:30.276938803 -0700 +++ ./nss/cmd/certutil/Makefile 2015-03-25 15:53:53.044536721 -0700 @@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### +INCLUDES += -iquote $(DIST)/../private/nss +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### diff -up ./nss/cmd/httpserv/Makefile.iquote ./nss/cmd/httpserv/Makefile --- ./nss/cmd/httpserv/Makefile.iquote 2014-01-18 11:33:15.058108851 -0800 +++ ./nss/cmd/httpserv/Makefile 2014-01-18 11:34:08.913478276 -0800 @@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../private/nss +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/lib/Makefile.iquote ./nss/cmd/lib/Makefile --- ./nss/cmd/lib/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/cmd/lib/Makefile 2014-01-18 11:31:32.309404697 -0800 @@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../private/nss +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/modutil/Makefile.iquote ./nss/cmd/modutil/Makefile --- ./nss/cmd/modutil/Makefile.iquote 2014-05-31 11:14:36.880951209 -0700 +++ ./nss/cmd/modutil/Makefile 2014-05-31 11:15:13.423253804 -0700 @@ -41,7 +41,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/selfserv/Makefile.iquote ./nss/cmd/selfserv/Makefile --- ./nss/cmd/selfserv/Makefile.iquote 2014-05-31 10:41:33.790380931 -0700 +++ ./nss/cmd/selfserv/Makefile 2014-05-31 10:42:12.319696191 -0700 @@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/ssltap/Makefile.iquote ./nss/cmd/ssltap/Makefile --- ./nss/cmd/ssltap/Makefile.iquote 2014-05-31 10:46:19.661718435 -0700 +++ ./nss/cmd/ssltap/Makefile 2014-05-31 10:47:11.269140037 -0700 @@ -39,7 +39,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/strsclnt/Makefile.iquote ./nss/cmd/strsclnt/Makefile --- ./nss/cmd/strsclnt/Makefile.iquote 2014-05-31 10:51:00.833015089 -0700 +++ ./nss/cmd/strsclnt/Makefile 2014-05-31 10:51:30.397255298 -0700 @@ -36,7 +36,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/tstclnt/Makefile.iquote ./nss/cmd/tstclnt/Makefile --- ./nss/cmd/tstclnt/Makefile.iquote 2014-05-01 20:27:18.000000000 -0700 +++ ./nss/cmd/tstclnt/Makefile 2014-05-31 10:57:43.740326022 -0700 @@ -42,5 +42,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss + include ../platrules.mk diff -up ./nss/cmd/vfyserv/Makefile.iquote ./nss/cmd/vfyserv/Makefile --- ./nss/cmd/vfyserv/Makefile.iquote 2014-05-31 11:00:19.522669067 -0700 +++ ./nss/cmd/vfyserv/Makefile 2014-05-31 11:00:42.954870502 -0700 @@ -42,5 +42,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss + include ../platrules.mk diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk --- ./nss/coreconf/location.mk.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/coreconf/location.mk 2014-01-18 11:31:32.309404697 -0800 @@ -45,6 +45,10 @@ endif ifdef NSS_INCLUDE_DIR INCLUDES += -I$(NSS_INCLUDE_DIR) + ifdef IN_TREE_FREEBL_HEADERS_FIRST + INCLUDES += -iquote $(DIST)/../public/nss + INCLUDES += -iquote $(DIST)/../private/nss + endif endif ifndef NSS_LIB_DIR diff -up ./nss/lib/certhigh/Makefile.iquote ./nss/lib/certhigh/Makefile --- ./nss/lib/certhigh/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/lib/certhigh/Makefile 2014-01-18 11:31:32.310404704 -0800 @@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/lib/cryptohi/Makefile.iquote ./nss/lib/cryptohi/Makefile --- ./nss/lib/cryptohi/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/lib/cryptohi/Makefile 2014-01-18 11:31:32.310404704 -0800 @@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/lib/libpkix/pkix/checker/Makefile.iquote ./nss/lib/libpkix/pkix/checker/Makefile --- ./nss/lib/libpkix/pkix/checker/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/lib/libpkix/pkix/checker/Makefile 2014-01-18 11:31:32.310404704 -0800 @@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/lib/nss/Makefile.iquote ./nss/lib/nss/Makefile --- ./nss/lib/nss/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800 +++ ./nss/lib/nss/Makefile 2014-01-18 11:31:32.310404704 -0800 @@ -37,7 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/lib/ssl/Makefile.iquote ./nss/lib/ssl/Makefile --- ./nss/lib/ssl/Makefile.iquote 2015-06-05 15:42:16.661963153 -0700 +++ ./nss/lib/ssl/Makefile 2015-06-05 15:43:25.862697604 -0700 @@ -49,6 +49,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### +INCLUDES += -iquote $(DIST)/../public/nss #######################################################################