diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
--- ./nss/cmd/bltest/Makefile.iquote	2023-06-04 10:42:53.000000000 +0200
+++ ./nss/cmd/bltest/Makefile	2023-06-21 15:15:54.270305289 +0200
@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
+INCLUDES += -iquote $(DIST)/../private/nss
 
 
 #######################################################################
diff -up ./nss/cmd/shlibsign/Makefile.iquote ./nss/cmd/shlibsign/Makefile
--- ./nss/cmd/shlibsign/Makefile.iquote	2023-06-21 15:18:56.139532867 +0200
+++ ./nss/cmd/shlibsign/Makefile	2023-06-21 15:19:53.445919672 +0200
@@ -99,3 +99,6 @@ libs: install
 ifdef CHECKLOC
 	$(MAKE) $(CHECKLOC)
 endif
+
+INCLUDES += -iquote $(DIST)/../public/nss -iquote $(DIST)/../private/nss
+
diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
--- ./nss/coreconf/location.mk.iquote	2023-06-04 10:42:53.000000000 +0200
+++ ./nss/coreconf/location.mk	2023-06-21 15:15:54.270305289 +0200
@@ -42,6 +42,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/softoken/Makefile.iquote ./nss/lib/softoken/Makefile
--- ./nss/lib/softoken/Makefile.iquote	2023-06-04 10:42:53.000000000 +0200
+++ ./nss/lib/softoken/Makefile	2023-06-21 15:15:54.270305289 +0200
@@ -52,6 +52,8 @@ ifdef NSS_DISABLE_DBM
 DIRS=
 endif
 
+INCLUDES += -iquote $(DIST)/../private/nss
+
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################