diff -up ./nss/cmd/certutil/Makefile.iquote ./nss/cmd/certutil/Makefile --- ./nss/cmd/certutil/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/certutil/Makefile 2016-02-06 08:03:25.509936899 -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/cmd/httpserv/Makefile.iquote ./nss/cmd/httpserv/Makefile --- ./nss/cmd/httpserv/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/httpserv/Makefile 2016-02-06 08:00:39.403191706 -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/lib/Makefile 2016-02-06 08:00:39.403191706 -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/modutil/Makefile 2016-02-06 08:00:39.403191706 -0800 @@ -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/selfserv/Makefile 2016-02-06 08:00:39.403191706 -0800 @@ -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/ssltap/Makefile 2016-02-06 08:04:21.595228841 -0800 @@ -39,7 +39,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/strsclnt/Makefile.iquote ./nss/cmd/strsclnt/Makefile --- ./nss/cmd/strsclnt/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/strsclnt/Makefile 2016-02-06 08:00:39.404191687 -0800 @@ -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/tstclnt/Makefile 2016-02-06 08:04:40.506961353 -0800 @@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### #include ../platlibs.mk +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/cmd/vfyserv/Makefile.iquote ./nss/cmd/vfyserv/Makefile --- ./nss/cmd/vfyserv/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/cmd/vfyserv/Makefile 2016-02-06 08:04:55.758745631 -0800 @@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### #include ../platlibs.mk +INCLUDES += -iquote $(DIST)/../public/nss +INCLUDES += -iquote $(DIST)/../private/nss ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk --- ./nss/coreconf/location.mk.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/coreconf/location.mk 2016-02-06 08:00:39.404191687 -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/lib/certhigh/Makefile 2016-02-06 08:00:39.404191687 -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/lib/cryptohi/Makefile 2016-02-06 08:00:39.404191687 -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 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/lib/libpkix/pkix/checker/Makefile 2016-02-06 08:05:24.277342263 -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/lib/nss/Makefile.iquote ./nss/lib/nss/Makefile --- ./nss/lib/nss/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800 +++ ./nss/lib/nss/Makefile 2016-02-06 08:00:39.404191687 -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-11-08 21:12:59.000000000 -0800 +++ ./nss/lib/ssl/Makefile 2016-02-06 08:00:39.404191687 -0800 @@ -49,6 +49,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### +INCLUDES += -iquote $(DIST)/../public/nss ####################################################################### diff -up ./nss/gtests/ssl_gtest/Makefile.iquote ./nss/gtests/ssl_gtest/Makefile --- ./nss/gtests/ssl_gtest/Makefile.iquote 2016-02-18 21:51:23.746893964 -0500 +++ ./nss/gtests/ssl_gtest/Makefile 2016-02-18 21:52:32.825583479 -0500 @@ -37,6 +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). #