@@ -562,11 +562,12 @@
 	    !C(@"foo").absolutePath && !C(@"b:foo").absolutePath)
 # elif defined(OF_AMIGAOS)
 	TEST(@"-[isAbsolutePath]",
 	    C(@"dh0:foo").absolutePath && C(@"dh0:a/b").absolutePath &&
 	    !C(@"foo/bar").absolutePath && !C(@"foo").absolutePath)
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"-[isAbsolutePath]",
 	    C(@"sdmc:/foo").absolutePath && !C(@"sdmc:foo").absolutePath &&
 	    !C(@"foo/bar").absolutePath && !C(@"foo").absolutePath)
 # else
 	TEST(@"-[isAbsolutePath]",
@@ -728,11 +729,12 @@
 	    [[stringClass pathWithComponents: [OFArray arrayWithObjects:
 	    @"foo/", @"bar", @"", @"baz", @"/", nil]]
 	    isEqual: @"foo//bar/baz//"] &&
 	    [[stringClass pathWithComponents: [OFArray arrayWithObjects:
 	    @"foo", nil]] isEqual: @"foo"])
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"+[pathWithComponents:]",
 	    [[stringClass pathWithComponents: [OFArray arrayWithObjects:
 	    @"foo", @"bar", @"baz", nil]] isEqual: @"foo/bar/baz"] &&
 	    [[stringClass pathWithComponents: [OFArray arrayWithObjects:
 	    @"sdmc:", @"foo", @"bar", @"baz", nil]]
@@ -852,11 +854,12 @@
 	    /* foo// */
 	    (array = C(@"foo//").pathComponents) && array.count == 2 &&
 	    [[array objectAtIndex: 0] isEqual: @"foo"] &&
 	    [[array objectAtIndex: 1] isEqual: @"/"] &&
 	    C(@"").pathComponents.count == 0)
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"-[pathComponents]",
 	    /* sdmc:/tmp */
 	    (array = C(@"sdmc:/tmp").pathComponents) && array.count == 2 &&
 	    [[array objectAtIndex: 0] isEqual: @"sdmc:"] &&
 	    [[array objectAtIndex: 1] isEqual: @"tmp"] &&
@@ -933,11 +936,12 @@
 	    [C(@"dh0:/").lastPathComponent isEqual: @"/"] &&
 	    [C(@"dh0:").lastPathComponent isEqual: @"dh0:"] &&
 	    [C(@"foo").lastPathComponent isEqual: @"foo"] &&
 	    [C(@"foo/bar").lastPathComponent isEqual: @"bar"] &&
 	    [C(@"foo/bar/baz/").lastPathComponent isEqual: @"baz"])
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"-[lastPathComponent]",
 	    [C(@"sdmc:/tmp").lastPathComponent isEqual: @"tmp"] &&
 	    [C(@"sdmc:/tmp/").lastPathComponent isEqual: @"tmp"] &&
 	    [C(@"sdmc:/").lastPathComponent isEqual: @"sdmc:/"] &&
 	    [C(@"sdmc:").lastPathComponent isEqual: @"sdmc:"] &&
@@ -999,11 +1003,12 @@
 	    [C(@"dh0:/").stringByDeletingLastPathComponent isEqual: @"dh0:"] &&
 	    [C(@"dh0:tmp/foo/").stringByDeletingLastPathComponent
 	    isEqual: @"dh0:tmp"] &&
 	    [C(@"foo/bar").stringByDeletingLastPathComponent isEqual: @"foo"] &&
 	    [C(@"foo").stringByDeletingLastPathComponent isEqual: @""])
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"-[stringByDeletingLastPathComponent]",
 	    [C(@"/tmp/").stringByDeletingLastPathComponent isEqual: @""] &&
 	    [C(@"sdmc:/tmp/foo/").stringByDeletingLastPathComponent
 	    isEqual: @"sdmc:/tmp"] &&
 	    [C(@"sdmc:/").stringByDeletingLastPathComponent
@@ -1046,11 +1051,12 @@
 	    [C(@"foo.bar/").stringByDeletingPathExtension isEqual: @"foo"] &&
 	    [C(@".foo").stringByDeletingPathExtension isEqual: @".foo"] &&
 	    [C(@".foo\\bar").stringByDeletingPathExtension
 	    isEqual: @".foo\\bar"] &&
 	    [C(@".foo.bar").stringByDeletingPathExtension isEqual: @".foo"])
-# elif defined(OF_NINTENDO_3DS) || defined(OF_WII)
+# elif defined(OF_NINTENDO_3DS) || defined(OF_WII) || \
+    defined(OF_NINTENDO_SWITCH)
 	TEST(@"-[stringByDeletingPathExtension]",
 	    [C(@"foo.bar").stringByDeletingPathExtension isEqual: @"foo"] &&
 	    [C(@"foo..bar").stringByDeletingPathExtension isEqual: @"foo."] &&
 	    [C(@"sdmc:/foo./bar").stringByDeletingPathExtension
 	    isEqual: @"sdmc:/foo./bar"] &&