r=cls sr=blizzard bug# 102372

[checking in for Christian Biesinger]

security/manager/ssl/src/Makefile.in

@@ -102,11 +102,13 @@ EXTRA_DEPS = $(EXTRA_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+=	\
+# Use local includes because they are inserted before INCLUDES
-		-I$(DIST)/public/security \
+# so that Mozilla's nss.h is used, not glibc's
+LOCAL_INCLUDES += -I$(DIST)/public/security \
                   -I$(DIST)/private/security \
                   $(NULL)
 
+
 ifeq ($(OS_ARCH),OpenVMS)
 # OpenVMS wants the link libs in EXTRA_DSO_LDOPTS, with no dups
 EXTRA_DSO_LDOPTS += $(sort $(EXTRA_LIBS))