--- nss/unxfbsdi.pro/misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/Makefile.orig	2012-02-10 10:20:57.000000000 -0600
+++ nss/unxfbsdi.pro/misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/Makefile	2012-02-10 10:23:24.000000000 -0600
@@ -464,7 +464,7 @@
 vpath %.S mpi ecl
 vpath %.s mpi ecl
 vpath %.asm mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- moz/unxfbsdi.pro/misc/build/mozilla/security/nss-fips/lib/freebl/Makefile.orig	2012-02-10 10:11:01.000000000 -0600
+++ moz/unxfbsdi.pro/misc/build/mozilla/security/nss-fips/lib/freebl/Makefile	2012-02-10 10:11:37.000000000 -0600
@@ -431,7 +431,7 @@
 vpath %.c mpi ecl
 vpath %.S mpi ecl
 vpath %.s mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- moz/unxfbsdi.pro/misc/build/mozilla/security/nss/lib/freebl/Makefile.orig	2012-02-09 19:51:09.000000000 -0600
+++ moz/unxfbsdi.pro/misc/build/mozilla/security/nss/lib/freebl/Makefile	2012-02-10 10:25:01.000000000 -0600
@@ -429,7 +429,7 @@
 vpath %.c mpi ecl
 vpath %.S mpi ecl
 vpath %.s mpi ecl
-INCLUDES += -Impi -Iecl
+INCLUDES := -Impi -Iecl $(INCLUDES)
 
 
 DEFINES += -DMP_API_COMPATIBLE
--- connectivity/unxfbsdi.pro/misc/sqlbison.cxx.orig	2012-02-09 21:20:28.000000000 -0600
+++ connectivity/unxfbsdi.pro/misc/sqlbison.cxx	2012-02-09 22:45:52.000000000 -0600
@@ -7788,7 +7788,7 @@
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
+        char *yymsgp = YY_("syntax error");
         int yysyntax_error_status;
         yysyntax_error_status = YYSYNTAX_ERROR;
         if (yysyntax_error_status == 0)