diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
index b22fbd79492855ffe0a34495cd1c9f1e76907c67..0f0ae19055b68d2e6ba87e04ddba82edc961e7f9 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Rembedded.c
@@ -13,6 +13,7 @@
 #include <sys/utsname.h>
 #include <rffiutils.h>
 #include <R_ext/RStartup.h>
+#include <Rinterface.h>
 
 
 static JavaVM *javaVM;
@@ -25,6 +26,9 @@ static jclass rStartParamsClass;
 
 int R_running_as_main_program;
 int R_SignalHandlers;
+FILE * R_Consolefile;
+FILE * R_Outputfile;
+
 
 typedef jint (JNICALL *JNI_CreateJavaVMFunc)
 	      (JavaVM **pvm, void **penv, void *args);
@@ -190,7 +194,7 @@ void R_set_command_line_arguments(int argc, char **argv) {
 
 int Rf_initEmbeddedR(int argc, char *argv[]) {
 	Rf_initialize_R(argc, argv);
-//	R_Interactive = TRUE;
+	R_Interactive = TRUE;
     setup_Rmainloop();
     return 1;
 }
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 d9c9497e38856a211840eb2d325389e871e17eef..c872132c312f21b0d1d2b8c1e61eb8eeea46012a 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -58,12 +58,6 @@ SEXP FASTR_NamespaceRegistry() {
 	return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getNamespaceRegistryMethodID);
 }
 
-Rboolean FASTR_IsInteractive() {
-	JNIEnv *env = getEnv();
-	return (*env)->CallStaticIntMethod(env, CallRFFIHelperClass, isInteractiveMethodID);
-}
-
-
 void init_variables(JNIEnv *env, jobjectArray initialValues) {
 	// initialValues is an array of enums
 	jclass enumClass = (*env)->GetObjectClass(env, (*env)->GetObjectArrayElement(env, initialValues, 0));
diff --git a/com.oracle.truffle.r.native/include/Makefile b/com.oracle.truffle.r.native/include/Makefile
index c65a01a741bce6b34c291cac88df46055d982a0a..b2d1e14b4b14fa412c4ce10182e9765eb0303b88 100644
--- a/com.oracle.truffle.r.native/include/Makefile
+++ b/com.oracle.truffle.r.native/include/Makefile
@@ -37,7 +37,7 @@ R_EXT_HEADERS_TO_LINK := $(filter-out $(notdir $(R_EXT_HEADERS_LOCAL)),$(R_EXT_H
 R_HEADERS := $(wildcard $(GNUR_HOME)/include/*.h)
 R_HEADERS_FILENAMES := $(notdir $(R_HEADERS))
 #$(info R_HEADERS_FILENAMES=$(R_HEADERS_FILENAMES))
-R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h src/Rinterface.h
+R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h # src/Rinterface.h
 #$(info R_HEADERS_LOCAL=$(R_HEADERS_LOCAL))>
 R_HEADERS_TO_LINK := $(filter-out $(notdir $(R_HEADERS_LOCAL)),$(R_HEADERS_FILENAMES))
 #$(info R_HEADERS_TO_LINK=$(R_HEADERS_TO_LINK))
@@ -49,7 +49,7 @@ linked: ed_Rinternals ed_Rinterface ed_GraphicsEngine
 	$(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);)
 	ln -sf src/libintl.h
 	ed $(GNUR_HOME)/include/Rinternals.h < ed_Rinternals
-	ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
+#	ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
 	ed $(GNUR_HOME)/include/R_ext/GraphicsEngine.h < ed_GraphicsEngine
 	$(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);)
 #	cp $(R_EXT_HEADERS_LOCAL) R_ext