diff --git a/platform/Makefile.am b/platform/Makefile.am
index cae7428..afd8638 100644
--- a/platform/Makefile.am
+++ b/platform/Makefile.am
@@ -4,12 +4,12 @@ INCLUDES = -I$(top_srcdir)
 
 if BUILD_BEOS
 libplatform_la_SOURCES =	\
-	unix.c                  \
 	posix.c                 \
     beos.cpp
 else
 libplatform_la_SOURCES =	\
 	unix.c                  \
+	win32.c                 \
 	posix.c
 endif
 
@@ -18,5 +18,6 @@ EXTRA_DIST =      \
 	skeleton.c    \
 	macclassic.c  \
 	win32.c       \
+	unix.c        \
     beos.cpp
 
diff --git a/platform/beos.cpp b/platform/beos.cpp
index 9dd9260..e817265 100644
--- a/platform/beos.cpp
+++ b/platform/beos.cpp
@@ -35,7 +35,6 @@
 
 const char *__PHYSFS_platformDirSeparator = "/";
 
-/* !!! FIXME: does strerror() work for non-POSIX api calls? */
 #define get_error_str(x) strerror(x)
 
 
diff --git a/platform/unix.c b/platform/unix.c
index 80f48ed..a2e2b32 100644
--- a/platform/unix.c
+++ b/platform/unix.c
@@ -10,11 +10,8 @@
 #  include <config.h>
 #endif
 
-#if (!defined __BEOS__) /* BeOS uses beos.cpp and posix.c ... */
-
-#if (defined WIN32) /* cygwin/mingw32? */
-#include "win32.c"  /* !!! FIXME: holy friggin' hack. */
-#else
+/* BeOS uses beos.cpp and posix.c ... Cygwin and such use win32.c ... */
+#if ((!defined __BEOS__) && (!defined WIN32))
 
 #if ((defined __APPLE__) && (defined __MACH__))
 #  if (!defined __DARWIN__)
diff --git a/platform/win32.c b/platform/win32.c
index 03f653b..5392cec 100644
--- a/platform/win32.c
+++ b/platform/win32.c
@@ -10,6 +10,8 @@
 #  include <config.h>
 #endif
 
+#ifdef WIN32
+
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -1083,5 +1085,7 @@ PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname)
     return(retval);
 } /* __PHYSFS_platformGetLastModTime */
 
+#endif
+
 /* end of win32.c ... */