diff --git a/H/pl-incl.h b/H/pl-incl.h
index c30e7e0bd..d948ceb1a 100755
--- a/H/pl-incl.h
+++ b/H/pl-incl.h
@@ -200,6 +200,18 @@ typedef uintptr_t	PL_atomic_t;	/* same a word */
 #define TRAIL_OVERFLOW    (-3)
 #define ARGUMENT_OVERFLOW (-4)
 
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Foreign language interface definitions.  Note that these macros MUST  be
+consistent  with  the  definitions  in  pl-itf.h, which is included with
+users foreign language code.
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+
+#define NOTRACE PL_FA_NOTRACE
+#define META    PL_FA_TRANSPARENT
+#define NDET	PL_FA_NONDETERMINISTIC
+#define VA	PL_FA_VARARGS
+#define CREF	PL_FA_CREF
+#define ISO	PL_FA_ISO
 
 		/********************************
 		*       THREADS	             *
diff --git a/Makefile.in b/Makefile.in
index 56688a2b1..eea0e6e68 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -789,7 +789,7 @@ install_unix: startup.yss libYap.a
 	@ENABLE_SGML@ @INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
 	@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
 	@ENABLE_LIBARCHIVE@ @INSTALL_DLLS@ (cd packages/archive; $(MAKE) install)
-	@ENABLE_LIBODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install)
+	@ENABLE_ODBC@ @INSTALL_DLLS@ (cd packages/odbc; $(MAKE) install)
 	@ENABLE_CLPBN_BP@ @INSTALL_DLLS@ (cd packages/CLPBN/horus; $(MAKE) install)
 	@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
@@ -861,7 +861,7 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ yap-win@EXEC_SUFFIX@
 	(cd packages/CLPBN ; $(MAKE) install)
 	@ENABLE_CLPBN_BP@ (cd packages/CLPBN/horus; $(MAKE) install)
 	@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
-	@ENABLE_PYTHON@ (cd packages/python ; $(MAKE) install)
+	@ENABLE_PYTHON@ (cd packages/pyswip ; $(MAKE) install)
 	@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
 	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install)
@@ -933,10 +933,12 @@ clean: clean_docs
 	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) clean)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)
 	@ENABLE_BDDLIB@ (cd packages/bdd; $(MAKE) clean)
+	@ENABLE_LIBARCHIVE@ (cd packages/archive; $(MAKE) clean)
+	@ENABLE_ODBC@ (cd packages/odbc; $(MAKE) clean)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) clean)
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) clean)
-	@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/python; $(MAKE) clean)
+	@ENABLE_PYTHON@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) clean)
 
 
 
diff --git a/include/SWI-Prolog.h b/include/SWI-Prolog.h
index 439f8dc35..a88e8c450 100755
--- a/include/SWI-Prolog.h
+++ b/include/SWI-Prolog.h
@@ -259,18 +259,6 @@ typedef void *PL_engine_t;
 #define PL_ACTION_GUIAPP	10	/* Win32: set when this is a gui */
 #define PL_ACTION_ATTACH_CONSOLE 11	/* MT: Attach a console */
 
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Foreign language interface definitions.  Note that these macros MUST  be
-consistent  with  the  definitions  in  pl-itf.h, which is included with
-users foreign language code.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-
-#define NOTRACE PL_FA_NOTRACE
-#define META    PL_FA_TRANSPARENT
-#define NDET	PL_FA_NONDETERMINISTIC
-#define VA	PL_FA_VARARGS
-#define CREF	PL_FA_CREF
-#define ISO	PL_FA_ISO
 
 typedef enum
 { FRG_FIRST_CALL = 0,		/* Initial call */
diff --git a/packages/R b/packages/R
index a48f0a8a7..87ea72e5d 160000
--- a/packages/R
+++ b/packages/R
@@ -1 +1 @@
-Subproject commit a48f0a8a78d48ccb9c51de63d198ac57e6893ba0
+Subproject commit 87ea72e5db5844be1bccfac0efb56abdab1d7f84