diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 12c32f3b322c9341c15ef0b4ba1cb64cb6d8b1bc..811cca35f9c8d198e0149562ffc84ac1950d063f 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -24,7 +24,6 @@
 .PHONY: all clean
 
 all:
-	$(MAKE) -C src/jni links
 	$(MAKE) -C src/jni all
 
 clean:
diff --git a/com.oracle.truffle.r.native/fficall/README b/com.oracle.truffle.r.native/fficall/README
index 8f67219eefeb116902914b14ddeba4ce2b4caf75..99ff45a884ffe2022464f230cc8c9fa141558aa9 100644
--- a/com.oracle.truffle.r.native/fficall/README
+++ b/com.oracle.truffle.r.native/fficall/README
@@ -1,19 +1,24 @@
 fficall contains the implementation of the R FFI, as described in https://cran.r-project.org/doc/manuals/r-release/R-exts.html.
+It's actually a bit more than that as it also contains code copied from GnuR, for example that supports graphics or is sufficiently
+simple that it is neither necessary nor desirable to implement in Java.
 
  There are two sub-directories:
    common
    jni
 
- 'jni' contains the implementation that is based on Java JNI. 'common' contains code that has no JNI dependencies and has been extracted for
- reuse in other implementations. Note however, that the common files cannot all be compiled in isolation, as they may depend on the implementation
- via rffiutils.h. During the build symbolic links are made to the files in common and they are compiled with the other 'jni' files.
+'common' contains code that has no explicit JNI dependencies and has been extracted for reuse in other implementations. This code is mostly
+copied/included from GnuR. 'jni' contains the implementation that is based on and has explicit dependencies on Java JNI.
+
+ Note that the 'common' files cannot all be compiled in isolation, as they typically depend on the implementation
+ via rffiutils.h (and Rinternals.h). N.B. the GnuR code may "include" header files that are private to the GnuR implementation.
+ These must always be replaced with local versions that make sense under FastR. Examples are Defn.h and Internal.h. When code
+ is compiled the C compiler include path NEVER reaches into GnuR; all internal headers that are needed must existing in the
+ common directory. They may explicitly include the original header but doing it this way ensures that we never accidently
+ include an internal header.
 
  The R FFI is rather baroque and defined in large set of header files in the sibling 'include' directory. In GnuR, the implementation
- of the functions is spread over the GnuR C files in 'src/main'. To ease navigation of the FastR implementation, in general, the implementation
- of the functions in a header file 'Rxxx.h' is stored in the file 'Rxxx.c'.
+ of the functions is spread over the GnuR C files in 'src/main'. To ease navigation of the FastR implementation, in general,
+ the implementation of the functions in a header file 'Rxxx.h' is stored in the file 'Rxxx.c'.
 
 The points of entry from Java are defined in the file rfficall.c. Various utility functions are defined if rffiutils.{h,c}.
 
-TODO
-
-Refactor the files that are copied from GnuR and not strictly part of the FFI but support the native graphics package.
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Defn.h b/com.oracle.truffle.r.native/fficall/src/common/Defn.h
new file mode 100644
index 0000000000000000000000000000000000000000..7265f2a959d66539e2f4342d85c1dcae0158ea98
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/Defn.h
@@ -0,0 +1,65 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/Defn.h that is a safe replacement for use with FastR
+
+#ifndef DEFN_H_
+#define DEFN_H_
+
+#include <jni.h>
+#include <stdlib.h>
+#include <Rinternals.h>
+
+// various definitions required to compile GNU-R code:
+
+#define attribute_hidden
+
+#define F77_SYMBOL(x)	x
+#define F77_QSYMBOL(x) #x
+
+#define Rexp10(x) pow(10.0, x)
+
+// no NLS:
+#ifndef _
+#define _(String) (String)
+#endif
+#define N_(String) String
+#define ngettext(String, StringP, N) (N > 1 ? StringP: String)
+
+void sortVector(SEXP, Rboolean);
+int Scollate(SEXP a, SEXP b);
+void Rf_checkArityCall(SEXP, SEXP, SEXP);
+
+/* ../main/devices.c, used in memory.c, gnuwin32/extra.c */
+#define R_MaxDevices 64
+
+extern SEXP R_DeviceSymbol;
+extern SEXP R_DevicesSymbol;
+extern SEXP R_Interactive;
+extern SEXP R_Visible;
+int	R_ReadConsole(const char *, unsigned char *, int, int);
+
+//#define HAVE_MBSTATE_T 1 // actually from config.h
+
+extern Rboolean utf8locale;
+extern Rboolean mbcslocale;
+extern Rboolean latin1locale;
+
+extern int R_dec_min_exponent;
+extern unsigned int max_contour_segments;
+
+typedef SEXP (*CCODE)(SEXP, SEXP, SEXP, SEXP);
+
+CCODE (PRIMFUN)(SEXP x);
+
+
+#endif /* DEFN_H_ */
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Graphics.h b/com.oracle.truffle.r.native/fficall/src/common/Graphics.h
new file mode 100644
index 0000000000000000000000000000000000000000..25bd25ec044dd5ca8353167b74de2022b8d7b68f
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/Graphics.h
@@ -0,0 +1,15 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/Graphics.h that is a safe replacement for use with FastR
+
+#include "../../../gnur/R-3.1.3/src/include/Graphics.h"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/GraphicsBase.h b/com.oracle.truffle.r.native/fficall/src/common/GraphicsBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ecd4b1c3637b78c97b487f56240b1ed85b409c3
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/GraphicsBase.h
@@ -0,0 +1,15 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/GraphicsBase.h that is a safe replacement for use with FastR
+
+#include "../../../gnur/R-3.1.3/src/include/GraphicsBase.h"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Internal.h b/com.oracle.truffle.r.native/fficall/src/common/Internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..c216ba8a07a2cd7b20f1b0de87ac92c1c0723b06
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/Internal.h
@@ -0,0 +1,14 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/Internal.h that is a safe replacement for use with FastR
+
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Print.h b/com.oracle.truffle.r.native/fficall/src/common/Print.h
new file mode 100644
index 0000000000000000000000000000000000000000..0e1edb942c84ed73636346bf9a92490ca2fddbe0
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/Print.h
@@ -0,0 +1,15 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/Print.h that is a safe replacement for use with FastR
+
+#include "../../../gnur/R-3.1.3/src/include/Print.h"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Rgraphics.h b/com.oracle.truffle.r.native/fficall/src/common/Rgraphics.h
new file mode 100644
index 0000000000000000000000000000000000000000..841a21fedbe08f4e58ac9b93bb7b15c5452401aa
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/Rgraphics.h
@@ -0,0 +1,15 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/Rgraphics.h that is a safe replacement for use with FastR
+
+#include "../../../gnur/R-3.1.3/src/include/Rgraphics.h"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/appl_pretty.c b/com.oracle.truffle.r.native/fficall/src/common/appl_pretty.c
similarity index 97%
rename from com.oracle.truffle.r.native/fficall/src/jni/appl_pretty.c
rename to com.oracle.truffle.r.native/fficall/src/common/appl_pretty.c
index e2abd5a743b9675f5f48806975ceec11891ecdc1..ba48572fb9be5da90acc924bf37e81163e29186a 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/appl_pretty.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/appl_pretty.c
@@ -21,8 +21,4 @@
  * questions.
  */
 
-#include "Defn.h"
-
-#undef _
-
 #include "../../../gnur/R-3.1.3/src/appl/pretty.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c b/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
index 17ea1d495f2583149d713442a304bc48d8e6e2ce..5ea6a98e432a7fe801eace23cff45f7a49af52d4 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <stdlib.h>
 
 // FastR: selected functions from arithmetic.c:
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/coerce.c b/com.oracle.truffle.r.native/fficall/src/common/coerce.c
similarity index 99%
rename from com.oracle.truffle.r.native/fficall/src/jni/coerce.c
rename to com.oracle.truffle.r.native/fficall/src/common/coerce.c
index f8d675e7b9e3f017fdc4bfa9a74b85f1c7ba84b7..61d421693b6912e973c25ee1a62c840b8ed119fa 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/coerce.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/coerce.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 
 #define _(Source) (Source)
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/inlined.c b/com.oracle.truffle.r.native/fficall/src/common/inlined.c
similarity index 99%
rename from com.oracle.truffle.r.native/fficall/src/jni/inlined.c
rename to com.oracle.truffle.r.native/fficall/src/common/inlined.c
index 18d8b98026831f9cd0dbcf83b57ce5693f067a65..cecdc2aed4838a5789954d32928f6df7267b60ca 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/inlined.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/inlined.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 
 #define INLINE_FUN
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_colors.c b/com.oracle.truffle.r.native/fficall/src/common/main_colors.c
similarity index 96%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_colors.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_colors.c
index bf5763495a3b506abd2d4bd4be25f017a91ea8ac..07e6d29717e33e6c025b5113179242afb19d8bc2 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_colors.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_colors.c
@@ -21,8 +21,4 @@
  * questions.
  */
 
-#define attribute_hidden
-
-#include "Defn.h"
-
 #include "../../../gnur/R-3.1.3/src/main/colors.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_devices.c b/com.oracle.truffle.r.native/fficall/src/common/main_devices.c
similarity index 86%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_devices.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_devices.c
index 77f8c951fc17fce2dd2dde461b5f4e94a1c0a80f..48bafdcbe093624fae745321ebf126c16151a9dd 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_devices.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_devices.c
@@ -21,12 +21,4 @@
  * questions.
  */
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-extern SEXP    R_DevicesSymbol;  /* ".Devices" */
-extern Rboolean R_Interactive;
-#define attribute_hidden
-#define R_MaxDevices 64
-
 #include "../../../gnur/R-3.1.3/src/main/devices.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/main_engine.c b/com.oracle.truffle.r.native/fficall/src/common/main_engine.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc8e62c73ba052fa4a51bd1ad37f134832b6dd5d
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_engine.c
@@ -0,0 +1,13 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+#include "../../../gnur/R-3.1.3/src/main/engine.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_format.c b/com.oracle.truffle.r.native/fficall/src/common/main_format.c
similarity index 91%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_format.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_format.c
index f677ed0b4c635bbd83cd79a3df5698549324b631..fdb1641a9d2c4dfa76b049fcd37a2633647098e8 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_format.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_format.c
@@ -21,11 +21,4 @@
  * questions.
  */
 
-#define HAVE_NEARBYINT
-#define attribute_hidden
-
-extern int R_dec_min_exponent;
-
-#include "Defn.h"
-
 #include "../../../gnur/R-3.1.3/src/main/format.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_graphics.c b/com.oracle.truffle.r.native/fficall/src/common/main_graphics.c
similarity index 94%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_graphics.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_graphics.c
index 4ea38008da3fd2639cfc455bab2a2785b9268d13..6a7725d82b823d9f27eeb86f26e86b3ea4457dff 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_graphics.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_graphics.c
@@ -21,9 +21,4 @@
  * questions.
  */
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-#define attribute_hidden
-
 #include "../../../gnur/R-3.1.3/src/main/graphics.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_plot.c b/com.oracle.truffle.r.native/fficall/src/common/main_plot.c
similarity index 89%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_plot.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_plot.c
index 05417f7cce943ffb1971eebee9b8ba4aafa46fb3..4a1b0f2ed3cf546831404daf50a7cc20b43fe71e 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_plot.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_plot.c
@@ -21,11 +21,4 @@
  * questions.
  */
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-
-#define attribute_hidden
-
-#include "../../../gnur/R-3.1.3/src/main/contour-common.h"
 #include "../../../gnur/R-3.1.3/src/main/plot.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_plot3d.c b/com.oracle.truffle.r.native/fficall/src/common/main_plot3d.c
similarity index 90%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_plot3d.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_plot3d.c
index dce8977ed9bbb8c47cfea1c8106df5c7b6aa98ce..5a1a04f808693d61166438e992307b51626e6f0d 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_plot3d.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_plot3d.c
@@ -21,10 +21,4 @@
  * questions.
  */
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-#define attribute_hidden
-extern unsigned int max_contour_segments;
-
 #include "../../../gnur/R-3.1.3/src/main/plot3d.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_plotmath.c b/com.oracle.truffle.r.native/fficall/src/common/main_plotmath.c
similarity index 86%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_plotmath.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_plotmath.c
index f401c82ba056468d27ad6c2662c0a3b83f23dafa..868e2eeed6bcc7b70927ed52eb50dd88e32ca61f 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_plotmath.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_plotmath.c
@@ -21,11 +21,4 @@
  * questions.
  */
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-#define attribute_hidden
-#include "../../../gnur/R-3.1.3/src/main/contour-common.h"
-unsigned int max_contour_segments = 25000;
-
 #include "../../../gnur/R-3.1.3/src/main/plotmath.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_print.c b/com.oracle.truffle.r.native/fficall/src/common/main_print.c
similarity index 97%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_print.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_print.c
index 3f19c4904d8cef0af043ed875b9d27bf742d1399..43dfd2e0a1e3836503cb444b92f058308e328322 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_print.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_print.c
@@ -10,8 +10,6 @@
  * All rights reserved.
  */
 
-#include "rffiutils.h"
-
 // the following code is copied from "print.c"
 
 /*
@@ -77,10 +75,9 @@
 #include <config.h>
 #endif
 
-#include "rffiutils.h"
-#include "Defn.h"
-
-#include "Print.h"
+#include <rffiutils.h>
+#include <Defn.h>
+#include <Print.h>
 
 
 /* Global print parameter struct: */
diff --git a/com.oracle.truffle.r.native/fficall/src/common/main_printutils.c b/com.oracle.truffle.r.native/fficall/src/common/main_printutils.c
new file mode 100644
index 0000000000000000000000000000000000000000..fd06fa411b19fad88f632f0fd046b9ec9e2ee2cc
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_printutils.c
@@ -0,0 +1,61 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// the following code is copied from "printutils.c"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <rffiutils.h>
+#include <Defn.h>
+#include <Print.h>
+
+#ifndef min
+#define min(a, b) (((a)<(b))?(a):(b))
+#endif
+#define NB 1000
+const char *Rf_EncodeReal(double x, int w, int d, int e, char cdec)
+{
+    static char buff[NB];
+    char *p, fmt[20];
+
+    /* IEEE allows signed zeros (yuck!) */
+    if (x == 0.0) x = 0.0;
+    if (!R_FINITE(x)) {
+	if(ISNA(x)) snprintf(buff, NB, "%*s", min(w, (NB-1)), CHAR(R_print.na_string));
+	else if(ISNAN(x)) snprintf(buff, NB, "%*s", min(w, (NB-1)), "NaN");
+	else if(x > 0) snprintf(buff, NB, "%*s", min(w, (NB-1)), "Inf");
+	else snprintf(buff, NB, "%*s", min(w, (NB-1)), "-Inf");
+    }
+    else if (e) {
+	if(d) {
+	    sprintf(fmt,"%%#%d.%de", min(w, (NB-1)), d);
+	    snprintf(buff, NB, fmt, x);
+	}
+	else {
+	    sprintf(fmt,"%%%d.%de", min(w, (NB-1)), d);
+	    snprintf(buff, NB, fmt, x);
+	}
+    }
+    else { /* e = 0 */
+	sprintf(fmt,"%%%d.%df", min(w, (NB-1)), d);
+	snprintf(buff, NB, fmt, x);
+    }
+    buff[NB-1] = '\0';
+
+    if(cdec != '.')
+      for(p = buff; *p; p++) if(*p == '.') *p = cdec;
+
+    return buff;
+}
+
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_rlocale.c b/com.oracle.truffle.r.native/fficall/src/common/main_rlocale.c
similarity index 96%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_rlocale.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_rlocale.c
index 4f8605f55209e1511a8eebde4666fbeac2b035ec..7353dcd99037cb9145bee50a1c96a8b1e25f6f83 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_rlocale.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_rlocale.c
@@ -21,8 +21,4 @@
  * questions.
  */
 
-#define attribute_hidden
-
-#include "Defn.h"
-
 #include "../../../gnur/R-3.1.3/src/main/rlocale.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_sort.c b/com.oracle.truffle.r.native/fficall/src/common/main_sort.c
similarity index 96%
rename from com.oracle.truffle.r.native/fficall/src/jni/main_sort.c
rename to com.oracle.truffle.r.native/fficall/src/common/main_sort.c
index 0b07d6869bf59e59d9860746111a6da44647f8d4..50e9ce639f62c6a66ea2d90047f6476723c6a894 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_sort.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/main_sort.c
@@ -21,8 +21,4 @@
  * questions.
  */
 
-#define attribute_hidden
-
-#include "Defn.h"
-
 #include "../../../gnur/R-3.1.3/src/main/sort.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/common/rlocale.h b/com.oracle.truffle.r.native/fficall/src/common/rlocale.h
new file mode 100644
index 0000000000000000000000000000000000000000..f1da411d1b0ca9257ce28f16038506ceb179b28b
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/src/common/rlocale.h
@@ -0,0 +1,15 @@
+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995-2015, The R Core Team
+ * Copyright (c) 2003, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a cut-down version of src/include/rlocale.h that is a safe replacement for use with FastR
+
+#include "../../../gnur/R-3.1.3/src/include/rlocale.h"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/sys.c b/com.oracle.truffle.r.native/fficall/src/common/sys.c
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/jni/sys.c
rename to com.oracle.truffle.r.native/fficall/src/common/sys.c
diff --git a/com.oracle.truffle.r.native/fficall/src/common/variable_defs.h b/com.oracle.truffle.r.native/fficall/src/common/variable_defs.h
index 51a953eebea0dbcb77638803654078e662dd7d9e..0ed51318fa217b22dd13564ada672e640a055ce6 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/variable_defs.h
+++ b/com.oracle.truffle.r.native/fficall/src/common/variable_defs.h
@@ -9,10 +9,10 @@
  *
  * All rights reserved.
  */
-#ifndef VARIABLE_DEFS_H_
-#define VARIABLE_DEFS_H_
 
-// The global variables that are assumed by the R FFI.
+// These are the definitions (i.e., not extern) that are defined as extern in RInternals.h.
+// They are in a a separate header to support a JNI and non-JNI implementation of their values.
+// Therefore this file must only be included by the implementation.
 // N.B. Some variables become functions in FastR, see RInternals.h
 
 /* Evaluation Environment */
@@ -92,5 +92,5 @@ Rboolean utf8locale = FALSE;
 Rboolean mbcslocale = FALSE;
 Rboolean latin1locale = FALSE;
 int R_dec_min_exponent = -308;
+int max_contour_segments = 25000;
 
-#endif /* VARIABLE_DEFS_H_ */
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/xxxpr.f b/com.oracle.truffle.r.native/fficall/src/common/xxxpr.f
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/jni/xxxpr.f
rename to com.oracle.truffle.r.native/fficall/src/common/xxxpr.f
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Applic.c b/com.oracle.truffle.r.native/fficall/src/jni/Applic.c
index e95b1c3c8244f8a8b066f27d188060c29ab72b4f..97db6cc689b41f41a9b04a04409abb09add24e59 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Applic.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Applic.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <R_ext/Applic.h>
 
 void init_applic(JNIEnv *env) {
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Connections.c b/com.oracle.truffle.r.native/fficall/src/jni/Connections.c
index 9114fdd120851cddb40075f9637b25a4f14c67a7..812f804dcd84b3b3e8320344422f94f1e6bbadd3 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Connections.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Connections.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <R_ext/Connections.h>
 
 SEXP R_new_custom_connection(const char *description, const char *mode, const char *class_name, Rconnection *ptr) {
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Defn.h b/com.oracle.truffle.r.native/fficall/src/jni/Defn.h
deleted file mode 100644
index da43dd42f3068ac3e423dd2f302d331b346c30d9..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.native/fficall/src/jni/Defn.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#define DEFN_H_
-
-#include <jni.h>
-#include <stdlib.h>
-#include <Rinternals.h>
-
-// various definitions required to compile GNU-R code:
-#define F77_SYMBOL(x)	x
-#define F77_QSYMBOL(x) #x
-
-#define Rexp10(x) pow(10.0, x)
-
-// no NLS:
-#ifndef _
-#define _(String) (String)
-#endif
-#define N_(String) String
-#define ngettext(String, StringP, N) (N > 1 ? StringP: String)
-
-void sortVector(SEXP, Rboolean);
-int Scollate(SEXP a, SEXP b);
-void Rf_checkArityCall(SEXP, SEXP, SEXP);
-
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Makefile b/com.oracle.truffle.r.native/fficall/src/jni/Makefile
index b922b435e8080daa6a9c96827e7d8bfa2e743824..d8ab824a8a211913a3d5f97362fd35f0a6b43c45 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Makefile
@@ -33,37 +33,35 @@ endif
 
 OBJ = ../../lib
 
-COMMON = ../common
+COMMON = $(abspath ../common)
 C_COMMON_SOURCES := $(notdir $(wildcard $(COMMON)/*.c))
-#$(info C_COMMON_SOURCE=$(C_COMMON_SOURCES))
+$(info C_COMMON_SOURCE=$(C_COMMON_SOURCES))
+
+F_COMMON_SOURCES := $(notdir $(wildcard $(COMMON)/*.f))
+F_OBJECTS := $(patsubst %.f,$(OBJ)/%.o,$(F_COMMON_SOURCES))
+
+C_LOCAL_SOURCES := $(wildcard *.c)
 
-# if link was already set, C_COMMON_SOURCES will be included twice without following filter
-C_LOCAL_SOURCES := $(filter-out  $(C_COMMON_SOURCES),$(wildcard *.c))
-#$(info C_LOCAL_SOURCES=$(C_LOCAL_SOURCES))
 C_HDRS := $(wildcard *.h)
 C_LIBNAME := librfficall$(DYLIB_EXT)
 C_LIB := $(TOPDIR)/../lib/$(C_LIBNAME)
 
 C_SOURCES = $(C_LOCAL_SOURCES) $(C_COMMON_SOURCES)
-#$(info C_SOURCES=$(C_SOURCES))
-C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(C_SOURCES))
-#$(info C_OBJECTS=$(C_OBJECTS))
-
-F_SOURCES := $(wildcard *.f)
-F_OBJECTS := $(patsubst %.f,$(OBJ)/%.o,$(F_SOURCES))
+$(info C_SOURCES=$(C_SOURCES))
+C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(C_LOCAL_SOURCES)) $(patsubst %.c,$(OBJ)/%.o,$(C_COMMON_SOURCES))
+$(info C_OBJECTS=$(C_OBJECTS))
 
 JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(JDK_OS_DIR)
-FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/gnur/R-3.1.3/src/include -I$(TOPDIR)/include/R_ext
+LOCAL_INCLUDES = -I. -I$(COMMON) 
+FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/include/R_ext
 
-# The need for thhis should be reviewed
-GNUR_INCLUDES = -I$(TOPDIR)/gnur/R-3.1.3/src/include -I$(TOPDIR)/gnur/R-3.1.3/src/nmath
+INCLUDES := $(LOCAL_INCLUDES) $(JNI_INCLUDES) $(FFI_INCLUDES)
 
-INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES) $(GNUR_INCLUDES)
+COMMON_INCLUDES := $(LOCAL_INCLUDES) $(JNI_INCLUDES) $(FFI_INCLUDES) -I$(TOPDIR)/gnur/R-3.1.3/src/nmath
 
-all: Makefile $(C_COMMON_SOURCES) $(C_LIB) 
+#CFLAGS := $(CFLAGS) -H
 
-links:
-	$(foreach file,$(C_COMMON_SOURCES),ln -sf $(COMMON)/$(file) $(file);)	
+all: Makefile $(C_LIB) 
 
 $(C_LIB): $(OBJ) $(C_OBJECTS) $(F_OBJECTS)
 	$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(C_LIB) $(C_OBJECTS) $(F_OBJECTS)
@@ -74,12 +72,15 @@ $(OBJ):
 $(OBJ)/%.o: %.c $(TOPDIR)/include/Rinternals.h $(C_HDRS)
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 	
-$(OBJ)/%.E: %.c $(TOPDIR)/include/Rinternals.h
-	$(CC) -E $(CFLAGS) $(INCLUDES) -c $< > $@
+$(OBJ)/%.o: $(COMMON)/%.c $(TOPDIR)/include/Rinternals.h $(C_HDRS)
+	$(CC) $(CFLAGS) $(COMMON_INCLUDES) -c $< -o $@
 
-$(OBJ)/%.o: %.f
+$(OBJ)/%.o: $(COMMON)/%.f
 	$(F77) $(FFLAGS) $(FPICFLAGS) -c $< -o $@
 
+# for debugging, to see what's really being compiled
+$(OBJ)/%.E: %.c $(TOPDIR)/include/Rinternals.h
+	$(CC) -E $(CFLAGS) $(INCLUDES) -c $< > $@
+
 clean:
 	rm -rf $(OBJ) $(C_LIB)
-	$(foreach file,$(C_COMMON_SOURCES),rm -f $(file);)	
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Memory.c b/com.oracle.truffle.r.native/fficall/src/jni/Memory.c
index c1e6b127cc820ce6e8d4750673129443edb29858..d166685891b1bbcab8aa232e9a50f511d583c2f5 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Memory.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Memory.c
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
index bf3b650784b4bc2d1cc41bd492645f7bd30e9f4c..387a7b43cbe06349a4e5d9beb05c4bb9d4268b26 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Parse.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <R_ext/Parse.h>
 
 SEXP R_ParseVector(SEXP x, int y, ParseStatus *z, SEXP w) {
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Random.c b/com.oracle.truffle.r.native/fficall/src/jni/Random.c
index be1c5cabdda92f32717252d16f0e01a2f7bbc652..23656cdcf0d1e120bf6e7e5df5ede19f1cdac63c 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Random.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Random.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 
 void init_random(JNIEnv *env) {
 }
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rdynload.c b/com.oracle.truffle.r.native/fficall/src/jni/Rdynload.c
index 98bb8fc3c5b74df1df31faebe145554ba0ebfe91..2983383669e0e48e612c4ae8793ffe1aeb54a755 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rdynload.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rdynload.c
@@ -9,7 +9,7 @@
  *
  * All rights reserved.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <Rdynload.h>
 
 // Registering routines from loaded shared libraries
@@ -133,9 +133,11 @@ Rboolean R_forceSymbols(DllInfo *dllInfo, Rboolean value) {
 
 DL_FUNC R_GetCCallable(const char *package, const char *name) {
 	unimplemented("R_GetCCallable");
+	return NULL;
 }
 
 DL_FUNC R_FindSymbol(char const *name, char const *pkg,
 		     R_RegisteredNativeSymbol *symbol) {
     unimplemented("R_FindSymbol");
+    return NULL;
 }
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Riconv.c b/com.oracle.truffle.r.native/fficall/src/jni/Riconv.c
index 886a31e5d3abad21c8b60839244e6d7ba6b69d3c..3d54c1d6bf2bffd47476a35e3067c6f9ec9405e3 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Riconv.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Riconv.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <Riconv.h>
 
 void * Riconv_open (const char* tocode, const char* fromcode) {
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c b/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
index df0edbd40e3374c7e0a521667fc35967aad76488..5502b09dee66843d69af6d583882e332521f385d 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rinternals.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <string.h>
 
 // Most everything in RInternals.h
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rmath.c b/com.oracle.truffle.r.native/fficall/src/jni/Rmath.c
index c847d6e6a3054a20e357a7e363ad8c920ffe48e6..2182b9c413902d5ac2bd03bad3fa91c6a3a896c5 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rmath.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rmath.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 
 void init_rmath(JNIEnv *env) {
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Utils.c b/com.oracle.truffle.r.native/fficall/src/jni/Utils.c
index a8820e2ebebd808fbc6416707e51ee54353e6f58..a67edcbc049ce5caf8a800043702e8993eb2b7a9 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Utils.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Utils.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 
 void R_CheckStack(void) {
     // TODO: check for stack overflow
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/main_engine.c b/com.oracle.truffle.r.native/fficall/src/jni/main_engine.c
deleted file mode 100644
index a06868cb5d9c707ddca5dbf686e6fcaa28b3ab6e..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.native/fficall/src/jni/main_engine.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * This material is distributed under the GNU General Public License
- * Version 2. You may review the terms of this license at
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 1995-2015, The R Core Team
- * Copyright (c) 2003, The R Foundation
- * Copyright (c) 2015, Oracle and/or its affiliates
- *
- * All rights reserved.
- */
-
-#include "rffiutils.h"
-#include "Defn.h"
-
-extern SEXP R_DevicesSymbol;
-extern Rboolean R_Interactive;
-extern Rboolean R_Visible;
-
-#define attribute_hidden
-#define R_MaxDevices 64
-
-#define HAVE_MBSTATE_T 1
-
-extern Rboolean utf8locale;
-extern Rboolean mbcslocale;
-extern Rboolean latin1locale;
-
-#include <wchar.h>
-
-
-/* The type of the do_xxxx functions. */
-/* These are the built-in R functions. */
-typedef SEXP (*CCODE)(SEXP, SEXP, SEXP, SEXP);
-
-CCODE (PRIMFUN)(SEXP x);
-
-#define streql(s, t)	(!strcmp((s), (t)))
-
-
-/* main/util.c */
-void UNIMPLEMENTED_TYPE(const char *s, SEXP x);
-void UNIMPLEMENTED_TYPEt(const char *s, SEXPTYPE t);
-Rboolean Rf_strIsASCII(const char *str);
-int utf8clen(char c);
-
-typedef unsigned short ucs2_t;
-size_t mbcsToUcs2(const char *in, ucs2_t *out, int nout, int enc);
-/* size_t mbcsMblen(char *in);
-size_t ucs2ToMbcs(ucs2_t *in, char *out);
-size_t ucs2Mblen(ucs2_t *in); */
-size_t utf8toucs(wchar_t *wc, const char *s);
-size_t utf8towcs(wchar_t *wc, const char *s, size_t n);
-size_t ucstomb(char *s, const unsigned int wc);
-size_t ucstoutf8(char *s, const unsigned int wc);
-size_t mbtoucs(unsigned int *wc, const char *s, size_t n);
-size_t wcstoutf8(char *s, const wchar_t *wc, size_t n);
-
-SEXP Rf_installTrChar(SEXP);
-
-const wchar_t *wtransChar(SEXP x); /* from sysutils.c */
-
-#define mbs_init(x) memset(x, 0, sizeof(mbstate_t))
-size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps);
-Rboolean mbcsValid(const char *str);
-Rboolean utf8Valid(const char *str);
-char *Rf_strchr(const char *s, int c);
-char *Rf_strrchr(const char *s, int c);
-
-#include "../../../gnur/R-3.1.3/src/main/engine.c"
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/rfficall.c b/com.oracle.truffle.r.native/fficall/src/jni/rfficall.c
index 4d42bd864f1dbff84b4fc9a322e2185689e1c212..34e65d0ee8c178c0a0a3a4649df8b43cc83f13f2 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/rfficall.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/rfficall.c
@@ -21,7 +21,7 @@
  * questions.
  */
 
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <string.h>
 #include <setjmp.h>
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c b/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
index a3e08bb2f228e61ed9c26a266c2d9384d2fdecad..d485f0456dcce097540c696c6e98100e86e04057 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/unimplemented.c b/com.oracle.truffle.r.native/fficall/src/jni/unimplemented.c
index 57bae74e53821f752b53481ab6f6aeb8457b79c2..e19b9fb285000d0deee70c8f99ac62e5152a32e2 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/unimplemented.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/unimplemented.c
@@ -9,9 +9,9 @@
  *
  * All rights reserved.
  */
-#include "rffiutils.h"
+#include <rffiutils.h>
 
-#include "Defn.h"
+#include <Defn.h>
 #include <Print.h>
 
 Rboolean known_to_be_latin1 = FALSE;
@@ -85,44 +85,4 @@ const char *Rf_EncodeLogical(int x, int w)
 	return NULL;
 }
 
-// from printutils.c
-#ifndef min
-#define min(a, b) (((a)<(b))?(a):(b))
-#endif
-#define NB 1000
-const char *Rf_EncodeReal(double x, int w, int d, int e, char cdec)
-{
-    static char buff[NB];
-    char *p, fmt[20];
-
-    /* IEEE allows signed zeros (yuck!) */
-    if (x == 0.0) x = 0.0;
-    if (!R_FINITE(x)) {
-	if(ISNA(x)) snprintf(buff, NB, "%*s", min(w, (NB-1)), CHAR(R_print.na_string));
-	else if(ISNAN(x)) snprintf(buff, NB, "%*s", min(w, (NB-1)), "NaN");
-	else if(x > 0) snprintf(buff, NB, "%*s", min(w, (NB-1)), "Inf");
-	else snprintf(buff, NB, "%*s", min(w, (NB-1)), "-Inf");
-    }
-    else if (e) {
-	if(d) {
-	    sprintf(fmt,"%%#%d.%de", min(w, (NB-1)), d);
-	    snprintf(buff, NB, fmt, x);
-	}
-	else {
-	    sprintf(fmt,"%%%d.%de", min(w, (NB-1)), d);
-	    snprintf(buff, NB, fmt, x);
-	}
-    }
-    else { /* e = 0 */
-	sprintf(fmt,"%%%d.%df", min(w, (NB-1)), d);
-	snprintf(buff, NB, fmt, x);
-    }
-    buff[NB-1] = '\0';
-
-    if(cdec != '.')
-      for(p = buff; *p; p++) if(*p == '.') *p = cdec;
-
-    return buff;
-}
-
 
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/variables.c b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
index 971a8c8802fe0032ac88761d39a3378cf4440dbb..d9c9497e38856a211840eb2d325389e871e17eef 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -28,8 +28,8 @@
 #include <string.h>
 #include <jni.h>
 #include <Rinternals.h>
-#include "rffiutils.h"
-#include "../common/variable_defs.h"
+#include <rffiutils.h>
+#include <variable_defs.h>
 
 jmethodID getGlobalEnvMethodID;
 jmethodID getBaseEnvMethodID;
diff --git a/com.oracle.truffle.r.native/library/stats/Makefile b/com.oracle.truffle.r.native/library/stats/Makefile
index 969795ea25f7586973830eb6859387d39bcdfbfc..083188194afbcafbe9a6111d9ddc991115ec0665 100644
--- a/com.oracle.truffle.r.native/library/stats/Makefile
+++ b/com.oracle.truffle.r.native/library/stats/Makefile
@@ -55,6 +55,12 @@ GNUR_C_OBJECTS := $(addprefix $(OBJ)/, $(GNUR_C_FILES:.c=.o)) $(FFT_OBJECT)
 
 include ../lib.mk
 
+# Why is this necessary? Because if fft.c has been created by editing, lib.mk will
+# include it in C_OBJECTS but it's already in GNUR_C_OBJECTS (uncreated case)
+$(info C_OBJECTS=$(C_OBJECTS))
+C_OBJECTS := $(filter-out $(FFT_OBJECT), $(C_OBJECTS))
+$(info C_OBJECTS=$(C_OBJECTS))
+
 $(C_OBJECTS): | $(OBJ)
 
 $(SRC)/fft.c: $(GNUR_FFT) src/ed_fft