diff --git a/CMakeLists.txt b/CMakeLists.txt
index b880c47..f9731a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 if(HAIKU)
     # We add this explicitly, since we don't want CMake to think this
     #  is a C++ project unless we're on Haiku.
-    set(PHYSFS_HAIKU_SRCS src/platform_beos.cpp)
+    set(PHYSFS_HAIKU_SRCS src/physfs_platform_haiku.cpp)
     find_library(BE_LIBRARY be)
     find_library(ROOT_LIBRARY root)
     set(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY})
@@ -63,23 +63,23 @@ set(PHYSFS_SRCS
     src/physfs.c
     src/physfs_byteorder.c
     src/physfs_unicode.c
-    src/platform_posix.c
-    src/platform_unix.c
-    src/platform_macosx.c
-    src/platform_windows.c
-    src/platform_os2.c
-    src/archiver_dir.c
-    src/archiver_unpacked.c
-    src/archiver_grp.c
-    src/archiver_hog.c
-    src/archiver_7z.c
-    src/archiver_mvl.c
-    src/archiver_qpak.c
-    src/archiver_wad.c
-    src/archiver_zip.c
-    src/archiver_slb.c
-    src/archiver_iso9660.c
-    src/archiver_vdf.c
+    src/physfs_platform_posix.c
+    src/physfs_platform_unix.c
+    src/physfs_platform_macos.c
+    src/physfs_platform_windows.c
+    src/physfs_platform_os2.c
+    src/physfs_archiver_dir.c
+    src/physfs_archiver_unpacked.c
+    src/physfs_archiver_grp.c
+    src/physfs_archiver_hog.c
+    src/physfs_archiver_7z.c
+    src/physfs_archiver_mvl.c
+    src/physfs_archiver_qpak.c
+    src/physfs_archiver_wad.c
+    src/physfs_archiver_zip.c
+    src/physfs_archiver_slb.c
+    src/physfs_archiver_iso9660.c
+    src/physfs_archiver_vdf.c
     ${PHYSFS_HAIKU_SRCS}
 )
 
diff --git a/src/archiver_7z.c b/src/physfs_archiver_7z.c
similarity index 100%
rename from src/archiver_7z.c
rename to src/physfs_archiver_7z.c
diff --git a/src/archiver_dir.c b/src/physfs_archiver_dir.c
similarity index 100%
rename from src/archiver_dir.c
rename to src/physfs_archiver_dir.c
diff --git a/src/archiver_grp.c b/src/physfs_archiver_grp.c
similarity index 100%
rename from src/archiver_grp.c
rename to src/physfs_archiver_grp.c
diff --git a/src/archiver_hog.c b/src/physfs_archiver_hog.c
similarity index 100%
rename from src/archiver_hog.c
rename to src/physfs_archiver_hog.c
diff --git a/src/archiver_iso9660.c b/src/physfs_archiver_iso9660.c
similarity index 100%
rename from src/archiver_iso9660.c
rename to src/physfs_archiver_iso9660.c
diff --git a/src/archiver_mvl.c b/src/physfs_archiver_mvl.c
similarity index 100%
rename from src/archiver_mvl.c
rename to src/physfs_archiver_mvl.c
diff --git a/src/archiver_qpak.c b/src/physfs_archiver_qpak.c
similarity index 100%
rename from src/archiver_qpak.c
rename to src/physfs_archiver_qpak.c
diff --git a/src/archiver_slb.c b/src/physfs_archiver_slb.c
similarity index 100%
rename from src/archiver_slb.c
rename to src/physfs_archiver_slb.c
diff --git a/src/archiver_unpacked.c b/src/physfs_archiver_unpacked.c
similarity index 100%
rename from src/archiver_unpacked.c
rename to src/physfs_archiver_unpacked.c
diff --git a/src/archiver_vdf.c b/src/physfs_archiver_vdf.c
similarity index 100%
rename from src/archiver_vdf.c
rename to src/physfs_archiver_vdf.c
diff --git a/src/archiver_wad.c b/src/physfs_archiver_wad.c
similarity index 100%
rename from src/archiver_wad.c
rename to src/physfs_archiver_wad.c
diff --git a/src/archiver_zip.c b/src/physfs_archiver_zip.c
similarity index 100%
rename from src/archiver_zip.c
rename to src/physfs_archiver_zip.c
diff --git a/src/platform_beos.cpp b/src/physfs_platform_haiku.cpp
similarity index 100%
rename from src/platform_beos.cpp
rename to src/physfs_platform_haiku.cpp
diff --git a/src/platform_macosx.c b/src/physfs_platform_macos.c
similarity index 100%
rename from src/platform_macosx.c
rename to src/physfs_platform_macos.c
diff --git a/src/platform_os2.c b/src/physfs_platform_os2.c
similarity index 100%
rename from src/platform_os2.c
rename to src/physfs_platform_os2.c
diff --git a/src/platform_posix.c b/src/physfs_platform_posix.c
similarity index 100%
rename from src/platform_posix.c
rename to src/physfs_platform_posix.c
diff --git a/src/platform_unix.c b/src/physfs_platform_unix.c
similarity index 100%
rename from src/platform_unix.c
rename to src/physfs_platform_unix.c
diff --git a/src/platform_windows.c b/src/physfs_platform_windows.c
similarity index 100%
rename from src/platform_windows.c
rename to src/physfs_platform_windows.c
diff --git a/src/platform_winrt.cpp b/src/physfs_platform_winrt.cpp
similarity index 100%
rename from src/platform_winrt.cpp
rename to src/physfs_platform_winrt.cpp