diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
--- ./nss/cmd/bltest/Makefile.iquote	2013-06-27 10:58:08.000000000 -0700
+++ nss/cmd/bltest/Makefile	2013-08-26 18:39:49.000000000 -0700
@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
+INCLUDES += -iquote $(DIST)/../private/nss
 
 
 #######################################################################
diff -up ./nss/cmd/lib/Makefile.iquote ./nss/cmd/lib/Makefile
--- ./nss/cmd/lib/Makefile.iquote	2013-06-27 10:58:08.000000000 -0700
+++ ./nss/cmd/lib/Makefile	2013-11-16 14:21:43.880956692 -0800
@@ -38,7 +38,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
-
+INCLUDES += -iquote $(DIST)/../private/nss
+INCLUDES += -iquote $(DIST)/../public/nss
+INCLUDES += -iquote .
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
--- ./nss/coreconf/location.mk.iquote	2013-06-27 10:58:08.000000000 -0700
+++ ./nss/coreconf/location.mk	2013-11-16 14:21:43.880956692 -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	2013-06-27 10:58:08.000000000 -0700
+++ ./nss/lib/certhigh/Makefile	2013-11-16 14:21:43.880956692 -0800
@@ -38,6 +38,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/lib/cryptohi/Makefile.iquote ./nss/lib/cryptohi/Makefile
--- ./nss/lib/cryptohi/Makefile.iquote	2013-06-27 10:58:08.000000000 -0700
+++ ./nss/lib/cryptohi/Makefile	2013-11-16 14:21:43.881956701 -0800
@@ -38,7 +38,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
-
+ifdef IN_TREE_FREEBL_HEADERS_FIRST
+INCLUDES += -iquote $(DIST)/../public/nss
+INCLUDES += -iquote $(DIST)/../private/nss
+endif
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
diff -up ./nss/lib/dev/Makefile.iquote ./nss/lib/dev/Makefile
--- ./nss/lib/dev/Makefile.iquote	2013-11-16 14:23:13.473708618 -0800
+++ ./nss/lib/dev/Makefile	2013-11-16 14:25:44.125964420 -0800
@@ -21,4 +21,8 @@ endif
 endif
 endif
 
+INCLUDES += -iquote $(DIST)/../private/nss
+INCLUDES += -iquote $(DIST)/../public/nss
+INCLUDES += -iquote .
+
 export:: private_export
diff -up nss/lib/ssl/Makefile.iquote nss/lib/ssl/Makefile
--- nss/lib/ssl/Makefile.iquote	2016-02-20 11:51:58.521471148 -0800
+++ nss/lib/ssl/Makefile	2016-02-20 11:52:57.048360357 -0800
@@ -49,7 +49,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).                              #