diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5eaaf1a9d..8611a6acb 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,22 +438,22 @@ source_group("modules\\event\\sdl" FILES ${LOVE_SRC_MODULE_EVENT_SDL})
 #
 
 set(LOVE_SRC_MODULE_FILESYSTEM_ROOT
-	src/modules/filesystem/DroppedFile.cpp
-	src/modules/filesystem/DroppedFile.h
 	src/modules/filesystem/File.cpp
 	src/modules/filesystem/File.h
 	src/modules/filesystem/FileData.cpp
 	src/modules/filesystem/FileData.h
 	src/modules/filesystem/Filesystem.cpp
 	src/modules/filesystem/Filesystem.h
-	src/modules/filesystem/wrap_DroppedFile.cpp
-	src/modules/filesystem/wrap_DroppedFile.h
+	src/modules/filesystem/NativeFile.cpp
+	src/modules/filesystem/NativeFile.h
 	src/modules/filesystem/wrap_File.cpp
 	src/modules/filesystem/wrap_File.h
 	src/modules/filesystem/wrap_FileData.cpp
 	src/modules/filesystem/wrap_FileData.h
 	src/modules/filesystem/wrap_Filesystem.cpp
 	src/modules/filesystem/wrap_Filesystem.h
+	src/modules/filesystem/wrap_NativeFile.cpp
+	src/modules/filesystem/wrap_NativeFile.h
 )
 
 set(LOVE_SRC_MODULE_FILESYSTEM_PHYSFS
diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj
index 409f8005e..2f27ae956 100644
--- a/platform/xcode/liblove.xcodeproj/project.pbxproj
+++ b/platform/xcode/liblove.xcodeproj/project.pbxproj
@@ -347,9 +347,6 @@
 		FA0B7CEB1A95902C000E1D17 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B561A95902C000E1D17 /* Event.cpp */; };
 		FA0B7CEC1A95902C000E1D17 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B561A95902C000E1D17 /* Event.cpp */; };
 		FA0B7CED1A95902C000E1D17 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B571A95902C000E1D17 /* Event.h */; };
-		FA0B7CF11A95902C000E1D17 /* DroppedFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B5B1A95902C000E1D17 /* DroppedFile.cpp */; };
-		FA0B7CF21A95902C000E1D17 /* DroppedFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B5B1A95902C000E1D17 /* DroppedFile.cpp */; };
-		FA0B7CF31A95902C000E1D17 /* DroppedFile.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B5C1A95902C000E1D17 /* DroppedFile.h */; };
 		FA0B7CF41A95902C000E1D17 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B5D1A95902C000E1D17 /* File.cpp */; };
 		FA0B7CF51A95902C000E1D17 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B5D1A95902C000E1D17 /* File.cpp */; };
 		FA0B7CF61A95902C000E1D17 /* File.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B5E1A95902C000E1D17 /* File.h */; };
@@ -365,9 +362,6 @@
 		FA0B7D001A95902C000E1D17 /* Filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B661A95902C000E1D17 /* Filesystem.cpp */; };
 		FA0B7D011A95902C000E1D17 /* Filesystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B661A95902C000E1D17 /* Filesystem.cpp */; };
 		FA0B7D021A95902C000E1D17 /* Filesystem.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B671A95902C000E1D17 /* Filesystem.h */; };
-		FA0B7D031A95902C000E1D17 /* wrap_DroppedFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B681A95902C000E1D17 /* wrap_DroppedFile.cpp */; };
-		FA0B7D041A95902C000E1D17 /* wrap_DroppedFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B681A95902C000E1D17 /* wrap_DroppedFile.cpp */; };
-		FA0B7D051A95902C000E1D17 /* wrap_DroppedFile.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B691A95902C000E1D17 /* wrap_DroppedFile.h */; };
 		FA0B7D061A95902C000E1D17 /* wrap_File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B6A1A95902C000E1D17 /* wrap_File.cpp */; };
 		FA0B7D071A95902C000E1D17 /* wrap_File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B7B6A1A95902C000E1D17 /* wrap_File.cpp */; };
 		FA0B7D081A95902C000E1D17 /* wrap_File.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B7B6B1A95902C000E1D17 /* wrap_File.h */; };
@@ -1020,6 +1014,12 @@
 		FAC7CD921FE35E95006A60C7 /* physfs_archiver_hog.c in Sources */ = {isa = PBXBuildFile; fileRef = FAC7CD751FE35E95006A60C7 /* physfs_archiver_hog.c */; };
 		FAC7CD931FE35E95006A60C7 /* physfs_archiver_zip.c in Sources */ = {isa = PBXBuildFile; fileRef = FAC7CD761FE35E95006A60C7 /* physfs_archiver_zip.c */; };
 		FAC7CD961FE755B4006A60C7 /* lz4opt.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC7CD951FE755B3006A60C7 /* lz4opt.h */; };
+		FAC8E54523AC832A007B07C8 /* NativeFile.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC8E54323AC832A007B07C8 /* NativeFile.h */; };
+		FAC8E54623AC832A007B07C8 /* NativeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E54423AC832A007B07C8 /* NativeFile.cpp */; };
+		FAC8E54723AC832A007B07C8 /* NativeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E54423AC832A007B07C8 /* NativeFile.cpp */; };
+		FAC8E54A23AC8379007B07C8 /* wrap_NativeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E54823AC8379007B07C8 /* wrap_NativeFile.cpp */; };
+		FAC8E54B23AC8379007B07C8 /* wrap_NativeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAC8E54823AC8379007B07C8 /* wrap_NativeFile.cpp */; };
+		FAC8E54C23AC8379007B07C8 /* wrap_NativeFile.h in Headers */ = {isa = PBXBuildFile; fileRef = FAC8E54923AC8379007B07C8 /* wrap_NativeFile.h */; };
 		FACA02EC1F5E396B0084B28F /* CompressedData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACA02E01F5E396B0084B28F /* CompressedData.cpp */; };
 		FACA02ED1F5E396B0084B28F /* CompressedData.h in Headers */ = {isa = PBXBuildFile; fileRef = FACA02E11F5E396B0084B28F /* CompressedData.h */; };
 		FACA02EE1F5E396B0084B28F /* Compressor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACA02E21F5E396B0084B28F /* Compressor.cpp */; };
@@ -1476,8 +1476,6 @@
 		FA0B7B541A95902C000E1D17 /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
 		FA0B7B561A95902C000E1D17 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
 		FA0B7B571A95902C000E1D17 /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
-		FA0B7B5B1A95902C000E1D17 /* DroppedFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DroppedFile.cpp; sourceTree = "<group>"; };
-		FA0B7B5C1A95902C000E1D17 /* DroppedFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DroppedFile.h; sourceTree = "<group>"; };
 		FA0B7B5D1A95902C000E1D17 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
 		FA0B7B5E1A95902C000E1D17 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
 		FA0B7B5F1A95902C000E1D17 /* FileData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileData.cpp; sourceTree = "<group>"; };
@@ -1488,8 +1486,6 @@
 		FA0B7B651A95902C000E1D17 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
 		FA0B7B661A95902C000E1D17 /* Filesystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Filesystem.cpp; sourceTree = "<group>"; };
 		FA0B7B671A95902C000E1D17 /* Filesystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Filesystem.h; sourceTree = "<group>"; };
-		FA0B7B681A95902C000E1D17 /* wrap_DroppedFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_DroppedFile.cpp; sourceTree = "<group>"; };
-		FA0B7B691A95902C000E1D17 /* wrap_DroppedFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_DroppedFile.h; sourceTree = "<group>"; };
 		FA0B7B6A1A95902C000E1D17 /* wrap_File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_File.cpp; sourceTree = "<group>"; };
 		FA0B7B6B1A95902C000E1D17 /* wrap_File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_File.h; sourceTree = "<group>"; };
 		FA0B7B6C1A95902C000E1D17 /* wrap_FileData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_FileData.cpp; sourceTree = "<group>"; };
@@ -1947,6 +1943,10 @@
 		FAC7CD751FE35E95006A60C7 /* physfs_archiver_hog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = physfs_archiver_hog.c; sourceTree = "<group>"; };
 		FAC7CD761FE35E95006A60C7 /* physfs_archiver_zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = physfs_archiver_zip.c; sourceTree = "<group>"; };
 		FAC7CD951FE755B3006A60C7 /* lz4opt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lz4opt.h; sourceTree = "<group>"; };
+		FAC8E54323AC832A007B07C8 /* NativeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeFile.h; sourceTree = "<group>"; };
+		FAC8E54423AC832A007B07C8 /* NativeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeFile.cpp; sourceTree = "<group>"; };
+		FAC8E54823AC8379007B07C8 /* wrap_NativeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrap_NativeFile.cpp; sourceTree = "<group>"; };
+		FAC8E54923AC8379007B07C8 /* wrap_NativeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wrap_NativeFile.h; sourceTree = "<group>"; };
 		FACA02E01F5E396B0084B28F /* CompressedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompressedData.cpp; sourceTree = "<group>"; };
 		FACA02E11F5E396B0084B28F /* CompressedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompressedData.h; sourceTree = "<group>"; };
 		FACA02E21F5E396B0084B28F /* Compressor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Compressor.cpp; sourceTree = "<group>"; };
@@ -2703,23 +2703,23 @@
 		FA0B7B5A1A95902C000E1D17 /* filesystem */ = {
 			isa = PBXGroup;
 			children = (
-				FA0B7B5B1A95902C000E1D17 /* DroppedFile.cpp */,
-				FA0B7B5C1A95902C000E1D17 /* DroppedFile.h */,
 				FA0B7B5D1A95902C000E1D17 /* File.cpp */,
 				FA0B7B5E1A95902C000E1D17 /* File.h */,
 				FA0B7B5F1A95902C000E1D17 /* FileData.cpp */,
 				FA0B7B601A95902C000E1D17 /* FileData.h */,
 				FA0B7B611A95902C000E1D17 /* Filesystem.cpp */,
 				FA0B7B621A95902C000E1D17 /* Filesystem.h */,
+				FAC8E54423AC832A007B07C8 /* NativeFile.cpp */,
+				FAC8E54323AC832A007B07C8 /* NativeFile.h */,
 				FA0B7B631A95902C000E1D17 /* physfs */,
-				FA0B7B681A95902C000E1D17 /* wrap_DroppedFile.cpp */,
-				FA0B7B691A95902C000E1D17 /* wrap_DroppedFile.h */,
 				FA0B7B6A1A95902C000E1D17 /* wrap_File.cpp */,
 				FA0B7B6B1A95902C000E1D17 /* wrap_File.h */,
 				FA0B7B6C1A95902C000E1D17 /* wrap_FileData.cpp */,
 				FA0B7B6D1A95902C000E1D17 /* wrap_FileData.h */,
 				FA0B7B6E1A95902C000E1D17 /* wrap_Filesystem.cpp */,
 				FA0B7B6F1A95902C000E1D17 /* wrap_Filesystem.h */,
+				FAC8E54823AC8379007B07C8 /* wrap_NativeFile.cpp */,
+				FAC8E54923AC8379007B07C8 /* wrap_NativeFile.h */,
 			);
 			path = filesystem;
 			sourceTree = "<group>";
@@ -3740,7 +3740,6 @@
 				FA0B7B361A958EA3000E1D17 /* wuff_convert.h in Headers */,
 				FA0B7CDE1A95902C000E1D17 /* Source.h in Headers */,
 				FA0B7E141A95902C000E1D17 /* GearJoint.h in Headers */,
-				FA0B7D051A95902C000E1D17 /* wrap_DroppedFile.h in Headers */,
 				FAAA3FDA1F64B3AD00F89E99 /* lstrlib.h in Headers */,
 				FA0B7E9F1A95902C000E1D17 /* WaveDecoder.h in Headers */,
 				FAF140871E20934C00F898D2 /* parseVersions.h in Headers */,
@@ -3785,6 +3784,7 @@
 				FAE272531C05A15B00A67640 /* ParticleSystem.h in Headers */,
 				FA6A2B6C1F5F7F560074C308 /* DataView.h in Headers */,
 				FAF140701E20934C00F898D2 /* Initialize.h in Headers */,
+				FAC8E54C23AC8379007B07C8 /* wrap_NativeFile.h in Headers */,
 				FAAA3FDC1F64B3AD00F89E99 /* lutf8lib.h in Headers */,
 				FAC7CD801FE35E95006A60C7 /* physfs_casefolding.h in Headers */,
 				FA1BA09F1E16CFCE00AA2803 /* Font.h in Headers */,
@@ -3812,6 +3812,7 @@
 				FA0B7CFF1A95902C000E1D17 /* File.h in Headers */,
 				FA0B7AB41A958EA3000E1D17 /* ddsinfo.h in Headers */,
 				FA0B7DD21A95902C000E1D17 /* love.h in Headers */,
+				FAC8E54523AC832A007B07C8 /* NativeFile.h in Headers */,
 				FA6A2B6F1F5F845F0074C308 /* wrap_DataView.h in Headers */,
 				FAF140861E20934C00F898D2 /* ParseHelper.h in Headers */,
 				FA0B7CE71A95902C000E1D17 /* wrap_Source.h in Headers */,
@@ -4055,7 +4056,6 @@
 				FA0B7DCF1A95902C000E1D17 /* wrap_Keyboard.h in Headers */,
 				FA0B7EA21A95902C000E1D17 /* Sound.h in Headers */,
 				FA0B7B331A958EA3000E1D17 /* wuff_config.h in Headers */,
-				FA0B7CF31A95902C000E1D17 /* DroppedFile.h in Headers */,
 				FA0B7D3B1A95902C000E1D17 /* Graphics.h in Headers */,
 				FA0B7E6E1A95902C000E1D17 /* wrap_RevoluteJoint.h in Headers */,
 				FA27B3AC1B498151008A9DCE /* VideoStream.h in Headers */,
@@ -4205,6 +4205,7 @@
 				FA0B7DA91A95902C000E1D17 /* PVRHandler.cpp in Sources */,
 				FAE64A842071363100BC7981 /* physfs_archiver_iso9660.c in Sources */,
 				FA0B7EC61A95902C000E1D17 /* ThreadModule.cpp in Sources */,
+				FAC8E54B23AC8379007B07C8 /* wrap_NativeFile.cpp in Sources */,
 				FA0B7D2C1A95902C000E1D17 /* wrap_Rasterizer.cpp in Sources */,
 				FADF54081E3D78F700012CC0 /* Video.cpp in Sources */,
 				FA9D8DD81DEF8411002CD881 /* Data.cpp in Sources */,
@@ -4261,7 +4262,6 @@
 				FA0B7D0A1A95902C000E1D17 /* wrap_FileData.cpp in Sources */,
 				FAF140781E20934C00F898D2 /* iomapper.cpp in Sources */,
 				FA0B7ABE1A958EA3000E1D17 /* compress.c in Sources */,
-				FA0B7CF21A95902C000E1D17 /* DroppedFile.cpp in Sources */,
 				FA4F2C141DE936FE00CA37D7 /* usocket.c in Sources */,
 				FAF140831E20934C00F898D2 /* ParseContextBase.cpp in Sources */,
 				FA0B7AD21A958EA3000E1D17 /* protocol.c in Sources */,
@@ -4269,7 +4269,6 @@
 				FA0B7D1F1A95902C000E1D17 /* ImageRasterizer.cpp in Sources */,
 				FAE64A952071365100BC7981 /* physfs_platform_qnx.c in Sources */,
 				FA0B7EA41A95902C000E1D17 /* SoundData.cpp in Sources */,
-				FA0B7D041A95902C000E1D17 /* wrap_DroppedFile.cpp in Sources */,
 				FAF1406A1E20934C00F898D2 /* glslang_tab.cpp in Sources */,
 				FA8951A31AA2EDF300EC385A /* wrap_Event.cpp in Sources */,
 				FADF540E1E3D7CDD00012CC0 /* wrap_Video.cpp in Sources */,
@@ -4560,6 +4559,7 @@
 				FA9D8DE11DEF843D002CD881 /* Image.cpp in Sources */,
 				FA0B7A961A958EA3000E1D17 /* b2Joint.cpp in Sources */,
 				FA0B7A621A958EA3000E1D17 /* b2ContactManager.cpp in Sources */,
+				FAC8E54723AC832A007B07C8 /* NativeFile.cpp in Sources */,
 				FA15DFAD1F9B8CBA0042AB22 /* StringMap.cpp in Sources */,
 				FA0B7A2F1A958EA3000E1D17 /* b2CollideEdge.cpp in Sources */,
 				FACA02F81F5E39760084B28F /* CompressedData.cpp in Sources */,
@@ -4596,6 +4596,7 @@
 				FA0B7DDF1A95902C000E1D17 /* wrap_Math.cpp in Sources */,
 				FA0B7DA81A95902C000E1D17 /* PVRHandler.cpp in Sources */,
 				FA0B7EC51A95902C000E1D17 /* ThreadModule.cpp in Sources */,
+				FAC8E54A23AC8379007B07C8 /* wrap_NativeFile.cpp in Sources */,
 				FADF54071E3D78F700012CC0 /* Video.cpp in Sources */,
 				217DFC031D9F6D490055D849 /* timeout.c in Sources */,
 				FA9D8DD71DEF8411002CD881 /* Data.cpp in Sources */,
@@ -4654,12 +4655,10 @@
 				FAF140771E20934C00F898D2 /* iomapper.cpp in Sources */,
 				FA0B7D091A95902C000E1D17 /* wrap_FileData.cpp in Sources */,
 				FA0B7B341A958EA3000E1D17 /* wuff_convert.c in Sources */,
-				FA0B7CF11A95902C000E1D17 /* DroppedFile.cpp in Sources */,
 				FAF140821E20934C00F898D2 /* ParseContextBase.cpp in Sources */,
 				FA0B7D1E1A95902C000E1D17 /* ImageRasterizer.cpp in Sources */,
 				FAF140A31E20934C00F898D2 /* Scan.cpp in Sources */,
 				FA0B7EA31A95902C000E1D17 /* SoundData.cpp in Sources */,
-				FA0B7D031A95902C000E1D17 /* wrap_DroppedFile.cpp in Sources */,
 				FA0B79291A958E3B000E1D17 /* Matrix.cpp in Sources */,
 				FA8951A21AA2EDF300EC385A /* wrap_Event.cpp in Sources */,
 				FAF140691E20934C00F898D2 /* glslang_tab.cpp in Sources */,
@@ -4951,6 +4950,7 @@
 				FA0B7E1E1A95902C000E1D17 /* Physics.cpp in Sources */,
 				FA9D8DE01DEF843D002CD881 /* Image.cpp in Sources */,
 				FA0B7E811A95902C000E1D17 /* Shape.cpp in Sources */,
+				FAC8E54623AC832A007B07C8 /* NativeFile.cpp in Sources */,
 				FA4F2BA81DE1E36400CA37D7 /* wrap_RecordingDevice.cpp in Sources */,
 				FACA02EC1F5E396B0084B28F /* CompressedData.cpp in Sources */,
 				FAF140531E20934C00F898D2 /* CodeGen.cpp in Sources */,
diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index 72ca8a620..5c4600448 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -20,7 +20,7 @@
 
 #include "Event.h"
 
-#include "filesystem/DroppedFile.h"
+#include "filesystem/NativeFile.h"
 #include "filesystem/Filesystem.h"
 #include "keyboard/sdl/Keyboard.h"
 #include "joystick/JoystickModule.h"
@@ -418,8 +418,8 @@ Message *Event::convert(const SDL_Event &e)
 			}
 			else
 			{
-				auto *file = new love::filesystem::DroppedFile(e.drop.file);
-				vargs.emplace_back(&love::filesystem::DroppedFile::type, file);
+				auto *file = new love::filesystem::NativeFile(e.drop.file);
+				vargs.emplace_back(&love::filesystem::NativeFile::type, file);
 				msg = new Message("filedropped", vargs);
 				file->release();
 			}
diff --git a/src/modules/filesystem/DroppedFile.cpp b/src/modules/filesystem/NativeFile.cpp
similarity index 84%
rename from src/modules/filesystem/DroppedFile.cpp
rename to src/modules/filesystem/NativeFile.cpp
index 4630f5e3a..d4f99f7bb 100644
--- a/src/modules/filesystem/DroppedFile.cpp
+++ b/src/modules/filesystem/NativeFile.cpp
@@ -19,7 +19,7 @@
  **/
 
 // LOVE
-#include "DroppedFile.h"
+#include "NativeFile.h"
 #include "common/utf8.h"
 
 // Assume POSIX or Visual Studio.
@@ -37,9 +37,9 @@ namespace love
 namespace filesystem
 {
 
-love::Type DroppedFile::type("DroppedFile", &File::type);
+love::Type NativeFile::type("NativeFile", &File::type);
 
-DroppedFile::DroppedFile(const std::string &filename)
+NativeFile::NativeFile(const std::string &filename)
 	: filename(filename)
 	, file(nullptr)
 	, mode(MODE_CLOSED)
@@ -48,13 +48,13 @@ DroppedFile::DroppedFile(const std::string &filename)
 {
 }
 
-DroppedFile::~DroppedFile()
+NativeFile::~NativeFile()
 {
 	if (mode != MODE_CLOSED)
 		close();
 }
 
-bool DroppedFile::open(Mode newmode)
+bool NativeFile::open(Mode newmode)
 {
 	if (newmode == MODE_CLOSED)
 		return true;
@@ -88,7 +88,7 @@ bool DroppedFile::open(Mode newmode)
 	return file != nullptr;
 }
 
-bool DroppedFile::close()
+bool NativeFile::close()
 {
 	if (file == nullptr || fclose(file) != 0)
 		return false;
@@ -99,12 +99,12 @@ bool DroppedFile::close()
 	return true;
 }
 
-bool DroppedFile::isOpen() const
+bool NativeFile::isOpen() const
 {
 	return mode != MODE_CLOSED && file != nullptr;
 }
 
-int64 DroppedFile::getSize()
+int64 NativeFile::getSize()
 {
 #ifdef LOVE_WINDOWS
 
@@ -129,7 +129,7 @@ int64 DroppedFile::getSize()
 #endif
 }
 
-int64 DroppedFile::read(void *dst, int64 size)
+int64 NativeFile::read(void *dst, int64 size)
 {
 	if (!file || mode != MODE_READ)
 		throw love::Exception("File is not opened for reading.");
@@ -142,7 +142,7 @@ int64 DroppedFile::read(void *dst, int64 size)
 	return (int64) read;
 }
 
-bool DroppedFile::write(const void *data, int64 size)
+bool NativeFile::write(const void *data, int64 size)
 {
 	if (!file || (mode != MODE_WRITE && mode != MODE_APPEND))
 		throw love::Exception("File is not opened for writing.");
@@ -155,7 +155,7 @@ bool DroppedFile::write(const void *data, int64 size)
 	return written == size;
 }
 
-bool DroppedFile::flush()
+bool NativeFile::flush()
 {
 	if (!file || (mode != MODE_WRITE && mode != MODE_APPEND))
 		throw love::Exception("File is not opened for writing.");
@@ -163,12 +163,12 @@ bool DroppedFile::flush()
 	return fflush(file) == 0;
 }
 
-bool DroppedFile::isEOF()
+bool NativeFile::isEOF()
 {
 	return file == nullptr || feof(file) != 0;
 }
 
-int64 DroppedFile::tell()
+int64 NativeFile::tell()
 {
 	if (file == nullptr)
 		return -1;
@@ -176,12 +176,12 @@ int64 DroppedFile::tell()
 	return (int64) ftell(file);
 }
 
-bool DroppedFile::seek(uint64 pos)
+bool NativeFile::seek(uint64 pos)
 {
 	return file != nullptr && fseek(file, (long) pos, SEEK_SET) == 0;
 }
 
-bool DroppedFile::setBuffer(BufferMode bufmode, int64 size)
+bool NativeFile::setBuffer(BufferMode bufmode, int64 size)
 {
 	if (size < 0)
 		return false;
@@ -190,7 +190,7 @@ bool DroppedFile::setBuffer(BufferMode bufmode, int64 size)
 		size = 0;
 
 	// If the file isn't open, we'll make sure the buffer values are set in
-	// DroppedFile::open.
+	// NativeFile::open.
 	if (!isOpen())
 	{
 		bufferMode = bufmode;
@@ -222,23 +222,23 @@ bool DroppedFile::setBuffer(BufferMode bufmode, int64 size)
 	return true;
 }
 
-File::BufferMode DroppedFile::getBuffer(int64 &size) const
+File::BufferMode NativeFile::getBuffer(int64 &size) const
 {
 	size = bufferSize;
 	return bufferMode;
 }
 
-const std::string &DroppedFile::getFilename() const
+const std::string &NativeFile::getFilename() const
 {
 	return filename;
 }
 
-File::Mode DroppedFile::getMode() const
+File::Mode NativeFile::getMode() const
 {
 	return mode;
 }
 
-const char *DroppedFile::getModeString(Mode mode)
+const char *NativeFile::getModeString(Mode mode)
 {
 	switch (mode)
 	{
diff --git a/src/modules/filesystem/DroppedFile.h b/src/modules/filesystem/NativeFile.h
similarity index 82%
rename from src/modules/filesystem/DroppedFile.h
rename to src/modules/filesystem/NativeFile.h
index a6d321dcf..9a4831191 100644
--- a/src/modules/filesystem/DroppedFile.h
+++ b/src/modules/filesystem/NativeFile.h
@@ -18,9 +18,6 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#ifndef LOVE_FILESYSTEM_DROPPED_FILE_H
-#define LOVE_FILESYSTEM_DROPPED_FILE_H
-
 // LOVE
 #include "common/config.h"
 #include "File.h"
@@ -34,17 +31,16 @@ namespace filesystem
 {
 
 /**
- * File which is created when a user drags and drops an actual file onto the
- * LOVE game. Uses C's stdio. Filenames are system-dependent full paths.
+ * File which uses C's stdio. Filenames are system-dependent full paths.
  **/
-class DroppedFile : public File
+class NativeFile : public File
 {
 public:
 
 	static love::Type type;
 
-	DroppedFile(const std::string &filename);
-	virtual ~DroppedFile();
+	NativeFile(const std::string &filename);
+	virtual ~NativeFile();
 
 	// Implements File.
 	using File::read;
@@ -77,9 +73,7 @@ private:
 	BufferMode bufferMode;
 	int64 bufferSize;
 
-}; // DroppedFile
+}; // NativeFile
 
 } // filesystem
 } // love
-
-#endif // LOVE_FILESYSTEM_DROPPED_FILE_H
diff --git a/src/modules/filesystem/wrap_Filesystem.cpp b/src/modules/filesystem/wrap_Filesystem.cpp
index fdb4a103c..efb15706d 100644
--- a/src/modules/filesystem/wrap_Filesystem.cpp
+++ b/src/modules/filesystem/wrap_Filesystem.cpp
@@ -22,7 +22,7 @@
 #include "common/config.h"
 #include "wrap_Filesystem.h"
 #include "wrap_File.h"
-#include "wrap_DroppedFile.h"
+#include "wrap_NativeFile.h"
 #include "wrap_FileData.h"
 #include "data/wrap_Data.h"
 #include "data/wrap_DataModule.h"
@@ -133,9 +133,9 @@ int w_mount(lua_State *L)
 		luax_pushboolean(L, instance()->mount(data, archive.c_str(), mountpoint, append));
 		return 1;
 	}
-	else if (luax_istype(L, 1, DroppedFile::type))
+	else if (luax_istype(L, 1, NativeFile::type))
 	{
-		DroppedFile *file = luax_totype<DroppedFile>(L, 1);
+		NativeFile *file = luax_totype<NativeFile>(L, 1);
 		archive = file->getFilename();
 	}
 	else
@@ -958,7 +958,7 @@ static const luaL_Reg functions[] =
 static const lua_CFunction types[] =
 {
 	luaopen_file,
-	luaopen_droppedfile,
+	luaopen_nativefile,
 	luaopen_filedata,
 	0
 };
diff --git a/src/modules/filesystem/wrap_DroppedFile.cpp b/src/modules/filesystem/wrap_NativeFile.cpp
similarity index 79%
rename from src/modules/filesystem/wrap_DroppedFile.cpp
rename to src/modules/filesystem/wrap_NativeFile.cpp
index 14fc990e3..7d5de5cdf 100644
--- a/src/modules/filesystem/wrap_DroppedFile.cpp
+++ b/src/modules/filesystem/wrap_NativeFile.cpp
@@ -18,7 +18,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#include "wrap_DroppedFile.h"
+#include "wrap_NativeFile.h"
 #include "wrap_File.h"
 
 namespace love
@@ -26,14 +26,14 @@ namespace love
 namespace filesystem
 {
 
-DroppedFile *luax_checkdroppedfile(lua_State *L, int idx)
+NativeFile *luax_checknativefile(lua_State *L, int idx)
 {
-	return luax_checktype<DroppedFile>(L, idx);
+	return luax_checktype<NativeFile>(L, idx);
 }
 
-extern "C" int luaopen_droppedfile(lua_State *L)
+extern "C" int luaopen_nativefile(lua_State *L)
 {
-	return luax_register_type(L, &DroppedFile::type, w_File_functions, nullptr);
+	return luax_register_type(L, &NativeFile::type, w_File_functions, nullptr);
 }
 
 } // filesystem
diff --git a/src/modules/filesystem/wrap_DroppedFile.h b/src/modules/filesystem/wrap_NativeFile.h
similarity index 79%
rename from src/modules/filesystem/wrap_DroppedFile.h
rename to src/modules/filesystem/wrap_NativeFile.h
index aa673d400..55e9335d3 100644
--- a/src/modules/filesystem/wrap_DroppedFile.h
+++ b/src/modules/filesystem/wrap_NativeFile.h
@@ -18,22 +18,19 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
-#ifndef LOVE_FILESYSTEM_WRAP_DROPPED_FILE_H
-#define LOVE_FILESYSTEM_WRAP_DROPPED_FILE_H
+#pragma once
 
 // LOVE
 #include "common/runtime.h"
-#include "DroppedFile.h"
+#include "NativeFile.h"
 
 namespace love
 {
 namespace filesystem
 {
 
-DroppedFile *luax_checkdroppedfile(lua_State *L, int idx);
-extern "C" int luaopen_droppedfile(lua_State *L);
+NativeFile *luax_checknativefile(lua_State *L, int idx);
+extern "C" int luaopen_nativefile(lua_State *L);
 
 } // filesystem
 } // love
-
-#endif // LOVE_FILESYSTEM_WRAP_DROPPED_FILE_H