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 70a830a0fc8294179558bf6abf3e6d0a1a07310c..112b772298e98395b33b16a2733a8aa04a2c1a66 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -59,7 +59,7 @@ SEXP FASTR_NamespaceRegistry() {
 	return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getNamespaceRegistryMethodID);
 }
 
-SEXP FASTR_GlobalContext() {
+CTXT FASTR_GlobalContext() {
 	JNIEnv *env = getEnv();
 	return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getGlobalContextMethodID);
 }
diff --git a/com.oracle.truffle.r.native/include/ed_Rinternals b/com.oracle.truffle.r.native/include/ed_Rinternals
index 9d9f7d806ac9f43faa136b74f0b1d7203cd4003f..3e0d8dba21592273b553563e7055e4a5019e5290 100644
--- a/com.oracle.truffle.r.native/include/ed_Rinternals
+++ b/com.oracle.truffle.r.native/include/ed_Rinternals
@@ -12,6 +12,7 @@ a
 i
 #ifdef FASTR
 typedef void *SEXP;
+typedef void *CTXT;
 #else
 .
 +1