diff --git a/Makefile.in b/Makefile.in
index 5fcdc28e8..f515abeb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,7 @@ C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
 ARCH=@ARCH@
 AWK=@AWK@
 CPP=@CPP@
-DEFS=@DEFS@
+DEFS=@DEFS@ -D_YAP_NOT_INSTALLED_=1
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
 LN_S=@LN_S@
diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index 6f8007786..021ec0d49 100755
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -18,8 +18,13 @@ extern "C" {
 #endif
 
 //=== includes ===============================================================
-#include "config.h"
+#ifdef          _YAP_NOT_INSTALLED_
+#include	<config.h>
 #include	<YapInterface.h>
+#else
+#include	<Yap/config.h>
+#include	<Yap/YapInterface.h>
+#endif
 #include	<stdarg.h>
 #include	<stdlib.h>
 #include        <stddef.h>
diff --git a/packages/PLStream/Makefile.in b/packages/PLStream/Makefile.in
index 88cb3a021..965b4ceaf 100755
--- a/packages/PLStream/Makefile.in
+++ b/packages/PLStream/Makefile.in
@@ -18,7 +18,7 @@ LIBDIR=$(EROOTDIR)/lib/Yap
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/uxnt
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/uxnt
 #
 #
 # You shouldn't need to change what follows.
diff --git a/packages/chr b/packages/chr
index 804d5a27f..5f7abe62f 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit 804d5a27f66bb0b4697a28ab72e325b481570d22
+Subproject commit 5f7abe62fc770d680b78c3f3e8b65951c7004850
diff --git a/packages/jpl b/packages/jpl
index 8192d5f9b..25bfaa337 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit 8192d5f9ba0bba55fdd96b4473d68d8cf57f51aa
+Subproject commit 25bfaa3370ca6f6a2b23d8dcc6dda84a2773d40a
diff --git a/packages/sgml/Makefile.in b/packages/sgml/Makefile.in
index e5c05226c..7f5809be2 100644
--- a/packages/sgml/Makefile.in
+++ b/packages/sgml/Makefile.in
@@ -28,7 +28,7 @@ LN_S=@LN_S@
 #
 #
 CC=@CC@
-CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
 MKINDEX=true
 
 LD=$(CC)
diff --git a/packages/swi-minisat2/C/Makefile.in b/packages/swi-minisat2/C/Makefile.in
index 9635942f6..e1609fcf9 100644
--- a/packages/swi-minisat2/C/Makefile.in
+++ b/packages/swi-minisat2/C/Makefile.in
@@ -19,7 +19,7 @@ LIBDIR=$(EROOTDIR)/lib/Yap
 #
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
+CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
 #
 #
 # You shouldn't need to change what follows.