diff --git a/interfaces-and-libraries.sh b/interfaces-and-libraries.sh
index ed367bb058..4e91cee8af 100755
--- a/interfaces-and-libraries.sh
+++ b/interfaces-and-libraries.sh
@@ -186,9 +186,9 @@ function removeConflictingHeaders()
 {
     # On case-insensitive file systems, there will be some conflicts with
     # newlib. For now, universal interfaces get the right of way.
-    rm -f "$2/Threads.h"        # thread.h: does not currently work anyways
-    rm -f "$2/Memory.h"         # memory.h: non-standard aliasof string.h
-    rm -f "$2/Strings.h"        # strings.h: traditional bsd string functions
+    rm -f "$1/Threads.h"        # thread.h: does not currently work anyways
+    rm -f "$1/Memory.h"         # memory.h: non-standard aliasof string.h
+    rm -f "$1/Strings.h"        # strings.h: traditional bsd string functions
 }
 
 
@@ -213,6 +213,7 @@ function linkInterfacesAndLibraries()
 
     if [ $BUILD_PPC != false ]; then
         ln -sf ../RIncludes "$PREFIX/powerpc-apple-macos/RIncludes"
+        removeConflictingHeaders "$PREFIX/powerpc-apple-macos/include"
         linkThings "../../$1/CIncludes" "$PREFIX/powerpc-apple-macos/include" "*.h"
     fi
 
diff --git a/multiversal b/multiversal
index 762bb2eb52..07f6a99aa0 160000
--- a/multiversal
+++ b/multiversal
@@ -1 +1 @@
-Subproject commit 762bb2eb52be72539904da2ad22c786bd3ac24c5
+Subproject commit 07f6a99aa011a37d729b9c17a707b6c4ce2ac6ee