diff -up ./mozilla/security/coreconf/location.mk.iquote ./mozilla/security/coreconf/location.mk
--- ./mozilla/security/coreconf/location.mk.iquote	2010-06-11 17:58:32.000000000 -0700
+++ ./mozilla/security/coreconf/location.mk	2011-12-13 21:36:05.966187158 -0800
@@ -85,6 +85,10 @@ endif
 
 ifdef NSSUTIL_INCLUDE_DIR
     INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
+    ifdef IN_TREE_FREEBL_HEADERS_FIRST
+        INCLUDES += -iquote $(DIST)/../public/nss
+        INCLUDES += -iquote $(DIST)/../private/nss
+    endif
 endif
 
 ifndef NSSUTIL_LIB_DIR
diff -up ./mozilla/security/nss/cmd/bltest/Makefile.iquote ./mozilla/security/nss/cmd/bltest/Makefile
--- ./mozilla/security/nss/cmd/bltest/Makefile.iquote	2004-04-25 08:02:39.000000000 -0700
+++ ./mozilla/security/nss/cmd/bltest/Makefile	2011-12-13 21:39:40.891182125 -0800
@@ -77,6 +77,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
+INCLUDES += -iquote $(DIST)/../private/nss
 
 
 #######################################################################