diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index a0678c774c..b0962d200c 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -900,6 +900,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				<Filter
 					Name="ArchHooks"
 					Filter="">
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks.cpp">
+					</File>
 					<File
 						RelativePath="arch\ArchHooks\ArchHooks.h">
 					</File>
@@ -1906,9 +1909,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="AnnouncerManager.h">
 			</File>
-			<File
-				RelativePath="arch\ArchHooks\ArchHooks.cpp">
-			</File>
 			<File
 				RelativePath="Bookkeeper.cpp">
 			</File>
diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index 44dbf2de6a..dd7aa1d484 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -12,7 +12,7 @@
 #include "StepMania.h" /* for g_argv */
 
 #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc, only */
-#include <RageThreads.h>
+#include "RageThreads.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -57,14 +57,14 @@ static void spawn_child_process(int from_parent)
 }
 
 /* write(), but retry a couple times on EINTR. */
-int retried_write( int fd, const void *buf, size_t count )
+static int retried_write( int fd, const void *buf, size_t count )
 {
 	int tries = 3, ret;
 	do
 	{
 		ret = write( fd, buf, count );
 	}
-	while( tries-- && ret == -1 && errno == EINTR );
+	while( ret == -1 && errno == EINTR && tries-- );
 	
 	return ret;
 }