diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile
index 32478092eac8ee8a124f12a64e73697d2b706177..e1d13764ff1566601552a0f42d349c5d863257f4 100644
--- a/com.oracle.truffle.r.native/Makefile
+++ b/com.oracle.truffle.r.native/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
@@ -21,13 +21,12 @@
 # questions.
 #
 
-# If GNUR_HOME is defined we take that as a pre-built, immutable, entity
-
 .PHONY: all clean 
 
 export TOPDIR = $(CURDIR)
 export FASTR_R_HOME=$(abspath $(TOPDIR)/..)
 export FASTR_LIB_DIR=$(FASTR_R_HOME)/lib
+export FASTR_NATIVE_DIR = $(TOPDIR)
 export R_VERSION = 3.1.3
 export GNUR_HOME = $(TOPDIR)/gnur/R-$(R_VERSION)
 
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Makefile b/com.oracle.truffle.r.native/fficall/src/common/Makefile
index d8fe175c2e9990404ca998ff096f5d558a838b96..346357beaec77f655f9aa2798f6a9d39677e8f4d 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/common/Makefile
@@ -24,7 +24,7 @@
 # This builds the GNUR files that are compiled directly, and local overrides
 
 ifneq ($(MAKECMDGOALS),clean)
-include $(TOPDIR)/platform.mk
+include $(FASTR_NATIVE_DIR)/platform.mk
 endif
 
 .PHONY: all clean
@@ -50,7 +50,7 @@ F_SOURCES = $(wildcard *.f)
 F_OBJECTS := $(patsubst %.f,$(OBJ)/%.o,$(F_SOURCES))
 
 JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(JDK_OS_DIR)
-FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/include/R_ext
+FFI_INCLUDES = -I$(FASTR_NATIVE_DIR)/include -I$(FASTR_NATIVE_DIR)/include/R_ext
 INCLUDES := -I $(abspath ../include) $(JNI_INCLUDES) $(FFI_INCLUDES)
 
 include ../include/gnurheaders.mk
@@ -81,7 +81,7 @@ $(OBJ)/%.o: $(GNUR_APPL_SRC)/%.c
 $(OBJ)/%.o: $(GNUR_MAIN_SRC)/%.c
 	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
 
-$(OBJ)/%.o: %.c $(TOPDIR)/include/Rinternals.h
+$(OBJ)/%.o: %.c $(FASTR_NATIVE_DIR)/include/Rinternals.h
 	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
 
 $(OBJ)/%.o: %.f
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 1daa492a549c8fe35005536c50db08e525324ab5..74ab1ba0c42ffb07f3dba1bc7267c4d63c7fc2c8 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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