diff --git a/interfaces-and-libraries.sh b/interfaces-and-libraries.sh
index f94153ff75..6ef4d07a95 100755
--- a/interfaces-and-libraries.sh
+++ b/interfaces-and-libraries.sh
@@ -139,10 +139,11 @@ function locateAndCheckInterfacesAndLibraries()
 # and link files from $PREFIX/CIncludes
 function linkHeaders()
 {
-    # incompatible with Universal Interfaces on case-insensitive file systems
-    rm -f "$1"/threads.h        # does not currently work anyways
-    rm -f "$1"/memory.h         # non-standard aliasof string.h
-    rm -f "$1"/strings.h        # traditional bsd string functions
+    # On case-insensitive file systems, there will be some conflicts with
+    # newlib. For now, universal interfaces get the right of way.
+    rm -f Threads.h        # thread.h: does not currently work anyways
+    rm -f Memory.h         # memory.h: non-standard aliasof string.h
+    rm -f Strings.h        # strings.h: traditional bsd string functions
 
     (cd "$1" && find "../../CIncludes" -name '*.h' -exec ln -s {} . \;)
 }