@@ -46,10 +46,15 @@
 #import "OFWriteFailedException.h"
 
 #ifdef OF_WINDOWS
 # include <windows.h>
 #endif
+
+#ifdef OF_AMIGAOS
+# include <proto/exec.h>
+# include <proto/dos.h>
+#endif
 
 #ifdef OF_WII
 # include <fat.h>
 #endif
 
@@ -56,13 +61,14 @@
 #ifdef OF_NINTENDO_DS
 # include <stdbool.h>
 # include <filesystem.h>
 #endif
 
-#ifdef OF_AMIGAOS
-# include <proto/exec.h>
-# include <proto/dos.h>
+#ifdef OF_NINTENDO_SWITCH
+# define id nx_id
+# include <switch.h>
+# undef id
 #endif
 
 #ifndef O_BINARY
 # define O_BINARY 0
 #endif
@@ -164,10 +170,20 @@
 	}
 
 	return -1;
 }
 #endif
+
+#ifdef OF_NINTENDO_SWITCH
+static bool initialized = false;
+
+OF_DESTRUCTOR()
+{
+	if (initialized)
+		romfsExit();
+}
+#endif
 
 @implementation OFFile
 + (void)initialize
 {
 	if (self != [OFFile class])
@@ -182,10 +198,19 @@
 #ifdef OF_NINTENDO_DS
 	if (!nitroFSInit(NULL))
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 #endif
+
+#ifdef OF_NINTENDO_SWITCH
+	if (R_SUCCEEDED(romfsInit()))
+		/*
+		 * Errors are intentionally ignored, as it's possible we just
+		 * have no romfs.
+		 */
+		initialized = true;
+#endif
 }
 
 + (instancetype)fileWithPath: (OFString *)path mode: (OFString *)mode
 {
 	return [[[self alloc] initWithPath: path mode: mode] autorelease];