diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile
index 79096582ac720790a5fc60b6a8d0ffe7aae05dd9..c6abbfd958f114311aedb1ff43e18ca802b65170 100644
--- a/com.oracle.truffle.r.native/Makefile
+++ b/com.oracle.truffle.r.native/Makefile
@@ -36,9 +36,10 @@ all:
 	$(MAKE) -C run
 
 clean:
-	$(MAKE) -C gnur clean
 	$(MAKE) -C include clean
 	$(MAKE) -C builtinlibs clean
 	$(MAKE) -C fficall clean
 	$(MAKE) -C library clean
 	$(MAKE) -C run clean
+	$(MAKE) -C gnur clean
+	
\ No newline at end of file
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 66d9cfcc7287f7874871f9bac8b420ee6db815fa..c5c581f7edf8e4437233f6d190d50ef10939a795 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -78,5 +78,5 @@ $(GNUR_DIR)/bin/R: $(GNUR_DIR)/Makeconf
 	(cd $(GNUR_DIR); make >& gnur_make.log)
 
 clean:
-	rm Makeconf.done
+	rm -f Makeconf.done
 	(cd $(GNUR_DIR); make distclean)
diff --git a/com.oracle.truffle.r.native/library/base/src/registration.c b/com.oracle.truffle.r.native/library/base/src/registration.c
index 566ec18c7c8bb494f24428452ebd9dfc8a60d5c8..72feb45ef870398c1c29cb05e1c16604291d147b 100644
--- a/com.oracle.truffle.r.native/library/base/src/registration.c
+++ b/com.oracle.truffle.r.native/library/base/src/registration.c
@@ -77,8 +77,6 @@ static R_FortranMethodDef fortranMethods[] = {
     {NULL, NULL, 0}
 };
 
-#include <R_ext/Visibility.h>
-void attribute_hidden
 R_init_base(DllInfo *dll)
 {
 //    R_registerRoutines(dll, NULL, callMethods, fortranMethods, NULL);
diff --git a/com.oracle.truffle.r.native/library/graphics/src/init.c b/com.oracle.truffle.r.native/library/graphics/src/init.c
index dfc6468c2877fe9c02cde700075d2d8554a08040..b992a5530daedade45c75de9d06d452b0a9d626e 100644
--- a/com.oracle.truffle.r.native/library/graphics/src/init.c
+++ b/com.oracle.truffle.r.native/library/graphics/src/init.c
@@ -81,9 +81,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
 
 
 void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
 R_init_graphics(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);
diff --git a/com.oracle.truffle.r.native/library/methods/src/init.c b/com.oracle.truffle.r.native/library/methods/src/init.c
index f67ea8ac9a082d8459dd9b4cb740e5dc9de1a967..c7607bb4f2f9b1fa1a31131013ee4c14b1f3ff2e 100644
--- a/com.oracle.truffle.r.native/library/methods/src/init.c
+++ b/com.oracle.truffle.r.native/library/methods/src/init.c
@@ -56,9 +56,6 @@ static const R_CallMethodDef CallEntries[] = {
 };
 
 void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
 R_init_methods(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
diff --git a/com.oracle.truffle.r.native/library/tools/src/init.c b/com.oracle.truffle.r.native/library/tools/src/init.c
index bff24a0b8fef83b2390b82c5ac46c96c0405cca2..4fd2404024018a796f5b6762ef2aefc10ff8c9bb 100644
--- a/com.oracle.truffle.r.native/library/tools/src/init.c
+++ b/com.oracle.truffle.r.native/library/tools/src/init.c
@@ -65,9 +65,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
 
 
 void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
 R_init_tools(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);
diff --git a/com.oracle.truffle.r.native/library/utils/src/init.c b/com.oracle.truffle.r.native/library/utils/src/init.c
index 111354b86d7f762b81bf9d75330ddf12b33aff9e..d397c0a43b2c14716f48a3dbecd3c84d894888e1 100644
--- a/com.oracle.truffle.r.native/library/utils/src/init.c
+++ b/com.oracle.truffle.r.native/library/utils/src/init.c
@@ -112,9 +112,6 @@ static const R_ExternalMethodDef ExtEntries[] = {
 
 
 void
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-__attribute__ ((visibility ("default")))
-#endif
 R_init_utils(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, ExtEntries);