diff --git a/packages/PLStream/Makefile.in b/packages/PLStream/Makefile.in
index 8c0e7d97d..cfbcc676e 100755
--- a/packages/PLStream/Makefile.in
+++ b/packages/PLStream/Makefile.in
@@ -20,7 +20,7 @@ YAPLIBDIR=@libdir@/Yap
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/chr b/packages/chr
index 12da82298..9d5a5f2fe 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit 12da822986e8db33e52f9c72799622ce7e98bef0
+Subproject commit 9d5a5f2fe5b0d9a3c37cfba5b92c53963e1010b1
diff --git a/packages/clib/Makefile.in b/packages/clib/Makefile.in
index 08a5d0f9d..fbdfe5c41 100644
--- a/packages/clib/Makefile.in
+++ b/packages/clib/Makefile.in
@@ -31,7 +31,7 @@ LN_S=@LN_S@
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -I. -I$(srcdir)/maildrop/rfc2045 -I$(srcdir)/maildrop/rfc822 @SHLIB_CFLAGS@
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -I. -I$(srcdir)/maildrop/rfc2045 -I$(srcdir)/maildrop/rfc822  @CPPFLAGS@ @SHLIB_CFLAGS@
 MKINDEX=true
 NETLIBS=@CLIB_NETLIBS@
 CRYPTLIBS=@CLIB_CRYPTLIBS@
diff --git a/packages/cplint/Makefile.in b/packages/cplint/Makefile.in
index cff3abae8..828c298c6 100644
--- a/packages/cplint/Makefile.in
+++ b/packages/cplint/Makefile.in
@@ -22,7 +22,7 @@ SHAREDIR=$(ROOTDIR)/share/Yap
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../include
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../include  @CPPFLAGS@
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/jpl b/packages/jpl
index 2dd29ce11..8b990918d 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit 2dd29ce1118b5706f40c8559d6208bf01f36853b
+Subproject commit 8b990918d7909c676b5e27a6aa5d4261d3f25783
diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in
index 1b1b8af7b..9e51ea2bf 100755
--- a/packages/sgml/Makefile.in
+++ b/packages/sgml/Makefile.in
@@ -29,7 +29,7 @@ LN_S=@LN_S@
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
 MKINDEX=true
 
 LD=$(CC)
diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in
index 754c235ea..d9daed4a2 100755
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@@ -21,7 +21,7 @@ YAPLIBDIR=@libdir@/Yap
 #
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
+CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
 #
 #
 # You shouldn't need to change what follows.